X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fclearlooks.rc.in;h=9792028f0dc708aeaf347c48dbfd567e4cee1301;hb=0a67b1661c1dd18b8a2d8b247f2ee94d75499bc2;hp=3a418b9d8dad01bed7992d808dd5a3fe55b7b66a;hpb=fcef47c4bb29b4f52cc59e7889393a17a380c750;p=ardour.git

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 3a418b9d8d..9792028f0d 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -26,7 +26,6 @@ style "default" = "medium_text"
   GtkDialog           :: content-area-border              = 2                 # [               2 ] ( >= 0 ) Width of border around the main dialog area.
   GtkDialog           :: content-area-spacing             = 0                 # [               0 ] ( >= 0 ) The default spacing used between elements of the content area of the dialog.
 
-
   GtkButton           :: default-border = { 0, 0, 0, 0 }
   GtkButton           :: default-outside_border = { 0, 0, 0, 0 }
   GtkButton           :: button-relief = GTK_RELIEF_NONE
@@ -104,13 +103,8 @@ style "default" = "medium_text"
   GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
 
   GtkEntry::cursor_color = @entry_cursor
-
-  #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
-
-  #xthickness = 0
-  #ythickness = 0
-
-#Base Colors
+  GtkEntry::state-hint = 0
+  
   bg[NORMAL]          = @background
   bg[PRELIGHT]        = shade(1.1, @background)
   bg[ACTIVE]          = shade(0.9, @background)
@@ -123,49 +117,89 @@ style "default" = "medium_text"
   fg[INSENSITIVE]     = shade(0.7, @background)
   fg[SELECTED]        = @fg_selected
 
+  # These base and text colors will be used by treeviews and some other widgets.
+
   base[NORMAL]        = @bases
   base[PRELIGHT]      = @bases
   base[INSENSITIVE]   = shade(1.0, @background)
-  base[ACTIVE]        = shade(0.9, @bg_selected)
-  base[SELECTED]      = @bg_selected
+  base[ACTIVE]        = shade(0.9, @bg_selected) /* base for focused, selected text */
+  base[SELECTED]      = @bg_selected /* base for non-focused, selected text */
 
   text[NORMAL]        = @texts
   text[PRELIGHT]      = @texts
-  text[ACTIVE]        = @fg_selected
   text[INSENSITIVE]   = shade(0.7, @lightest)
-  text[SELECTED]      = @fg_selected
+  text[ACTIVE]        = @fg_selected          /* text color for focused selected text */
+  text[SELECTED]      = @fg_selected          /* text color for non-focused selected text */
 
-#engine specific tweaks
+  #engine specific tweaks
 
   engine "clearlooks"
   {
-    #style              = GLOSSY
-    #colorize_scrollbar = TRUE
     menubarstyle       = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
-    #toolbarstyle       = 0 # 0 = flat, 1 = enable effects
   }
 }
 
 style "entry"
 {
-  # setting these two to zero avoids the focus indicator around the text
+  GtkEntry::cursor_color = @entry_cursor
+  GtkEntry::inner-border = { 2, 2, 2, 2 }
 
   xthickness = 0
   ythickness = 0
 
   # special base + text for GtkEntry to aid with visibility during text entry
 
-  base[NORMAL]      = @entry_base
-  base[PRELIGHT]    = @entry_base
-  base[INSENSITIVE] = @entry_base
-  base[ACTIVE]      = @entry_base_selected /* base for focused, selected text */
-  base[SELECTED]    = @entry_base_selected   /* base for non-focused, selected text */
+  base[NORMAL]      = @bases
+  base[PRELIGHT]    = @bases
+  base[INSENSITIVE] = shade(1.0, @background)
+  base[ACTIVE]      = @bases
+  base[SELECTED]    = @bg_selected
+
+  text[NORMAL]      = @texts
+  text[PRELIGHT]    = @texts
+  text[INSENSITIVE] = shade(0.7, @lightest)
+  text[ACTIVE]      = @texts
+  text[SELECTED]    = @fg_selected
+}
+
+style "spin_button" = "entry"
+{
+  engine "clearlooks"
+  {
+	# without this empty declaration, SpinButtons draw their arrows oddly
+  }
 
-  text[NORMAL]      = @entry_text
-  text[PRELIGHT]    = @entry_text
-  text[INSENSITIVE] = shade (0.92, @entry_text)
-  text[ACTIVE]      = @entry_text_selected
-  text[SELECTED]    = @entry_text_selected
+}
+
+style "mixer_strip_entry" = "small_text"
+{
+        xthickness = 3
+        ythickness = 3
+
+	bg[NORMAL] = @bases
+	bg[ACTIVE] = @bases
+	bg[SELECTED] = @bases
+
+	text[NORMAL] = @texts
+	text[ACTIVE] = @texts
+	text[SELECTED] = @texts
+
+	base[NORMAL] = @bases
+	base[ACTIVE] = @bases
+	base[SELECTED] = @bases
+}
+
+style "peak_display_peaked_entry" = "mixer_strip_entry"
+{
+	fg[ACTIVE] = @texts
+	fg[SELECTED] = @texts
+	text[SELECTED] = @texts
+
+	base[NORMAL] = @clip_indicator
+	base[ACTIVE] = @clip_indicator
+	base[PRELIGHT] = @clip_indicator
+	base[INSENSITIVE] = @clip_indicator
+	base[SELECTED] = @clip_indicator
 }
 
 style "treeview_parent_node"
