A couple GUI tweaks - minor toolbar reorganization, trying to get the width down below 1024 (and make things more organized and easier to use in general). Not quite there yet....

git-svn-id: svn://localhost/ardour2/branches/midi@648 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 66 insertions, 54 deletions

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index cc514890fc..1e26381de5 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -2,14 +2,14 @@ cWaveForm 0.0 0.0 0.0 0.80
 cMutedWaveForm 0.35 0.35 0.35 1.0
 cSelectedFrameBase 0.71 0.57 0.66 1.0
 cFrameBase 0.75 0.75 0.76 1.0
-cAudioTrackBase 0.79 0.80 0.85 0.41
+cAudioTrackBase 0.75 0.80 0.75 0.41
 cAudioTrackOutline 0.00 0.00 0.00 1.00
-cAudioBusBase 0.90 0.82 0.90 0.41
-cTempoBar 0.64 0.64 0.66 1.0
-cMeterBar 0.75 0.75 0.80 1.0
-cMarkerBar 0.54 0.54 0.56 1.0
-cRangeMarkerBar 0.48 0.48 0.50 1.0
-cTransportMarkerBar 0.40 0.40 0.42 1.0
+cAudioBusBase 0.75 0.75 0.85 0.41
+cMeterBar 0.40 0.40 0.40 1.0
+cTempoBar 0.45 0.45 0.45 1.0
+cMarkerBar 0.50 0.50 0.50 1.0
+cRangeMarkerBar 0.55 0.55 0.55 1.0
+cTransportMarkerBar 0.60 0.60 0.60 1.0
 cTimeStretchFill 0.89 0.71 0.71 0.59
 cTimeStretchOutline 0.39 0.39 0.39 0.59
 cAutomationLine 0.27 0.74 0.35 1.0
@@ -65,8 +65,8 @@ cEnteredAutomationLine 0.87 0.39 0.39 1.00
 cEnteredMarker 0.87 0.39 0.39 1.00
 cMeterMarker 0.95 0.26 0.36 1.00
 cTempoMarker 0.95 0.26 0.36 1.00
-cMeasureLineBeat 0.51 0.59 0.87 0.98
-cMeasureLineBar 0.68 0.68 0.59 0.94
+cMeasureLineBar 0.5 0.5 0.5 0.98
+cMeasureLineBeat 0.7 0.7 0.7 0.94
 cGhostTrackBaseOutline 0.00 0.00 0.00 1.00
 cGhostTrackBaseFill 0.27 0.00 0.49 0.50
 cImageTrackBase 0.87 0.87 0.85 1.00
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 9293883067..4328ec9ce6 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -256,10 +256,10 @@
 		   <menuitem action='CrossfadesShort'/>
 	       </menu>
 	       <menu action='Layering'>
-		   <menuitem action='LayerLaterHigher'/>
-		   <menuitem action='LayerMoveAddHigher'/>
-		   <menuitem action='LayerAddHigher'/>
-               </menu>
+		     <menuitem action='LayerLaterHigher'/>
+		     <menuitem action='LayerMoveAddHigher'/>
+		     <menuitem action='LayerAddHigher'/>
+           </menu>
                <separator/>
                <menuitem action='SendMTC'/>
                <menuitem action='SendMMC'/>
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index ac4f055df6..ebf7e59cd8 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -111,7 +111,7 @@ style "default_base" = "medium_text"
   base[SELECTED]     = { 0.25, 0.25, 0.25 }
   
   engine "clearlooks"  {
-    menubarstyle      = 2       # 0 = flat, 1 = sunken, 2 = flat gradient
+    menubarstyle      = 1       # 0 = flat, 1 = sunken, 2 = flat gradient
     menuitemstyle     = 1       # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
     listviewitemstyle = 1       # 0 = flat, 1 = 3d-ish (gradient)
     progressbarstyle  = 0       # 0 = candy bar, 1 = flat
@@ -132,13 +132,13 @@ style "transport_base" = "medium_bold_text"
   bg[INSENSITIVE] = { 0, 0, 0 }
   bg[SELECTED] = { 0, 0, 0 }
 }
-
+/*
 style "black_mackie_menu_bar" = "medium_bold_text"
 {
       fg[NORMAL] = { 1.0, 1.0, 1.0 }
       bg[NORMAL] = { 0, 0, 0 }
 }
-
+*/
 style "default_buttons_menus" 
 {
   font_name = "sans 8"
@@ -327,7 +327,7 @@ style "xrun_warn"
 	bg[NORMAL] = { 1.0, 0.48, 0.46 }
 	bg[ACTIVE] = { 0.09, 1.0, 0.46 }
 }
