add a way to see (most of) the waf config used to build ardour at run time (from the about dialog). buttons still need reordering there

git-svn-id: svn://localhost/ardour2/branches/3.0@6439 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 53 insertions, 4 deletions

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 2519e767bd..d384daae32 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -36,6 +36,7 @@
 #include "version.h"
 
 #include "about.h"
+#include "configinfo.h"
 #include "rgb_macros.h"
 #include "ardour_ui.h"
 
@@ -185,8 +186,9 @@ static const char* translators[] = {
 
 
 About::About ()
+	: config_info (0)
 #ifdef WITH_PAYMENT_OPTIONS
-	: paypal_pixmap (paypal_xpm)
+	, paypal_pixmap (paypal_xpm)
 #endif
 {
 	// set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
@@ -218,11 +220,14 @@ About::About ()
 		       "under certain conditions; see the file COPYING for details.\n"));
 	set_name (X_("ardour"));
 	set_website (X_("http://ardour.org/"));
-	set_website_label (_("visit http://www.ardour.org/"));
+	set_website_label (_("visit http://ardour.org/"));
 	set_version ((string_compose(_("%1\n(built from revision %2)"),
 				     VERSIONSTRING,
 				     svn_revision)));
 
+	Gtk::Button* config_button = manage (new Button (_("Config")));
+	get_action_area()->pack_start (*config_button, false, false);
+	config_button->signal_clicked().connect (mem_fun (*this, &About::show_config_info));
 
 #ifdef WITH_PAYMENT_OPTIONS
 	paypal_button.add (paypal_pixmap);
@@ -239,6 +244,16 @@ About::~About ()
 {
 }
 
+void
+About::show_config_info ()
+{
+	if (!config_info) {
+		config_info = new ConfigInfoDialog;
+	}
+
+	config_info->present ();
+}
+
 #ifdef WITH_PAYMENT_OPTIONS
 void
 About::goto_paypal ()
diff --git a/gtk2_ardour/about.h b/gtk2_ardour/about.h
index 33b5a9ed89..80e4618d22 100644
--- a/gtk2_ardour/about.h
+++ b/gtk2_ardour/about.h
@@ -22,7 +22,7 @@
 
 #include <gtkmm/aboutdialog.h>
 
-class ARDOUR_UI;
+class ConfigInfoDialog;
 
 class About : public Gtk::AboutDialog
 {
@@ -30,6 +30,10 @@ class About : public Gtk::AboutDialog
 	About ();
 	~About ();
 
+  private:
+	ConfigInfoDialog* config_info;
+	void show_config_info ();
+
 #ifdef WITH_PAYMENT_OPTIONS
 	Gtk::Image      paypal_pixmap;
 	Gtk::Button      paypal_button;
diff --git a/gtk2_ardour/configinfo.cc b/gtk2_ardour/configinfo.cc
new file mode 100644
index 0000000000..2ec6b1f39e
--- /dev/null
+++ b/gtk2_ardour/configinfo.cc
@@ -0,0 +1,16 @@
+#include "ardour/ardour.h"
+
+#include "configinfo.h"
+#include "i18n.h"
+
+ConfigInfoDialog::ConfigInfoDialog ()
+	: ArdourDialog (_("Build Configuration"))
+{
+	set_border_width (12);
+	text.get_buffer()->set_text (Glib::ustring (ARDOUR::ardour_config_info));
+	text.set_wrap_mode (Gtk::WRAP_WORD);
+	text.show ();
+	text.set_size_request (300, 800);
+
+	get_vbox()->pack_start (text, true, true);
+}
diff --git a/gtk2_ardour/configinfo.h b/gtk2_ardour/configinfo.h
new file mode 100644
index 0000000000..ee8a452867
--- /dev/null
+++ b/gtk2_ardour/configinfo.h
@@ -0,0 +1,12 @@
+#include <gtkmm/textview.h>
+
+#include "ardour_dialog.h"
+
+class ConfigInfoDialog : public ArdourDialog
+{
+  public:
+	ConfigInfoDialog();
+
+  private:
+	Gtk::TextView text;
+};
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index e35ec0026d..ec0728b7fc 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -778,7 +778,8 @@ public:
 
 		_box->pack_start (_view, false, false);
 
-		Label* label = manage (new Label (_("Double-click on a name to edit settings for an enabled protocol")));
+		Label* label = manage (new Label);
+		label->set_markup (string_compose (X_("<i>%1</i>"), _("Double-click on a name to edit settings for an enabled protocol")));
 
 		_box->pack_start (*label, false, false);
 		label->show ();
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 6a3caef427..181922b773 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -60,6 +60,7 @@ gtk2_ardour_sources = [
 	'canvas-simplerect.c',
 	'canvas-sysex.cc',
 	'canvas-waveview.c',
+	'configinfo.cc',
 	'control_point.cc',
 	'control_point_dialog.cc',
 	'crossfade_edit.cc',