From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 23 Sep 2018 16:58:53 +0000 (-0400)
Subject: rename transport masters dialog -> window
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=d9de14aa633feed1d2c58f375f8300607b3ca01c;p=ardour.git

rename transport masters dialog -> window
---

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2a24685b14..b19d57112f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -316,7 +316,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	, export_video_dialog (X_("video-export"), _("Video Export Dialog"))
 	, lua_script_window (X_("script-manager"), _("Script Manager"))
 	, idleometer (X_("idle-o-meter"), _("Idle'o'Meter"))
-	, transport_masters_dialog (X_("transport-masters"), _("Transport Masters"))
+	, transport_masters_window (X_("transport-masters"), _("Transport Masters"))
 	, session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
 	, add_video_dialog (X_("add-video"), _("Add Video"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
 	, bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
@@ -460,6 +460,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	const XMLNode* ui_xml = Config->extra_xml (X_("UI"));
 
 	if (ui_xml) {
+		std::cerr << "\n\n\nHAVE UI XML, set dialogs\n\n\n";
 		key_editor.set_state (*ui_xml, 0);
 		session_option_editor.set_state (*ui_xml, 0);
 		speaker_config_window.set_state (*ui_xml, 0);
@@ -476,7 +477,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 		export_video_dialog.set_state (*ui_xml, 0);
 		lua_script_window.set_state (*ui_xml, 0);
 		idleometer.set_state (*ui_xml, 0);
-		transport_masters_dialog.set_state (*ui_xml, 0);
+		transport_masters_window.set_state (*ui_xml, 0);
 	}
 
 	/* Separate windows */
@@ -498,7 +499,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	WM::Manager::instance().register_window (&audio_port_matrix);
 	WM::Manager::instance().register_window (&midi_port_matrix);
 	WM::Manager::instance().register_window (&idleometer);
-	WM::Manager::instance().register_window (&transport_masters_dialog);
+	WM::Manager::instance().register_window (&transport_masters_window);
 
 	/* do not retain position for add route dialog */
 	add_route_dialog.set_state_mask (WindowProxy::Size);
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index a0b0b078b1..e1d743d57d 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -120,7 +120,7 @@ class SessionOptionEditor;
 class SpeakerDialog;
 class GlobalPortMatrixWindow;
 class IdleOMeter;
-class TransportMastersDialog;
+class TransportMastersWindow;
 #endif
 
 class VideoTimeLine;
@@ -682,7 +682,7 @@ private:
 	WM::Proxy<ExportVideoDialog> export_video_dialog;
 	WM::Proxy<LuaScriptManager> lua_script_window;
 	WM::Proxy<IdleOMeter> idleometer;
-	WM::Proxy<TransportMastersDialog> transport_masters_dialog;
+	WM::Proxy<TransportMastersWindow> transport_masters_window;
 
 	/* Windows/Dialogs that require a creator method */
 
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index b91470a145..db4b190e12 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -128,7 +128,7 @@ ARDOUR_UI::set_session (Session *s)
 	big_clock->set_session (s);
 	video_timeline->set_session (s);
 	lua_script_window->set_session (s);
-	transport_masters_dialog->set_session (s);
+	transport_masters_window->set_session (s);
 	rc_option_editor->set_session (s);
 
 	/* sensitize menu bar options that are now valid */