@@ -231,7 +265,6 @@ style "automation_track_header"
 	bg[PRELIGHT] = @automation_track_header
 }
 
-
 style "inspector_processor_list" = "processor_list"
 {
 	base[SELECTED] = { 0.3, 0.3, 0.3 }
@@ -239,12 +272,12 @@ style "inspector_processor_list" = "processor_list"
 
 style "time_info_box"
 {
-        bg[NORMAL] = { 0.05, 0.05, 0.05 }
+        bg[NORMAL] = { 0.00, 0.00, 0.00 }
 }
 
 style "status_bar_box"
 {
-        bg[NORMAL] = { 0.149, 0.149, 0.149 }
+        bg[NORMAL] = @darkest
 }
 
 style "very_small_text"
@@ -351,7 +384,6 @@ style "time_axis_view_item_name" = "very small text"
 {
 }
 
-
 style "midi_tracer_textview" = "medium_monospace_text"
 {
 
@@ -376,6 +408,14 @@ style "base_frame"
 	bg[NORMAL] = @background
 }
 
+style "transport_frame"
+{
+}
+
+style "editor_window"
+{
+}
+
 style "transport_base" = "medium_bold_text"
 {
 }
@@ -463,7 +503,7 @@ style "processor" = "small_text"
 {
 }
 
-style "ruler_label" = "small_bold_text"
+style "ruler_label" = "small_text"
 {
 	fg[NORMAL] = @light_text_on_dark
 }
@@ -576,7 +616,6 @@ style "fatal_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "error_message" = "medium_text"
@@ -586,7 +625,6 @@ style "error_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "info_message" = "medium_text"
@@ -596,7 +634,6 @@ style "info_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "warning_message" = "medium_text"
@@ -606,7 +643,6 @@ style "warning_message" = "medium_text"
 	bg[ACTIVE]   = @bases
 	bg[NORMAL]   = @bases
 	base[NORMAL] = @bases
-	base[NORMAL] = @bases
 }
 
 style "medium_entry" = "medium_text"
@@ -652,32 +688,12 @@ style "medium_bold_entry"  = "medium_bold_text"
 
 	bg[NORMAL] = @bases
 	bg[SELECTED] = @bases
-	bg[SELECTED] = @bases
 
 	base[NORMAL] = @bases
 	base[ACTIVE] = @bases
 	base[SELECTED] = @bg_selected
 }
 
-style "small_entry" = "small_text"
-{
-	fg[NORMAL] = @texts
-	fg[ACTIVE] = @contrasting_indicator
-	fg[SELECTED] = @fg_selected
-
-	text[NORMAL] = @texts
-	text[ACTIVE] = @texts
-	text[SELECTED] = @texts
-
-	bg[NORMAL] = @bases
-	bg[ACTIVE] = @bases
-	bg[SELECTED] = @bases
-
-	base[NORMAL] = @bases
-	base[ACTIVE] = @bases
-	base[SELECTED] = @bases
-}
-
 style "small_spinner" = "small_text"
 {
 	xthickness = 0
@@ -695,13 +711,6 @@ style "small_spinner" = "small_text"
 	base[SELECTED] = @background
 }
 
-style "red_active_small_entry" = "small_entry"
-{
-	fg[ACTIVE] = @texts
-	fg[SELECTED] = @texts
-	text[SELECTED] = @texts
-}
-
 style "small_red_on_black_entry"  = "small_bold_text"
 {
 	fg[NORMAL] = @bright_indicator
@@ -749,6 +758,21 @@ style "audio_track_base" = "default"
 	bg[SELECTED] = @background
 }
 
