diff options
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 1d08d65215..4dcb4eb5fa 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -146,8 +146,9 @@ sigc::signal<void> ARDOUR_UI::CloseAllDialogs; ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) - + , gui_object_state (new GUIObjectState) + , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true)) , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true)) @@ -155,6 +156,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) + /* start of private members */ + + , _startup (0) + , engine (0) + , nsm (0) + , _was_dirty (false) + , _mixer_on_top (false) + /* transport */ , roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)) @@ -197,7 +206,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) Gtkmm2ext::init(localedir); splash = 0; - _startup = 0; if (theArdourUI == 0) { theArdourUI = this; @@ -311,7 +319,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) TimeAxisViewItem::set_constant_heights (); - /* load up the UI manager */ + /* Set this up so that our window proxies can register actions */ ActionManager::init (); @@ -336,20 +344,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) midi_port_matrix.set_state (*ui_xml); } - WindowManager::instance().register_window (&theme_manager); - WindowManager::instance().register_window (&key_editor); - WindowManager::instance().register_window (&rc_option_editor); - WindowManager::instance().register_window (&session_option_editor); - WindowManager::instance().register_window (&speaker_config_window); - WindowManager::instance().register_window (&about); - WindowManager::instance().register_window (&add_route_dialog); - WindowManager::instance().register_window (&add_video_dialog); - WindowManager::instance().register_window (&route_params); - WindowManager::instance().register_window (&bundle_manager); - WindowManager::instance().register_window (&location_ui); - WindowManager::instance().register_window (&big_clock_window); - WindowManager::instance().register_window (&audio_port_matrix); - WindowManager::instance().register_window (&midi_port_matrix); + WM::Manager::instance().register_window (&theme_manager); + WM::Manager::instance().register_window (&key_editor); + WM::Manager::instance().register_window (&rc_option_editor); + WM::Manager::instance().register_window (&session_option_editor); + WM::Manager::instance().register_window (&speaker_config_window); + WM::Manager::instance().register_window (&about); + WM::Manager::instance().register_window (&add_route_dialog); + WM::Manager::instance().register_window (&add_video_dialog); + WM::Manager::instance().register_window (&route_params); + WM::Manager::instance().register_window (&bundle_manager); + WM::Manager::instance().register_window (&location_ui); + WM::Manager::instance().register_window (&big_clock_window); + WM::Manager::instance().register_window (&audio_port_matrix); + WM::Manager::instance().register_window (&midi_port_matrix); /* We need to instantiate the theme manager because it loads our theme files. This should really change so that its window @@ -418,6 +426,8 @@ ARDOUR_UI::post_engine () _tooltips.enable(); + ActionManager::load_menus (); + if (setup_windows ()) { throw failed_constructor (); } @@ -688,7 +698,6 @@ ARDOUR_UI::startup () app->ready (); nsm_url = getenv ("NSM_URL"); - nsm = 0; if (nsm_url) { nsm = new NSM_Client; @@ -746,7 +755,7 @@ ARDOUR_UI::startup () goto_editor_window (); - WindowManager::instance().show_visible (); + WM::Manager::instance().show_visible (); /* We have to do this here since goto_editor_window() ends up calling show_all() on the * editor window, and we may want stuff to be hidden. @@ -2329,7 +2338,7 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it) { XMLNode* node = new XMLNode (X_("UI")); - WindowManager::instance().add_state (*node); + WM::Manager::instance().add_state (*node); node->add_child_nocopy (gui_object_state->get_state()); |