-
+/*
 style "menu_bar_base"
 {
   bg[NORMAL] = { 0, 0, 0 }	
@@ -336,7 +336,7 @@ style "menu_bar_base"
   bg[INSENSITIVE] = { 0, 0, 0 }
   bg[SELECTED] = { 0, 0, 0 }
 }
-
+*/
 style "fatal_message" = "medium_text"
 {
    fg[ACTIVE] = { 1.0, 0, 1.0 }
@@ -973,7 +973,7 @@ widget "*TransportRecButton" style "transport_rec_button"
 widget "*TransportRecButton*" style "transport_rec_button"
 widget "*RecordingXrunWarningWindow" style "xrun_warn"
 widget "*RecordingXrunWarningWindow*" style "xrun_warn"
-widget "*MainMenuBar" style "menu_bar_base"
+/*widget "*MainMenuBar" style "menu_bar_base"*/
 widget "*ErrorMessage" style "error_message"
 widget "*FatalMessage" style "fatal_message"
 widget "*InfoMessage" style "info_message"
@@ -1055,8 +1055,8 @@ widget "*AudioTrackControlsBaseSelected" style "edit_controls_base_selected"
 widget "*BusControlsBaseSelected" style "edit_controls_base_selected"
 widget "*AutomationTrackControlsBase" style "automation_track_controls_base"
 widget "*AutomationTrackControlsBaseSelected" style "edit_controls_base_selected"
-widget "*EditorMenuBar*" style "black_mackie_menu_bar"
-widget "*MainMenuBar*" style "black_mackie_menu_bar"
+/*widget "*EditorMenuBar*" style "black_mackie_menu_bar"
+widget "*MainMenuBar*" style "black_mackie_menu_bar"*/
 widget "*ZoomClickBox" style "medium_bold_entry"
 widget "*PluginParameterLabel" style "medium_text"
 widget "*PluginNameInfo" style "plugin_name_text"
@@ -1080,8 +1080,8 @@ widget "*MixerTrackDisplayList" style "track_list_display"
 widget "*MixerSnapshotDisplayList" style "track_list_display"
 widget "*MixerAuxDisplayList" style "track_list_display"
 widget "*MixerGroupList" style "track_list_display"
-widget "*WallClock" style "wall_clock"
-widget "*CPULoad" style "wall_clock"
+/*widget "*WallClock" style "wall_clock"
+widget "*CPULoad" style "wall_clock"*/
 widget "*RegionEditorLabel" style "medium_text"
 widget "*RegionEditorSmallLabel" style "small_text"
 widget "*RegionEditorEntry" style "medium_entry"
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 901541778d..a558f004db 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -117,12 +117,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 
 	  shuttle_units_button (_("% ")),
 
-	  punch_in_button (_("punch\nin")),
-	  punch_out_button (_("punch\nout")),
-	  auto_return_button (_("auto\nreturn")),
-	  auto_play_button (_("auto\nplay")),
-	  auto_input_button (_("auto\ninput")),
-	  click_button (_("click")),
+	  punch_in_button (_("Punch In")),
+	  punch_out_button (_("Punch Out")),
+	  auto_return_button (_("Auto Return")),
+	  auto_play_button (_("Autuo Play")),
+	  auto_input_button (_("Auto Input")),
+	  click_button (_("Click")),
 	  auditioning_alert_button (_("AUDITIONING")),
 	  solo_alert_button (_("SOLO")),
 	  shown_flag (false)
@@ -508,11 +508,11 @@ ARDOUR_UI::update_sample_rate (jack_nframes_t ignored)
 		jack_nframes_t rate = engine->frame_rate();
 		
 		if (fmod (rate, 1000.0) != 0.0) {
-			snprintf (buf, sizeof (buf), _("SR: %.1f kHz / %4.1f msecs"), 
+			snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f msecs"), 
 				  (float) rate/1000.0f,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		} else {
-			snprintf (buf, sizeof (buf), _("SR: %u kHz / %4.1f msecs"), 
+			snprintf (buf, sizeof (buf), _("%u kHz / %4.1f msecs"), 
 				  rate/1000,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		}
@@ -525,7 +525,7 @@ void
 ARDOUR_UI::update_cpu_load ()
 {
 	char buf[32];
-	snprintf (buf, sizeof (buf), _("DSP Load: %.1f%%"), engine->get_cpu_load());
+	snprintf (buf, sizeof (buf), _("DSP: %.1f%%"), engine->get_cpu_load());
 	cpu_load_label.set_text (buf);
 }
 
@@ -562,7 +562,7 @@ ARDOUR_UI::update_disk_space()
 	char buf[64];
 
 	if (frames == max_frames) {
-		strcpy (buf, _("space: 24hrs+"));
+		strcpy (buf, _("Disk: 24hrs+"));
 	} else {
 		int hrs;
 		int mins;
@@ -592,7 +592,7 @@ ARDOUR_UI::update_disk_space()
 		frames -= mins * fr * 60;
 		secs = frames / fr;
 		
-		snprintf (buf, sizeof(buf), _("space: %02dh:%02dm:%02ds"), hrs, mins, secs);
+		snprintf (buf, sizeof(buf), _("Space: %02dh:%02dm:%02ds"), hrs, mins, secs);
 	}
 
 	disk_space_label.set_text (buf);
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index f92201e36c..2b94117724 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -362,7 +362,7 @@ ARDOUR_UI::setup_transport ()
 	alert_box.pack_start (solo_alert_button);
 	alert_box.pack_start (auditioning_alert_button);
 
-	transport_tearoff_hbox.set_border_width (5);
+	transport_tearoff_hbox.set_border_width (4);
 
 	transport_tearoff_hbox.pack_start (goto_start_button, false, false);
 	transport_tearoff_hbox.pack_start (goto_end_button, false, false);
@@ -412,19 +412,31 @@ ARDOUR_UI::setup_transport ()
 	transport_tearoff_hbox.pack_start (play_selection_button, false, false);
 	transport_tearoff_hbox.pack_start (roll_button, false, false);
 	transport_tearoff_hbox.pack_start (stop_button, false, false);
-	transport_tearoff_hbox.pack_start (rec_button, false, false, 10);
-
-	transport_tearoff_hbox.pack_start (primary_clock, false, false, 5);
-	transport_tearoff_hbox.pack_start (secondary_clock, false, false, 5);
-
-	transport_tearoff_hbox.pack_start (sync_option_combo, false, false);
-	transport_tearoff_hbox.pack_start (time_master_button, false, false);
-	transport_tearoff_hbox.pack_start (punch_in_button, false, false);
-	transport_tearoff_hbox.pack_start (punch_out_button, false, false);
-	transport_tearoff_hbox.pack_start (auto_input_button, false, false);
-	transport_tearoff_hbox.pack_start (auto_return_button, false, false);
-	transport_tearoff_hbox.pack_start (auto_play_button, false, false);
-	transport_tearoff_hbox.pack_start (click_button, false, false);
+	transport_tearoff_hbox.pack_start (rec_button, false, false, 8);
+
+	HBox* clock_box = manage (new HBox);
+	clock_box->pack_start (primary_clock, false, false);
+	clock_box->pack_start (secondary_clock, false, false);
+	VBox* time_controls_box = manage (new VBox);
+	time_controls_box->pack_start (sync_option_combo, false, false);
+	time_controls_box->pack_start (time_master_button, false, false);
+	clock_box->pack_start (*time_controls_box, false, false, 2);
+	transport_tearoff_hbox.pack_start (*clock_box, false, false, 4);
+	
+	VBox* punch_box = manage (new VBox);
+	punch_box->pack_start (punch_in_button, false, false);
+	punch_box->pack_start (punch_out_button, false, false);
+	transport_tearoff_hbox.pack_start (*punch_box, false, false);
+
+	VBox* auto_box = manage (new VBox);
+	auto_box->pack_start (auto_play_button, false, false);
+	auto_box->pack_start (auto_return_button, false, false);
+	transport_tearoff_hbox.pack_start (*auto_box, false, false);
+	
+	VBox* io_box = manage (new VBox);
+	io_box->pack_start (auto_input_button, false, false);
+	io_box->pack_start (click_button, false, false);
+	transport_tearoff_hbox.pack_start (*io_box, false, false);
 	
 	/* desensitize */
 
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index e23ea65716..feea76a178 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -273,26 +273,26 @@ ARDOUR_UI::install_actions ()
 	   name appearance on the buttons.
 	*/
 
-	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch\nin"), mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
+	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchIn"), _("Punch In"), mem_fun(*this, &ARDOUR_UI::toggle_punch_in));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchOut"), _("Punch\nout"), mem_fun(*this, &ARDOUR_UI::toggle_punch_out));
+	act = ActionManager::register_toggle_action (transport_actions, X_("TogglePunchOut"), _("Punch Out"), mem_fun(*this, &ARDOUR_UI::toggle_punch_out));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleClick"), _("Click"), mem_fun(*this, &ARDOUR_UI::toggle_click));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoInput"), _("Auto\ninput"), mem_fun(*this, &ARDOUR_UI::toggle_auto_input));
+	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoInput"), _("Auto Input"), mem_fun(*this, &ARDOUR_UI::toggle_auto_input));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoPlay"), _("Auto\nplay"), mem_fun(*this, &ARDOUR_UI::toggle_auto_play));
+	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoPlay"), _("Auto Play"), mem_fun(*this, &ARDOUR_UI::toggle_auto_play));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoReturn"), _("Auto\nreturn"), mem_fun(*this, &ARDOUR_UI::toggle_auto_return));
+	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleAutoReturn"), _("Auto Return"), mem_fun(*this, &ARDOUR_UI::toggle_auto_return));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::transport_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time\nmaster"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
+	act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time Master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master));
 	ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  0U));