+style "control_master_base" = "default"
+{
+	font_name = " 8"
+	# NORMAL is used for single-data type labels, or Audio
+	# ACTIVE is used for MIDI in the presence of multiple data type
+	fg[NORMAL] = @foreground
+	fg[ACTIVE] = darker(@foreground)
+
+	bg[NORMAL] = @control_master
+	bg[ACTIVE] = @background
+	bg[PRELIGHT] = @background
+	bg[INSENSITIVE] = @background
+	bg[SELECTED] = @background
+}
+
 style "midi_track_base" = "default"
 {
 	font_name = " 8"
@@ -918,19 +942,6 @@ style "paler_bright_when_active" = "medium_text"
 	bg[ACTIVE] = lighter(@bright_indicator)
 }
 
-style "peak_display_peaked_entry" = "small_entry"
-{
-	fg[ACTIVE] = @texts
-	fg[SELECTED] = @texts
-	text[SELECTED] = @texts
-
-	base[NORMAL] = @bright_indicator
-	base[ACTIVE] = @bright_indicator
-	base[PRELIGHT] = @bright_indicator
-	base[INSENSITIVE] = @bright_indicator
-	base[SELECTED] = @bright_indicator
-}
-
 style "selected_strip_frame"
 {
 	fg[NORMAL] = @bright_indicator
@@ -982,7 +993,6 @@ style "location_row_button" = "default_button"
 	font_name = " 10"
 }
 
-
 style "ardour_button" ="default_button"
 {
 	xthickness = 1
@@ -1038,8 +1048,8 @@ style "vca_label_bar" = "medium_bold_text"
 }
 
 class "GtkWidget" style:highest "default"
-class "GtkSpinButton" style:highest "default"
-class "GtkEntry" style:highest "entry"
+class "GtkSpinButton" style:highest "spin_button"
+class "GtkEntry" style "entry"                          # not :highest to allow instances to override this
 class "GtkScrollbar" style:highest "ardour_adjusters"
 class "GtkLabel" style:highest "default_generic"
 class "GtkButton" style:highest "ardour_button"
@@ -1065,7 +1075,6 @@ widget "*MixerAutomationModeButton.*" style:highest "very_small_button"
 widget "*MixerAutomationPlaybackButton*" style:highest "very_small_button"
 widget "*MixerAutomationPlaybackButton.*" style:highest "very_small_button"
 widget "*ShuttleControl" style:highest "shuttle_control"
-#widget "*MainMenuBar" style:highest "menu_bar_base"
 widget "*ErrorMessage" style:highest "error_message"
 widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
@@ -1087,6 +1096,10 @@ widget "*zoomrange clock" style:highest "medium_text"
 widget "*timecodeoffset clock" style:highest "medium_text"
 
 widget "*BaseFrame" style:highest "base_frame"
+widget "*TransportFrame" style:highest "transport_frame"
+widget "*TransportFrame*" style:highest  "transport_frame"
+widget "*EditorWindow*" style:highest  "editor_window"
+widget "*EditorWindow" style:highest  "editor_window"
 
 widget "*SendStripBase" style:highest "send_strip_base"
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
@@ -1115,6 +1128,7 @@ widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inacti
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
+widget "*ControlMasterBaseUnselected" style:highest "control_master_base"
 
 widget "*SendUIFader" style:highest "plugin_slider"
 widget "*ReturnUIFader" style:highest "plugin_slider"
@@ -1125,11 +1139,8 @@ widget "*AudioBusFader" style:highest "audio_bus_fader"
 
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
 widget "*TrackSeparator" style:highest "track_separator"
-widget "*TrackNameEditor" style:highest "track_name_editor"
 widget "*TrackNameEditor*" style:highest "track_name_editor"
-widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
 widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
-widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"
 widget "*CrossfadeEditCurveButton*" style:highest "bright_when_active"
 widget "*CrossfadeEditFrame" style:highest "base_frame"
 widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_header_inactive"
@@ -1142,10 +1153,7 @@ widget "*BusControlsBaseSelected" style:highest "track_header_selected"
 widget "*AutomationTrackControlsBase" style:highest "automation_track_header"
 widget "*AutomationTrackControlsBaseSelected" style:highest "track_header_selected"
 widget "*PluginParameterLabel" style:highest "medium_text"
