Use general VisibilityGroup class to manage visibility

[ardour.git] / gtk2_ardour / ardour_ui_ed.cc

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 8dfbfef750d8ee4145495e825a0097e60ecba925..8ab5a9aa50fdea1d90f11db14589949556c61104 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -147,6 +147,10 @@ ARDOUR_UI::install_actions ()
        ActionManager::session_sensitive_actions.push_back (act);
        ActionManager::write_sensitive_actions.push_back (act);
 
+       act = ActionManager::register_action (main_actions, X_("Rename"), _("Rename..."), sigc::mem_fun(*this, &ARDOUR_UI::rename_session));
+       ActionManager::session_sensitive_actions.push_back (act);
+       ActionManager::write_sensitive_actions.push_back (act);
+
        act = ActionManager::register_action (main_actions, X_("SaveTemplate"), _("Save Template..."),  sigc::mem_fun(*this, &ARDOUR_UI::save_template));
        ActionManager::session_sensitive_actions.push_back (act);
 
@@ -518,6 +522,13 @@ ARDOUR_UI::build_menu_bar ()
        // so use this instead ...
        gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
 
+       EventBox* ev = manage (new EventBox);
+       ev->show ();
+       HBox* hbox = manage (new HBox);
+       hbox->show ();
+       
+       ev->add (*hbox);
+
        wall_clock_box.add (wall_clock_label);
        wall_clock_box.set_name ("WallClock");
        wall_clock_label.set_name ("WallClock");
@@ -525,18 +536,29 @@ ARDOUR_UI::build_menu_bar ()
        disk_space_box.add (disk_space_label);
        disk_space_box.set_name ("WallClock");
        disk_space_label.set_name ("WallClock");
+       disk_space_label.set_use_markup ();
 
        cpu_load_box.add (cpu_load_label);
        cpu_load_box.set_name ("CPULoad");
        cpu_load_label.set_name ("CPULoad");
+       cpu_load_label.set_use_markup ();
+       set_size_request_to_display_given_text (cpu_load_label, "DSP: 100.0%", 2, 2);
 
        buffer_load_box.add (buffer_load_label);
        buffer_load_box.set_name ("BufferLoad");
        buffer_load_label.set_name ("BufferLoad");
+       buffer_load_label.set_use_markup ();
+       set_size_request_to_display_given_text (buffer_load_label, "Buffers: p:100% c:100%", 2, 2);
 
        sample_rate_box.add (sample_rate_label);
        sample_rate_box.set_name ("SampleRate");
        sample_rate_label.set_name ("SampleRate");
+       sample_rate_label.set_use_markup ();
+
+       format_box.add (format_label);
+       format_box.set_name ("Format");
+       format_label.set_name ("Format");
+       format_label.set_use_markup ();
 
 #ifndef TOP_MENUBAR
        menu_hbox.pack_start (*menu_bar, false, false);
@@ -544,20 +566,37 @@ ARDOUR_UI::build_menu_bar ()
        use_menubar_as_top_menubar ();
 #endif
 
+       bool wall_clock = false;
+       bool disk_space = false;
+
        if (!Profile->get_small_screen()) {
 #ifndef GTKOSX
                // OSX provides its own wallclock, thank you very much
-               menu_hbox.pack_end (wall_clock_box, false, false, 2);
+               wall_clock = true;
 #endif
-               menu_hbox.pack_end (disk_space_box, false, false, 4);
+               disk_space = true;
        }
+       
+       hbox->pack_end (wall_clock_box, false, false, 2);
+       hbox->pack_end (disk_space_box, false, false, 4);
+       hbox->pack_end (cpu_load_box, false, false, 4);
+       hbox->pack_end (buffer_load_box, false, false, 4);
+       hbox->pack_end (sample_rate_box, false, false, 4);
+       hbox->pack_end (format_box, false, false, 4);
 
-       menu_hbox.pack_end (cpu_load_box, false, false, 4);
-       menu_hbox.pack_end (buffer_load_box, false, false, 4);
-       menu_hbox.pack_end (sample_rate_box, false, false, 4);
+       menu_hbox.pack_end (*ev, false, false);
 
        menu_bar_base.set_name ("MainMenuBar");
        menu_bar_base.add (menu_hbox);
+
+       _status_bar_visibility.add (&wall_clock_box,  X_("WallClock"), _("Wall Clock"), wall_clock);
+       _status_bar_visibility.add (&disk_space_box,  X_("Disk"),      _("Disk Space"), disk_space);
+       _status_bar_visibility.add (&cpu_load_box,    X_("DSP"),       _("DSP"));
+       _status_bar_visibility.add (&buffer_load_box, X_("Buffers"),   _("Buffers"));
+       _status_bar_visibility.add (&sample_rate_box, X_("JACK"),      _("JACK Sampling Rate and Latency"));
+       _status_bar_visibility.add (&format_box,      X_("Format"),    _("File Format"));
+
+       ev->signal_button_press_event().connect (sigc::mem_fun (_status_bar_visibility, &VisibilityGroup::button_press_event));
 }
 
 void
@@ -597,7 +636,6 @@ ARDOUR_UI::setup_clock ()
        big_clock_window->get()->add (*big_clock);
 
        big_clock_window->get()->set_title (_("Big Clock"));
-       big_clock_window->get()->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
        big_clock_window->get()->signal_realize().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_realized));
        big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));
        big_clock_window->get()->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window->get()), false);
@@ -706,6 +744,7 @@ ARDOUR_UI::save_ardour_state ()
        Config->add_extra_xml (get_transport_controllable_state());
 
        XMLNode* window_node = new XMLNode (X_("UI"));
+       window_node->add_property (_status_bar_visibility.get_state_name().c_str(), _status_bar_visibility.get_state_value ());
 
        for (list<WindowProxyBase*>::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) {
                if ((*i)->rc_configured()) {
@@ -743,10 +782,12 @@ ARDOUR_UI::save_ardour_state ()
                Config->add_extra_xml (_startup->engine_control()->get_state());
        }
        Config->save_state();
-       ui_config->save_state ();
+       if (ui_config->dirty()) {
+               ui_config->save_state ();
+       }
 
-       XMLNode enode(static_cast<Stateful*>(editor)->get_state());
-       XMLNode mnode(mixer->get_state());
+       XMLNode& enode (static_cast<Stateful*>(editor)->get_state());
+       XMLNode& mnode (mixer->get_state());
 
        if (_session) {
                _session->add_instant_xml (enode);