X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_ed.cc;h=4ee384f467c0883687e4eb037ad0822273169b14;hb=0883f02de92478800ad232f10d388219e2817ed7;hp=67a3f0b58912848ff92737326bd16c568489cf3e;hpb=fa22689b704ab2dd06c98dcbc1d33b6f4418a4c0;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 67a3f0b589..4ee384f467 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -666,15 +666,15 @@ void
 ARDOUR_UI::build_menu_bar ()
 {
 	menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main")));
-	menu_bar->set_name ("gtk_background");
+	menu_bar->set_name ("MainMenuBar");
 
 	EventBox* ev = manage (new EventBox);
+	ev->set_name ("MainMenuBar");
 	ev->show ();
-	CairoHPacker* hbox = manage (new CairoHPacker);
-	hbox->set_name (X_("gtk_background"));
+
+	Gtk::HBox* hbox = manage (new Gtk::HBox);
 	hbox->show ();
 	hbox->set_border_width (2);
-
 	ev->add (*hbox);
 
 	wall_clock_label.set_name ("WallClock");
@@ -695,33 +695,29 @@ ARDOUR_UI::build_menu_bar ()
 #endif
 
 	hbox->pack_end (error_alert_button, false, false, 2);
-
-	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 (dsp_load_label, false, false, 4);
+	hbox->pack_end (disk_space_label, 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);
+	menu_hbox.pack_end (*ev, true, true, 2);
 
-	menu_bar_base.set_name ("gtk_background");
+	menu_bar_base.set_name ("MainMenuBar");
 	menu_bar_base.add (menu_hbox);
 
 #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_gauge,  X_("Disk"),      _("Disk Space"), !Profile->get_small_screen());
-	_status_bar_visibility.add (&dsp_load_gauge,    X_("DSP"),       _("DSP"), true);
 	_status_bar_visibility.add (&peak_thread_work_label,X_("Peakfile"),  _("Active Peak-file Work"), false);
-	_status_bar_visibility.add (&disk_io_gauge,     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_space_label,      X_("Disk"),      _("Disk Space"), !Profile->get_small_screen());
+	_status_bar_visibility.add (&dsp_load_label,        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));
@@ -824,6 +820,8 @@ ARDOUR_UI::save_ardour_state ()
 
 	Config->save_state();
 
+	mixer->save_plugin_order_file();
+
 	UIConfiguration::instance().save_state ();
 
 	if (_session) {
@@ -857,7 +855,6 @@ ARDOUR_UI::save_ardour_state ()
 void
 ARDOUR_UI::resize_text_widgets ()
 {
-	//ToDo:  maybe resize the gauges to fit translated text
 }
 
 void
@@ -877,7 +874,7 @@ ARDOUR_UI::xrun_button_release (GdkEventButton* ev)
 
 	if (_session) {
 		_session->reset_xrun_count ();
-		update_xrun_count ();
+		update_cpu_load ();
 	}
 	return true;
 }