-widget "*MotionControllerValue" style:highest "small_entry"
-widget "*MotionControllerValue*" style:highest "small_entry"
 widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
-widget "*PluginUIClickBox" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
 widget "*ProcessorControlSlider" style:highest "processor_control_slider"
 widget "*processor control button" style:highest "processor_control_button"
@@ -1155,26 +1163,21 @@ widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*MixerStripGainDisplay" style:highest "small_entry"
-widget "*MixerStripGainDisplay*" style:highest "small_entry"
-widget "*MixerStripPeakDisplay" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
-widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
+widget "*MixerStripGainDisplay" style:highest "mixer_strip_entry"
+widget "*MixerStripPeakDisplay" style:highest "mixer_strip_entry"
+widget "*MixerStripPeakDisplayPeak" style:highest "peak_display_peaked_entry"
 widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"
 widget "*MixerStripFrame" style:highest "base_frame"
-widget "*FadeCurve" style:highest "medium_bold_entry"
 widget "*FadeCurve*" style:highest "medium_bold_entry"
 widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
 widget "*TearOffArrow" style:highest "tearoff_arrow"
 widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateButton" style:highest "small_button"
-widget "*PluginAutomateButton*" style:highest "small_button"
-widget "*PluginSaveButton" style:highest "small_button"
+widget "*plugin automation state button*" style:highest "small_button"
 widget "*PluginSaveButton*" style:highest "small_button"
 widget "*PluginEditorButton*" style:highest "default_toggle_button"
 widget "*PluginEditorButton-active" style:highest "default_toggle_button_active"
+widget "*PluginAnalysisInfoLabel" style:highest "medium_monospace_text"
 
-widget "*BarControlSpinner" style:highest "small_spinner"
 widget "*BarControlSpinner*" style:highest "small_spinner"
 
 widget "*BlackSeparator" style:highest "black_separator"
@@ -1183,7 +1186,6 @@ widget "*MetricLabel" style:highest "medium_text"
 widget "*ChoiceWindow" style:highest "default_generic"
 widget "*TrackParameterName" style:highest "small_italic_text"
 widget "*AddRouteDialog*" style:highest "medium_text"
-widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
 widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
 widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
 widget "*NewSessionSR1Label" style:highest "red_medium_text"
@@ -1191,19 +1193,14 @@ widget "*NewSessionSR2Label" style:highest "medium_text"
 widget "*location edit row clock" style:highest "medium_text"
 widget "*ArdourLuaEntry" style:highest "medium_monospace_text"
 widget "*LocationEditNameLabel" style:highest "medium_text"
-widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
-widget "*LocationEditHideButton" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditHideButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditLockButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditGlueButton*" style:highest "small_red_active_and_selected_button"
 widget "*LocationEditNumberLabel" style:highest "small_text"
 widget "*LocationEditNameEntry" style:highest "option_entry"
-widget "*LocationAddLocationButton" style:highest "default_button"
 widget "*LocationAddLocationButton*" style:highest "default_button"
-widget "*LocationAddRangeButton" style:highest "default_button"
 widget "*LocationAddRangeButton*" style:highest "default_button"
-widget "*LocationEditRemoveButton" style:highest "location_row_button"
 widget "*LocationEditRemoveButton*" style:highest "location_row_button"
 widget "*ChannelCountSelector" style:highest "medium_bold_entry"
 widget "*RegionListWholeFile" style:highest "treeview_parent_node"
@@ -1212,7 +1209,6 @@ widget "*PortMatrixLabel*" style:highest "small_text"
 widget "*midi device" style:highest "midi_device"
 widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
 widget "*meterbridge label" style:highest "meterbridge_label"
-widget "*ContrastingPopup" style:highest "contrasting_popup"
 widget "*ContrastingPopup*" style:highest "contrasting_popup"
 widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
 widget "*TimeInfoSelectionTitle" style:highest "small_text"
@@ -1230,5 +1226,5 @@ widget "*MonitorSectionLabel" style:highest "small_text"
 widget "*ooltip*" style:highest "tooltip"
 widget "*Pane" style:highest "pane"
 widget "*Pane.Divider" style:highest "pane"
-widget "*VCALabelBar" style:highest "vca_label_bar"
 widget "*VCALabelBar*" style:highest "vca_label_bar"
+