ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

rename transport masters dialog -> window

This commit is contained in:
Paul Davis 2018-09-23 12:58:53 -04:00
parent 12d5eb9a34
commit d9de14aa63
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/ardour_ui.cc
View File

@ -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);

4
gtk2_ardour/ardour_ui.h
View File

@ -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 */

2
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -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 */