Shuffle order of items in status bar; change behavior per oofus on irc.

[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 8f3fed3e9303335c8ef816aa52c7da8f62b410ec..f9c10a777eef4d3305ada06487d60e8e933ca346 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -679,18 +679,10 @@ ARDOUR_UI::build_menu_bar ()
 
        wall_clock_label.set_name ("WallClock");
        wall_clock_label.set_use_markup ();
-       disk_space_label.set_name ("WallClock");
-       disk_space_label.set_use_markup ();
        timecode_format_label.set_name ("WallClock");
        timecode_format_label.set_use_markup ();
-       cpu_load_label.set_name ("CPULoad");
-       cpu_load_label.set_use_markup ();
-       xrun_label.set_name ("XrunLabel");
-       xrun_label.set_use_markup ();
        peak_thread_work_label.set_name ("PeakThreadWork");
        peak_thread_work_label.set_use_markup ();
-       buffer_load_label.set_name ("BufferLoad");
-       buffer_load_label.set_use_markup ();
        sample_rate_label.set_name ("SampleRate");
        sample_rate_label.set_use_markup ();
        format_label.set_name ("Format");
@@ -703,22 +695,16 @@ ARDOUR_UI::build_menu_bar ()
 #endif
 
        hbox->pack_end (error_alert_button, false, false, 2);
-       hbox->pack_end (dsp_load_indicator, false, false, 4);
 
-       hbox->pack_end (wall_clock_label, false, false, 2);
-       hbox->pack_end (disk_space_indicator, false, false, 4);
-#if 0
-       hbox->pack_end (disk_space_label, false, false, 4);
-#endif
-       hbox->pack_end (xrun_label, false, false, 4);
-#if 0
-       hbox->pack_end (cpu_load_label, false, false, 4);
-#endif
-       hbox->pack_end (disk_io_indicator, false, false, 4);
+       hbox->pack_end (dsp_load_gauge, false, false, 4);
+
+       hbox->pack_end (disk_space_gauge, false, false, 4);
+       hbox->pack_end (disk_io_gauge, false, false, 4);
        hbox->pack_end (sample_rate_label, false, false, 4);
        hbox->pack_end (timecode_format_label, false, false, 4);
        hbox->pack_end (format_label, false, false, 4);
        hbox->pack_end (peak_thread_work_label, false, false, 4);
+       hbox->pack_end (wall_clock_label, false, false, 2);
 
        menu_hbox.pack_end (*ev, false, false, 2);
 
@@ -727,16 +713,15 @@ ARDOUR_UI::build_menu_bar ()
 
 #ifndef __APPLE__
        // OSX provides its own wallclock, thank you very much
-       _status_bar_visibility.add (&wall_clock_label,      X_("WallClock"), _("Wall Clock"), true);
+       _status_bar_visibility.add (&wall_clock_label,      X_("WallClock"), _("Wall Clock"), false);
 #endif
-       _status_bar_visibility.add (&disk_space_indicator,  X_("Disk"),      _("Disk Space"), !Profile->get_small_screen());
-       _status_bar_visibility.add (&dsp_load_indicator,    X_("DSP"),       _("DSP"), true);
-       _status_bar_visibility.add (&xrun_label,            X_("XRun"),      _("X-run"), false);
        _status_bar_visibility.add (&peak_thread_work_label,X_("Peakfile"),  _("Active Peak-file Work"), false);
-       _status_bar_visibility.add (&disk_io_indicator,     X_("Buffers"),   _("Buffers"), true);
+       _status_bar_visibility.add (&format_label,          X_("Format"),    _("File Format"), false);
+       _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"),  _("Timecode Format"), false);
        _status_bar_visibility.add (&sample_rate_label,     X_("Audio"),     _("Audio"), true);
-       _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"),  _("Timecode Format"), true);
-       _status_bar_visibility.add (&format_label,          X_("Format"),    _("File Format"), true);
+       _status_bar_visibility.add (&disk_io_gauge,     X_("Buffers"),   _("Buffers"), true);
+       _status_bar_visibility.add (&disk_space_gauge,  X_("Disk"),      _("Disk Space"), !Profile->get_small_screen());
+       _status_bar_visibility.add (&dsp_load_gauge,    X_("DSP"),       _("DSP"), true);
 
        ev->signal_button_press_event().connect (sigc::mem_fun (_status_bar_visibility, &VisibilityGroup::button_press_event));
        ev->signal_button_release_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::xrun_button_release));
@@ -872,9 +857,7 @@ ARDOUR_UI::save_ardour_state ()
 void
 ARDOUR_UI::resize_text_widgets ()
 {
-       set_size_request_to_display_given_text (cpu_load_label, "DSP: 100.0%", 2, 2);
-       set_size_request_to_display_given_text (buffer_load_label, "Buffers: p:100% c:100%", 2, 2);
-       set_size_request_to_display_given_text (xrun_label, "X: 9999", 2, 2);
+       //ToDo:  maybe resize the gauges to fit translated text
 }
 
 void