From 0046ee6488ba54df1dd3953e1baf0e05de6d9370 Mon Sep 17 00:00:00 2001
From: Valeriy Kamyshniy <vkamyshniy@wavesglobal.com>
Date: Thu, 17 Apr 2014 05:37:15 -0500
Subject: [PATCH] Improving logic of XML-ed UI

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453437]
---
 gtk2_ardour/session_dialog.cc             |  2 --
 gtk2_ardour/tracks_control_panel.logic.cc | 23 -----------------------
 gtk2_ardour/waves_dialog.cc               |  4 +---
 gtk2_ardour/waves_ui.cc                   |  6 ++++++
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index a958027101..f168b09706 100644
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -46,7 +46,6 @@
 #include "ardour_ui.h"
 #include "session_dialog.h"
 #include "opts.h"
-//VKPRefs:#include "engine_dialog.h"
 #include "i18n.h"
 #include "utils.h"
 
@@ -106,7 +105,6 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
 	for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
 		recent_session_button[i]->signal_clicked.connect (sigc::mem_fun (*this, &SessionDialog::on_recent_session ));
 	}
-	show_all ();
 	redisplay_recent_sessions();
 }
 
diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc
index 51d6a62247..97370d87ba 100644
--- a/gtk2_ardour/tracks_control_panel.logic.cc
+++ b/gtk2_ardour/tracks_control_panel.logic.cc
@@ -19,36 +19,15 @@
 #include <stdlib.h>
 #include "tracks_control_panel.h"
 #include "waves_button.h"
-//#include <vector>
-//#include <cmath>
-//#include <fstream>
-//#include <map>
-
-//#include <boost/scoped_ptr.hpp>
-
-//#include <gtkmm/messagedialog.h>
-
-//#include "pbd/error.h"
-//#include "pbd/xml++.h"
 #include "pbd/unwind.h"
-//#include "pbd/failed_constructor.h"
 
-//#include <gtkmm/alignment.h>
-//#include <gtkmm/stock.h>
-//#include <gtkmm/notebook.h>
 #include <gtkmm2ext/utils.h>
 
 #include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
-//#include "ardour/mtdm.h"
 #include "ardour/rc_configuration.h"
-//#include "ardour/types.h"
-
-//#include "pbd/convert.h"
-//#include "pbd/error.h"
 
 #include "ardour_ui.h"
-//#include "tracks_control_panel.h"
 #include "gui_thread.h"
 #include "utils.h"
 #include "i18n.h"
@@ -90,8 +69,6 @@ TracksControlPanel::init ()
 	buffer_size_combo.signal_changed().connect (sigc::mem_fun (*this, &TracksControlPanel::buffer_size_changed));
 
 	populate_engine_combo ();
-	show_all ();
-	hide();
 	midi_settings_layout.hide ();
 	session_settings_layout.hide ();
 	audio_settings_tab_button.set_active(true);
diff --git a/gtk2_ardour/waves_dialog.cc b/gtk2_ardour/waves_dialog.cc
index b60aac25e5..498a8e9a6f 100644
--- a/gtk2_ardour/waves_dialog.cc
+++ b/gtk2_ardour/waves_dialog.cc
@@ -44,8 +44,6 @@ using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace ARDOUR;
 
-std::ofstream dbg_out("/users/VKamyshniy/WavesDialogLog.txt");
-
 WavesDialog::WavesDialog (std::string layout_script_file, bool modal, bool use_seperator)
 	: Dialog ("", modal, use_seperator)
 	, proxy (0)
@@ -141,7 +139,7 @@ WavesDialog::on_show ()
 
 	if (spl && spl->is_visible()) {
 		spl->pop_back_for (*this);
-                _splash_pushed = true;
+        _splash_pushed = true;
 	}
 }
 
diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index 8896dd7c53..19bf98b75c 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -101,6 +101,12 @@ WavesUI::create_widget (const XMLNode& definition, const XMLNodeMap& styles, std
 		if (!property.empty()) {
 			child->modify_font(Pango::FontDescription(property));
 		}
+
+		if (xml_property (definition, "visible", styles, true)) {
+			child->show();
+		} else {
+			child->hide();
+		}
 	}
 	return child;
 }