specify time info box bg in style file(s), and make nudge clock use the same bg color (not in style file, but the UI conf file, naturally)

git-svn-id: svn://localhost/ardour2/branches/3.0@13434 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 14 insertions, 1 deletions

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index a6364f9f80..8a696e9aa6 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -340,6 +340,11 @@ style "inspector_processor_list" = "processor_list"
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
+style "time_info_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
 ##include ardour3_dark_fonts.rc
 ##include ardour3_dark_styles.rc
 ##include ardour3_widgets.rc
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 663c153c4f..d3b2113b49 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -598,7 +598,7 @@
     <Option name="selection clock: text" value="6bb620ff"/>
     <Option name="selection clock: edited text" value="ff0000ff"/>
     <Option name="selection clock: cursor" value="f11000ff"/>
-    <Option name="nudge clock: background" value="000000ff"/>
+    <Option name="nudge clock: background" value="262626ff"/>
     <Option name="nudge clock: text" value="6bb620ff"/>
     <Option name="nudge clock: edited text" value="ffa500ff"/>
     <Option name="nudge clock: cursor" value="ffa500ff"/>
diff --git a/gtk2_ardour/ardour3_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in
index 907ef38f5d..6c592c7970 100644
--- a/gtk2_ardour/ardour3_ui_light.rc.in
+++ b/gtk2_ardour/ardour3_ui_light.rc.in
@@ -351,6 +351,11 @@ style "inspector_processor_list" = "processor_list"
  	base[SELECTED] = { 0.3, 0.3, 0.3 }
 }
 
+style "time_info_box" 
+{
+        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+}
+
 ##include ardour3_light_fonts.rc
 ##include ardour3_light_styles.rc
 ##include ardour3_widgets.rc
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index cba75ae4a2..6e6bd274ae 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -348,6 +348,7 @@ widget "*TimeInfoSelectionTitle" style:highest "very_small_text"
 widget "*TimeInfoSelectionLabel" style:highest "very_small_text"
 widget "*TimeInfoPunchTitle" style:highest "very_small_text"
 widget "*TimeInfoPunchButton" style:highest "very_small_text"
+widget "*TimeInfoBox" style:highest "time_info_box"
 widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
 widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
 widget "*EditorRouteGroupsAllGroupButton" style:highest "default_toggle_button"
diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index 2cb7e652b5..aeb361686a 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -48,6 +48,8 @@ TimeInfoBox::TimeInfoBox ()
 	, syncing_selection (false)
 	, syncing_punch (false)
 {
+	set_name (X_("TimeInfoBox"));
+
 	selection_start = new AudioClock ("selection-start", false, "selection", false, false, false, false);
 	selection_end = new AudioClock ("selection-end", false, "selection", false, false, false, false);
 	selection_length = new AudioClock ("selection-length", false, "selection", false, false, true, false);