From db633c4800b6698e3421c5510f82dff7e5f1bd08 Mon Sep 17 00:00:00 2001 From: "Hombrenatureh.510" Date: Mon, 24 Mar 2014 20:47:58 +0100 Subject: [PATCH] Solving issue 2290: "Enhanced look" --- rtdata/themes/09-Gray-Orange.gtkrc | 109 ++++- rtdata/themes/17-Gray-Red.gtkrc | 103 ++++- rtdata/themes/21-Gray-Gray.gtkrc | 119 +++-- rtdata/themes/21-Gray-Orange.gtkrc | 557 +++++++++++++++++++++++ rtdata/themes/21-Gray-Orange.iconset | 2 + rtdata/themes/21-Gray-Purple.gtkrc | 557 +++++++++++++++++++++++ rtdata/themes/21-Gray-Purple.iconset | 2 + rtdata/themes/21-Gray-Red.gtkrc | 557 +++++++++++++++++++++++ rtdata/themes/21-Gray-Red.iconset | 2 + rtdata/themes/25-Gray-Gray.gtkrc | 101 +++- rtdata/themes/25-Gray-Purple.gtkrc | 97 +++- rtdata/themes/25-Gray-Red.gtkrc | 97 +++- rtdata/themes/37-Gray-Red-Textured.gtkrc | 115 ++++- rtdata/themes/37-Gray-Red.gtkrc | 108 ++++- rtdata/themes/63-Gray-Cyan.gtkrc | 73 ++- rtdata/themes/92-Beige-DarkCyan.gtkrc | 89 +++- rtdata/themes/Default.gtkrc | 107 ++++- rtdata/themes/slim | 11 +- rtgui/adjuster.cc | 2 +- rtgui/blackwhite.cc | 4 +- rtgui/blackwhite.h | 2 +- rtgui/cacorrection.cc | 4 +- rtgui/cacorrection.h | 2 +- rtgui/chmixer.cc | 6 +- rtgui/chmixer.h | 2 +- rtgui/colorappearance.cc | 4 +- rtgui/colorappearance.h | 2 +- rtgui/crop.cc | 4 +- rtgui/crop.h | 2 +- rtgui/darkframe.cc | 4 +- rtgui/darkframe.h | 2 +- rtgui/defringe.cc | 3 +- rtgui/defringe.h | 2 +- rtgui/dirpyrdenoise.cc | 4 +- rtgui/dirpyrdenoise.h | 2 +- rtgui/dirpyrequalizer.cc | 4 +- rtgui/dirpyrequalizer.h | 2 +- rtgui/distortion.cc | 6 +- rtgui/distortion.h | 2 +- rtgui/epd.cc | 4 +- rtgui/epd.h | 2 +- rtgui/filebrowser.cc | 2 - rtgui/flatfield.cc | 4 +- rtgui/flatfield.h | 3 +- rtgui/gradient.cc | 4 +- rtgui/gradient.h | 2 +- rtgui/histogrampanel.cc | 8 +- rtgui/histogrampanel.h | 4 +- rtgui/hsvequalizer.cc | 4 +- rtgui/hsvequalizer.h | 4 +- rtgui/icmpanel.cc | 3 +- rtgui/icmpanel.h | 2 +- rtgui/ilabel.cc | 4 +- rtgui/ilabel.h | 2 +- rtgui/imagearea.cc | 3 +- rtgui/imagearea.h | 16 +- rtgui/impulsedenoise.cc | 4 +- rtgui/impulsedenoise.h | 2 +- rtgui/labcurve.cc | 4 +- rtgui/labcurve.h | 2 +- rtgui/lensgeom.cc | 6 +- rtgui/lensgeom.h | 4 +- rtgui/lensprofile.cc | 4 +- rtgui/lensprofile.h | 2 +- rtgui/mycurve.cc | 3 +- rtgui/mycurve.h | 2 +- rtgui/pcvignette.cc | 4 +- rtgui/pcvignette.h | 2 +- rtgui/perspective.cc | 4 +- rtgui/perspective.h | 2 +- rtgui/preferences.cc | 9 +- rtgui/preferences.h | 2 + rtgui/preprocess.cc | 4 +- rtgui/preprocess.h | 2 +- rtgui/rawcacorrection.cc | 4 +- rtgui/rawcacorrection.h | 2 +- rtgui/rawexposure.cc | 4 +- rtgui/rawexposure.h | 2 +- rtgui/rawprocess.cc | 4 +- rtgui/rawprocess.h | 2 +- rtgui/resize.cc | 26 +- rtgui/resize.h | 2 +- rtgui/rgbcurves.cc | 4 +- rtgui/rgbcurves.h | 2 +- rtgui/rotate.cc | 6 +- rtgui/rotate.h | 2 +- rtgui/shadowshighlights.cc | 4 +- rtgui/shadowshighlights.h | 2 +- rtgui/sharpenedge.cc | 4 +- rtgui/sharpenedge.h | 2 +- rtgui/sharpening.cc | 4 +- rtgui/sharpening.h | 2 +- rtgui/sharpenmicro.cc | 4 +- rtgui/sharpenmicro.h | 2 +- rtgui/shcselector.cc | 19 +- rtgui/thresholdadjuster.cc | 2 +- rtgui/thresholdselector.cc | 21 +- rtgui/thumbbrowserbase.cc | 3 +- rtgui/thumbbrowserbase.h | 2 +- rtgui/tonecurve.cc | 5 +- rtgui/tonecurve.h | 2 +- rtgui/toolpanel.cc | 84 +++- rtgui/toolpanel.h | 20 + rtgui/toolpanelcoord.cc | 29 +- rtgui/toolpanelcoord.h | 10 +- rtgui/vibrance.cc | 4 +- rtgui/vibrance.h | 2 +- rtgui/vignetting.cc | 4 +- rtgui/vignetting.h | 2 +- rtgui/whitebalance.cc | 4 +- rtgui/whitebalance.h | 2 +- 111 files changed, 2890 insertions(+), 413 deletions(-) create mode 100644 rtdata/themes/21-Gray-Orange.gtkrc create mode 100644 rtdata/themes/21-Gray-Orange.iconset create mode 100644 rtdata/themes/21-Gray-Purple.gtkrc create mode 100644 rtdata/themes/21-Gray-Purple.iconset create mode 100644 rtdata/themes/21-Gray-Red.gtkrc create mode 100644 rtdata/themes/21-Gray-Red.iconset diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc index a5f0626e6..c6f4c14d6 100644 --- a/rtdata/themes/09-Gray-Orange.gtkrc +++ b/rtdata/themes/09-Gray-Orange.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#FF8000\nrt_base_color:#0A0A0A\nrt_fg_color:#757575\nrt_tooltip_fg_color:#D2D2D2\nrt_selected_bg_color:#B3641B\nrt_selected_fg_color:#D0D0D0\nrt_text_color:#757575\nrt_bg_color:#181818\nrt_tooltip_bg_color:#5A5A5A" +gtk-color-scheme = "rt_salt_pinch:#C05F00\nrt_base_color:#0A0A0A\nrt_fg_color:#757575\nrt_tooltip_fg_color:#D2D2D2\nrt_selected_bg_color:#804d1d\nrt_selected_fg_color:#D0D0D0\nrt_text_color:#757575\nrt_bg_color:#181818\nrt_tooltip_bg_color:#5A5A5A\nrt_tool_bg:#212121\nrt_tool_border:#121212" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,16 +156,19 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { xthickness = 2 ythickness = 2 - bg[NORMAL] = shade (1.80, @rt_bg_color) - bg[PRELIGHT] = shade (2.00, @rt_bg_color) + bg[NORMAL] = shade (2.20, @rt_bg_color) + bg[PRELIGHT] = shade (3.00, @rt_bg_color) # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob #bg[SELECTED] = @rt_bg_color @@ -176,11 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 + bg[NORMAL] = @rt_tool_bg bg[ACTIVE] = shade (2.25, @rt_bg_color) bg[PRELIGHT] = shade (3.00, @rt_bg_color) + bg[SELECTED] = shade (4.00, @rt_bg_color) - fg[PRELIGHT] = shade (1.30, @rt_fg_color) + fg[PRELIGHT] = shade (2.00, @rt_fg_color) } style "clearlooks-vscale" { @@ -224,26 +231,62 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = @rt_base_color } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.95, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { - text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_fg_color - text[SELECTED] = @rt_selected_fg_color - text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) - text[ACTIVE] = @rt_fg_color + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + text[ACTIVE] = @rt_fg_color } style "clearlooks-button" { - bg[NORMAL] = shade (1.45, @rt_bg_color) - bg[PRELIGHT] = shade (1.65, @rt_bg_color) - bg[ACTIVE] = shade (2.00, @rt_bg_color) + bg[NORMAL] = shade (1.80, @rt_bg_color) + bg[PRELIGHT] = shade (2.20, @rt_bg_color) + bg[ACTIVE] = shade (3.00, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -284,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -302,7 +347,7 @@ style "clearlooks-expander" { style "clearlooks-expanderLabel" { - fg[NORMAL] = shade (1.50, @rt_text_color) + fg[NORMAL] = shade (1.30, @rt_text_color) fg[PRELIGHT] = @rt_selected_fg_color } @@ -359,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_salt_pinch + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -443,13 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -458,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -468,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc index d504a38d9..7af487db2 100644 --- a/rtdata/themes/17-Gray-Red.gtkrc +++ b/rtdata/themes/17-Gray-Red.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#404040\nrt_fg_color:#808080\nrt_tooltip_fg_color:#D2D2D2\nrt_selected_bg_color:#502828\nrt_selected_fg_color:#D0D0D0\nrt_text_color:#A0A0A0\nrt_bg_color:#2B2B2B\nrt_tooltip_bg_color:#5A5A5A" +gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#404040\nrt_fg_color:#808080\nrt_tooltip_fg_color:#D2D2D2\nrt_selected_bg_color:#502828\nrt_selected_fg_color:#D0D0D0\nrt_text_color:#A0A0A0\nrt_bg_color:#2B2B2B\nrt_tooltip_bg_color:#5A5A5A\nrt_tool_bg:#333333\nrt_tool_border:#434343" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,16 +156,19 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { xthickness = 2 ythickness = 2 - bg[NORMAL] = shade (1.35, @rt_bg_color) - bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[NORMAL] = shade (1.30, @rt_tool_bg) + bg[PRELIGHT] = shade (1.50, @rt_tool_bg) # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob #bg[SELECTED] = @rt_bg_color @@ -176,11 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.35, @rt_bg_color) - bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.75, @rt_bg_color) + bg[SELECTED] = shade (1.75, @rt_bg_color) - fg[PRELIGHT] = shade (1.30, @rt_fg_color) + fg[PRELIGHT] = shade (1.60, @rt_fg_color) } style "clearlooks-vscale" { @@ -224,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = shade (0.80, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -241,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (1.25, @rt_bg_color) - bg[PRELIGHT] = shade (1.50, @rt_bg_color) - bg[ACTIVE] = shade (1.70, @rt_bg_color) + bg[NORMAL] = shade (1.20, @rt_tool_bg) + bg[PRELIGHT] = shade (1.40, @rt_tool_bg) + bg[ACTIVE] = shade (1.65, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -284,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -359,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -443,13 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -458,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -468,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/21-Gray-Gray.gtkrc b/rtdata/themes/21-Gray-Gray.gtkrc index 03feec79d..f798bbf7a 100644 --- a/rtdata/themes/21-Gray-Gray.gtkrc +++ b/rtdata/themes/21-Gray-Gray.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#B0B0B0\nrt_base_color:#1A1A1A\nrt_fg_color:#B0B0B0\nrt_tooltip_fg_color:#1A1A1A\nrt_selected_bg_color:#4A4A4A\nrt_selected_fg_color:#B0B0B0\nrt_text_color:#909090\nrt_bg_color:#363636\nrt_tooltip_bg_color:#909090" +gtk-color-scheme = "rt_salt_pinch:#B0B0B0\nrt_base_color:#1A1A1A\nrt_fg_color:#909090\nrt_tooltip_fg_color:#1A1A1A\nrt_selected_bg_color:#4A4A4A\nrt_selected_fg_color:#B0B0B0\nrt_text_color:#828282\nrt_bg_color:#363636\nrt_tooltip_bg_color:#909090\nrt_tool_bg:#252525\nrt_tool_border:#484848" style "clearlooks-default" { xthickness = 1 @@ -47,9 +47,9 @@ style "clearlooks-default" { GtkScale::trough-side-details = 0 GtkScrollbar::min-slider-length = 30 - GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 14 - GtkExpander::expander-spacing = 3 + GtkMenuBar::internal-padding = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 1 @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,7 +179,10 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 + bg[NORMAL] = @rt_tool_bg bg[ACTIVE] = shade (1.45, @rt_bg_color) bg[PRELIGHT] = shade (1.70, @rt_bg_color) bg[SELECTED] = shade (2.00, @rt_bg_color) @@ -225,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = @rt_base_color } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-frame" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -242,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (1.35, @rt_bg_color) - bg[PRELIGHT] = shade (1.55, @rt_bg_color) - bg[ACTIVE] = shade (1.80, @rt_bg_color) + bg[NORMAL] = shade (1.20, @rt_bg_color) + bg[PRELIGHT] = shade (1.30, @rt_bg_color) + bg[ACTIVE] = shade (1.40, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -252,16 +294,6 @@ style "clearlooks-button" { } } -style "clearlooks-checkbutton" { - - bg[SELECTED] = darker (@rt_fg_color) - - engine "clearlooks" - { - hint = "checkbutton" - } -} - style "clearlooks-histButton" { GtkButton::child-displacement-x = 0 @@ -295,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -313,8 +347,8 @@ style "clearlooks-expander" { style "clearlooks-expanderLabel" { - fg[NORMAL] = shade (1.50, @rt_text_color) - fg[PRELIGHT] = shade (1.50, @rt_text_color) + fg[NORMAL] = shade (1.26, @rt_text_color) + fg[PRELIGHT] = shade (1.26, @rt_text_color) } style "clearlooks-menubar" { @@ -328,7 +362,7 @@ style "clearlooks-menu" { xthickness = 0 ythickness = 0 - bg[NORMAL] = shade (0.70, @rt_bg_color) + bg[NORMAL] = @rt_base_color engine "clearlooks" { radius = 0.0 @@ -359,10 +393,10 @@ style "clearlooks-separator_menu_item" { style "clearlooks-frame_title" { - fg[NORMAL] = shade (1.50, @rt_text_color) - fg[PRELIGHT] = shade (1.50, @rt_text_color) - fg[ACTIVE] = shade (1.50, @rt_text_color) - fg[SELECTED] = shade (1.50, @rt_text_color) + fg[NORMAL] = lighter (@rt_fg_color) + fg[PRELIGHT] = lighter (@rt_fg_color) + fg[ACTIVE] = lighter (@rt_fg_color) + fg[SELECTED] = lighter (@rt_fg_color) } style "clearlooks-partialPasteHeaderSep" { @@ -370,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.20, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -454,14 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" -widget_class "*" style "clearlooks-checkbutton" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -470,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -480,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/21-Gray-Orange.gtkrc b/rtdata/themes/21-Gray-Orange.gtkrc new file mode 100644 index 000000000..8cf9e6606 --- /dev/null +++ b/rtdata/themes/21-Gray-Orange.gtkrc @@ -0,0 +1,557 @@ +# +# This file is part of RawTherapee. +# +# Copyright (c) 2004-2011 Gabor Horvath +# +# RawTherapee is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RawTherapee is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with RawTherapee. If not, see . +# + +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. + +gtk-color-scheme = "rt_salt_pinch:#FF8000\nrt_base_color:#1A1A1A\nrt_fg_color:#909090\nrt_tooltip_fg_color:#1A1A1A\nrt_selected_bg_color:#B3641B\nrt_selected_fg_color:#B0B0B0\nrt_text_color:#828282\nrt_bg_color:#363636\nrt_tooltip_bg_color:#909090\nrt_tool_bg:#252525\nrt_tool_border:#484848" + +style "clearlooks-default" { + xthickness = 1 + ythickness = 1 + + ####################### + # Style Properties + ####################### + GtkButton::child-displacement-x = 1 + GtkButton::child-displacement-y = 1 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::image-spacing = 4 + GtkToolButton::icon-spacing = 4 + + GtkCheckButton::indicator-size = 14 + + GtkPaned::handle-size = 6 + + GtkRange::trough-border = 0 + GtkRange::slider-width = 12 + GtkRange::stepper-size = 16 + + #GtkScale::slider-width = 12 + GtkScale::slider-length = 30 + GtkScale::trough-side-details = 0 + + GtkScrollbar::min-slider-length = 30 + GtkMenuBar::internal-padding = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 + GtkToolbar::internal-padding = 1 + GtkTreeView::expander-size = 12 + GtkTreeView::vertical-separator = 1 + + GtkMenu::horizontal-padding = 0 + GtkMenu::vertical-padding = 0 + + WnckTasklist::fade-overlay-rect = 0 + # The following line hints to gecko (and possibly other appliations) + # that the entry should be drawn transparently on the canvas. + # Without this, gecko will fill in the background of the entry. + GtkEntry::honors-transparent-bg-hint = 1 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### + bg[NORMAL] = @rt_bg_color + bg[PRELIGHT] = shade (1.02, @rt_bg_color) + bg[SELECTED] = @rt_selected_bg_color + bg[INSENSITIVE] = @rt_bg_color + bg[ACTIVE] = shade (0.9, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + text[NORMAL] = @rt_text_color + text[PRELIGHT] = @rt_text_color + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = darker (@rt_bg_color) + text[ACTIVE] = @rt_selected_fg_color + + base[NORMAL] = @rt_base_color + base[PRELIGHT] = shade (0.95, @rt_bg_color) + base[SELECTED] = @rt_selected_bg_color + base[INSENSITIVE] = @rt_bg_color + base[ACTIVE] = shade (0.9, @rt_selected_bg_color) + + engine "clearlooks" { + colorize_scrollbar = TRUE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = FALSE + radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY + style = GUMMY + + # Set a hint to disable backward compatibility fallbacks. + hint = "use-hints" + } +} + +style "wide" { + xthickness = 2 + ythickness = 2 +} + +style "wider" { + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = mix (1.4, @rt_selected_bg_color, @rt_base_color) + fg[SELECTED] = @rt_selected_fg_color + + engine "clearlooks" { + focus_color = shade (0.65, @rt_selected_bg_color) + } +} + +style "clearlooks-paned" { + + bg[PRELIGHT] = shade (0.8, @rt_bg_color) + + engine "clearlooks" { + hint = "paned" + } +} + +style "clearlooks-HSV" { + + engine "clearlooks" { + hint = "HSV" + disable_focus = TRUE + } +} + +style "clearlooks-spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "clearlooks-framelessspinbutton" { + + # IMPORTANT! + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-scale" { + xthickness = 2 + ythickness = 2 + + bg[NORMAL] = shade (1.35, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob + #bg[SELECTED] = @rt_bg_color + + engine "clearlooks" { + focus_color = @rt_selected_bg_color + hint = "scale" + } +} + +style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 + + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) +} + +style "clearlooks-vscale" { + + engine "clearlooks" { + hint = "vscale" + } +} + +style "clearlooks-hscale" { + + engine "clearlooks" { + hint = "hscale" + } +} + +style "clearlooks-scrollbar" { + xthickness = 2 + ythickness = 2 + + bg[SELECTED] = shade (1.50, @rt_bg_color) + + engine "clearlooks" { + hint = "scrollbar" + } +} + +style "clearlooks-hscrollbar" { + + engine "clearlooks" { + hint = "hscrollbar" + } +} + +style "clearlooks-vscrollbar" { + + engine "clearlooks" { + hint = "vscrollbar" + } +} + +style "clearlooks-notebook_bg" { + + bg[NORMAL] = shade (1.02, @rt_bg_color) + bg[ACTIVE] = @rt_base_color +} + +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-frame" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-combobox" { + + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + text[ACTIVE] = @rt_fg_color +} + +style "clearlooks-button" { + + bg[NORMAL] = shade (1.20, @rt_bg_color) + bg[PRELIGHT] = shade (1.30, @rt_bg_color) + bg[ACTIVE] = shade (1.40, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + engine "clearlooks" + { + hint = "button" + } +} + +style "clearlooks-histButton" { + + GtkButton::child-displacement-x = 0 + GtkButton::child-displacement-y = 0 +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "clearlooks-notebook" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @rt_salt_pinch +} + +style "clearlooks-statusbar" { + + engine "clearlooks" { + hint = "statusbar" + } +} + +style "clearlooks-comboboxentry" { + + engine "clearlooks" { + # Note: + # If you set the appears-as-list option on comboboxes in the theme, + # then you should set this hint on the combobox instead. + hint = "comboboxentry" + } +} + +style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 + + fg[NORMAL] = @rt_salt_pinch + fg[PRELIGHT] = @rt_salt_pinch + fg[INSENSITIVE] = @rt_salt_pinch + + bg[PRELIGHT] = mix(0.8, @rt_selected_bg_color, @rt_bg_color) + + base[NORMAL] = @rt_salt_pinch + base[PRELIGHT] = @rt_salt_pinch + base[INSENSITIVE] = @rt_salt_pinch + + engine "clearlooks" { + hint = "expander" + } +} + +style "clearlooks-expanderLabel" { + + fg[NORMAL] = shade (1.26, @rt_text_color) + fg[PRELIGHT] = shade (1.26, @rt_text_color) +} + +style "clearlooks-menubar" { + + engine "clearlooks" { + hint = "menubar" + } +} + +style "clearlooks-menu" { + xthickness = 0 + ythickness = 0 + + bg[NORMAL] = @rt_base_color + + engine "clearlooks" { + radius = 0.0 + } +} + +style "clearlooks-menu_item" { + xthickness = 2 + ythickness = 3 + + fg[PRELIGHT] = @rt_selected_fg_color + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = @rt_selected_fg_color +} + +# This style is there to modify the separator menu items. The goals are: +# 1. Get a specific height. +# 2. The line should go to the edges (ie. no border at the left/right) +style "clearlooks-separator_menu_item" { + xthickness = 1 + ythickness = 0 + + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkWidget::wide-separators = 1 + GtkWidget::separator-width = 1 + GtkWidget::separator-height = 7 +} + +style "clearlooks-frame_title" { + + fg[NORMAL] = lighter (@rt_fg_color) + fg[PRELIGHT] = lighter (@rt_fg_color) + fg[ACTIVE] = lighter (@rt_fg_color) + fg[SELECTED] = lighter (@rt_fg_color) +} + +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.20, @rt_fg_color, @rt_bg_color) +} + +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + +style "clearlooks-treeview" { + + base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "clearlooks-progressbar" { + xthickness = 1 + ythickness = 1 + + fg[PRELIGHT] = @rt_selected_fg_color + + engine "clearlooks" { + # Explicitly set the radius for the progress bars inside menu items. + radius = 3.0 + + hint = "progressbar" + } +} + +# This style is based on the clearlooks-default style, so that the colors from the button +# style are overriden again. +style "clearlooks-treeview_header" = "clearlooks-default" { + xthickness = 2 + ythickness = 1 + + bg[NORMAL] = shade (0.80, @rt_bg_color) + + engine "clearlooks" { + radius = 0.0 + hint = "treeview-header" + } +} + +style "clearlooks-tooltips" { + xthickness = 4 + ythickness = 4 + + bg[NORMAL] = @rt_tooltip_bg_color + fg[NORMAL] = @rt_tooltip_fg_color +} + +############################################################################### +# The following part of the gtkrc applies the different styles to the widgets. +############################################################################### + +# The clearlooks-default style is applied to every widget +class "GtkWidget" style "clearlooks-default" + +class "GtkSeparator" style "wide" +class "GtkFrame" style "wide" +class "GtkCalendar" style "wide" +class "GtkCheckButton" style "wider" +class "GtkRadioButton" style "wider" +class "GtkEntry" style "clearlooks-entry" + +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" + +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" + +# General matching follows. The order is choosen so that the right styles override +# each other. EG. progressbar needs to be more important than the menu match. +widget_class "*" style "clearlooks-notebook_bg" +# This is not perfect, it could be done better. +# (That is modify *every* widget in the notebook, and change those back that +# we really don't want changed) +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" + +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" + +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" + +widget_class "**" style "clearlooks-checkbutton" +widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" + +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" + +widget_class "*." style "clearlooks-frame" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" + +widget_class "*" style "clearlooks-progressbar" + +# Treeview headers (and similar stock GTK+ widgets) +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" + +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" +widget "*.histButton" style "clearlooks-histButton" +widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" +widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" + +# The window of the tooltip is called "gtk-tooltip" +################################################################## +# FIXME: +# This will not work if one embeds eg. a button into the tooltip. +# As far as I can tell right now we will need to rework the theme +# quite a bit to get this working correctly. +# (It will involve setting different priorities, etc.) +################################################################## +widget "gtk-tooltip*" style "clearlooks-tooltips" + +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/21-Gray-Orange.iconset b/rtdata/themes/21-Gray-Orange.iconset new file mode 100644 index 000000000..99ac20640 --- /dev/null +++ b/rtdata/themes/21-Gray-Orange.iconset @@ -0,0 +1,2 @@ +[General] +Iconset=Dark diff --git a/rtdata/themes/21-Gray-Purple.gtkrc b/rtdata/themes/21-Gray-Purple.gtkrc new file mode 100644 index 000000000..1ec1a6e45 --- /dev/null +++ b/rtdata/themes/21-Gray-Purple.gtkrc @@ -0,0 +1,557 @@ +# +# This file is part of RawTherapee. +# +# Copyright (c) 2004-2011 Gabor Horvath +# +# RawTherapee is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RawTherapee is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with RawTherapee. If not, see . +# + +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. + +gtk-color-scheme = "rt_salt_pinch:#843382\nrt_base_color:#1A1A1A\nrt_fg_color:#909090\nrt_tooltip_fg_color:#1A1A1A\nrt_selected_bg_color:#5D235C\nrt_selected_fg_color:#B0B0B0\nrt_text_color:#828282\nrt_bg_color:#363636\nrt_tooltip_bg_color:#909090\nrt_tool_bg:#252525\nrt_tool_border:#484848" + +style "clearlooks-default" { + xthickness = 1 + ythickness = 1 + + ####################### + # Style Properties + ####################### + GtkButton::child-displacement-x = 1 + GtkButton::child-displacement-y = 1 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::image-spacing = 4 + GtkToolButton::icon-spacing = 4 + + GtkCheckButton::indicator-size = 14 + + GtkPaned::handle-size = 6 + + GtkRange::trough-border = 0 + GtkRange::slider-width = 12 + GtkRange::stepper-size = 16 + + #GtkScale::slider-width = 12 + GtkScale::slider-length = 30 + GtkScale::trough-side-details = 0 + + GtkScrollbar::min-slider-length = 30 + GtkMenuBar::internal-padding = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 + GtkToolbar::internal-padding = 1 + GtkTreeView::expander-size = 12 + GtkTreeView::vertical-separator = 1 + + GtkMenu::horizontal-padding = 0 + GtkMenu::vertical-padding = 0 + + WnckTasklist::fade-overlay-rect = 0 + # The following line hints to gecko (and possibly other appliations) + # that the entry should be drawn transparently on the canvas. + # Without this, gecko will fill in the background of the entry. + GtkEntry::honors-transparent-bg-hint = 1 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### + bg[NORMAL] = @rt_bg_color + bg[PRELIGHT] = shade (1.02, @rt_bg_color) + bg[SELECTED] = @rt_selected_bg_color + bg[INSENSITIVE] = @rt_bg_color + bg[ACTIVE] = shade (0.9, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + text[NORMAL] = @rt_text_color + text[PRELIGHT] = @rt_text_color + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = darker (@rt_bg_color) + text[ACTIVE] = @rt_selected_fg_color + + base[NORMAL] = @rt_base_color + base[PRELIGHT] = shade (0.95, @rt_bg_color) + base[SELECTED] = @rt_selected_bg_color + base[INSENSITIVE] = @rt_bg_color + base[ACTIVE] = shade (0.9, @rt_selected_bg_color) + + engine "clearlooks" { + colorize_scrollbar = TRUE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = FALSE + radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY + style = GUMMY + + # Set a hint to disable backward compatibility fallbacks. + hint = "use-hints" + } +} + +style "wide" { + xthickness = 2 + ythickness = 2 +} + +style "wider" { + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = mix (1.4, @rt_selected_bg_color, @rt_base_color) + fg[SELECTED] = @rt_selected_fg_color + + engine "clearlooks" { + focus_color = shade (0.65, @rt_selected_bg_color) + } +} + +style "clearlooks-paned" { + + bg[PRELIGHT] = shade (0.8, @rt_bg_color) + + engine "clearlooks" { + hint = "paned" + } +} + +style "clearlooks-HSV" { + + engine "clearlooks" { + hint = "HSV" + disable_focus = TRUE + } +} + +style "clearlooks-spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "clearlooks-framelessspinbutton" { + + # IMPORTANT! + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-scale" { + xthickness = 2 + ythickness = 2 + + bg[NORMAL] = shade (1.35, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob + #bg[SELECTED] = @rt_bg_color + + engine "clearlooks" { + focus_color = @rt_selected_bg_color + hint = "scale" + } +} + +style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 + + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) +} + +style "clearlooks-vscale" { + + engine "clearlooks" { + hint = "vscale" + } +} + +style "clearlooks-hscale" { + + engine "clearlooks" { + hint = "hscale" + } +} + +style "clearlooks-scrollbar" { + xthickness = 2 + ythickness = 2 + + bg[SELECTED] = shade (1.50, @rt_bg_color) + + engine "clearlooks" { + hint = "scrollbar" + } +} + +style "clearlooks-hscrollbar" { + + engine "clearlooks" { + hint = "hscrollbar" + } +} + +style "clearlooks-vscrollbar" { + + engine "clearlooks" { + hint = "vscrollbar" + } +} + +style "clearlooks-notebook_bg" { + + bg[NORMAL] = shade (1.02, @rt_bg_color) + bg[ACTIVE] = @rt_base_color +} + +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-frame" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-combobox" { + + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + text[ACTIVE] = @rt_fg_color +} + +style "clearlooks-button" { + + bg[NORMAL] = shade (1.20, @rt_bg_color) + bg[PRELIGHT] = shade (1.30, @rt_bg_color) + bg[ACTIVE] = shade (1.40, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + engine "clearlooks" + { + hint = "button" + } +} + +style "clearlooks-histButton" { + + GtkButton::child-displacement-x = 0 + GtkButton::child-displacement-y = 0 +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "clearlooks-notebook" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @rt_salt_pinch +} + +style "clearlooks-statusbar" { + + engine "clearlooks" { + hint = "statusbar" + } +} + +style "clearlooks-comboboxentry" { + + engine "clearlooks" { + # Note: + # If you set the appears-as-list option on comboboxes in the theme, + # then you should set this hint on the combobox instead. + hint = "comboboxentry" + } +} + +style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 + + fg[NORMAL] = @rt_salt_pinch + fg[PRELIGHT] = @rt_salt_pinch + fg[INSENSITIVE] = @rt_salt_pinch + + bg[PRELIGHT] = mix(0.8, @rt_selected_bg_color, @rt_bg_color) + + base[NORMAL] = @rt_salt_pinch + base[PRELIGHT] = @rt_salt_pinch + base[INSENSITIVE] = @rt_salt_pinch + + engine "clearlooks" { + hint = "expander" + } +} + +style "clearlooks-expanderLabel" { + + fg[NORMAL] = shade (1.26, @rt_text_color) + fg[PRELIGHT] = shade (1.26, @rt_text_color) +} + +style "clearlooks-menubar" { + + engine "clearlooks" { + hint = "menubar" + } +} + +style "clearlooks-menu" { + xthickness = 0 + ythickness = 0 + + bg[NORMAL] = @rt_base_color + + engine "clearlooks" { + radius = 0.0 + } +} + +style "clearlooks-menu_item" { + xthickness = 2 + ythickness = 3 + + fg[PRELIGHT] = @rt_selected_fg_color + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = @rt_selected_fg_color +} + +# This style is there to modify the separator menu items. The goals are: +# 1. Get a specific height. +# 2. The line should go to the edges (ie. no border at the left/right) +style "clearlooks-separator_menu_item" { + xthickness = 1 + ythickness = 0 + + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkWidget::wide-separators = 1 + GtkWidget::separator-width = 1 + GtkWidget::separator-height = 7 +} + +style "clearlooks-frame_title" { + + fg[NORMAL] = lighter (@rt_fg_color) + fg[PRELIGHT] = lighter (@rt_fg_color) + fg[ACTIVE] = lighter (@rt_fg_color) + fg[SELECTED] = lighter (@rt_fg_color) +} + +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.20, @rt_fg_color, @rt_bg_color) +} + +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + +style "clearlooks-treeview" { + + base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "clearlooks-progressbar" { + xthickness = 1 + ythickness = 1 + + fg[PRELIGHT] = @rt_selected_fg_color + + engine "clearlooks" { + # Explicitly set the radius for the progress bars inside menu items. + radius = 3.0 + + hint = "progressbar" + } +} + +# This style is based on the clearlooks-default style, so that the colors from the button +# style are overriden again. +style "clearlooks-treeview_header" = "clearlooks-default" { + xthickness = 2 + ythickness = 1 + + bg[NORMAL] = shade (0.80, @rt_bg_color) + + engine "clearlooks" { + radius = 0.0 + hint = "treeview-header" + } +} + +style "clearlooks-tooltips" { + xthickness = 4 + ythickness = 4 + + bg[NORMAL] = @rt_tooltip_bg_color + fg[NORMAL] = @rt_tooltip_fg_color +} + +############################################################################### +# The following part of the gtkrc applies the different styles to the widgets. +############################################################################### + +# The clearlooks-default style is applied to every widget +class "GtkWidget" style "clearlooks-default" + +class "GtkSeparator" style "wide" +class "GtkFrame" style "wide" +class "GtkCalendar" style "wide" +class "GtkCheckButton" style "wider" +class "GtkRadioButton" style "wider" +class "GtkEntry" style "clearlooks-entry" + +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" + +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" + +# General matching follows. The order is choosen so that the right styles override +# each other. EG. progressbar needs to be more important than the menu match. +widget_class "*" style "clearlooks-notebook_bg" +# This is not perfect, it could be done better. +# (That is modify *every* widget in the notebook, and change those back that +# we really don't want changed) +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" + +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" + +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" + +widget_class "**" style "clearlooks-checkbutton" +widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" + +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" + +widget_class "*." style "clearlooks-frame" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" + +widget_class "*" style "clearlooks-progressbar" + +# Treeview headers (and similar stock GTK+ widgets) +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" + +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" +widget "*.histButton" style "clearlooks-histButton" +widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" +widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" + +# The window of the tooltip is called "gtk-tooltip" +################################################################## +# FIXME: +# This will not work if one embeds eg. a button into the tooltip. +# As far as I can tell right now we will need to rework the theme +# quite a bit to get this working correctly. +# (It will involve setting different priorities, etc.) +################################################################## +widget "gtk-tooltip*" style "clearlooks-tooltips" + +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/21-Gray-Purple.iconset b/rtdata/themes/21-Gray-Purple.iconset new file mode 100644 index 000000000..99ac20640 --- /dev/null +++ b/rtdata/themes/21-Gray-Purple.iconset @@ -0,0 +1,2 @@ +[General] +Iconset=Dark diff --git a/rtdata/themes/21-Gray-Red.gtkrc b/rtdata/themes/21-Gray-Red.gtkrc new file mode 100644 index 000000000..50f254717 --- /dev/null +++ b/rtdata/themes/21-Gray-Red.gtkrc @@ -0,0 +1,557 @@ +# +# This file is part of RawTherapee. +# +# Copyright (c) 2004-2011 Gabor Horvath +# +# RawTherapee is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# RawTherapee is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with RawTherapee. If not, see . +# + +# Please keep this gtkrc in sync with the other ones from Clearlooks based themes. + +gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#1A1A1A\nrt_fg_color:#909090\nrt_tooltip_fg_color:#1A1A1A\nrt_selected_bg_color:#703535\nrt_selected_fg_color:#B0B0B0\nrt_text_color:#828282\nrt_bg_color:#363636\nrt_tooltip_bg_color:#909090\nrt_tool_bg:#252525\nrt_tool_border:#484848" + +style "clearlooks-default" { + xthickness = 1 + ythickness = 1 + + ####################### + # Style Properties + ####################### + GtkButton::child-displacement-x = 1 + GtkButton::child-displacement-y = 1 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::image-spacing = 4 + GtkToolButton::icon-spacing = 4 + + GtkCheckButton::indicator-size = 14 + + GtkPaned::handle-size = 6 + + GtkRange::trough-border = 0 + GtkRange::slider-width = 12 + GtkRange::stepper-size = 16 + + #GtkScale::slider-width = 12 + GtkScale::slider-length = 30 + GtkScale::trough-side-details = 0 + + GtkScrollbar::min-slider-length = 30 + GtkMenuBar::internal-padding = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 + GtkToolbar::internal-padding = 1 + GtkTreeView::expander-size = 12 + GtkTreeView::vertical-separator = 1 + + GtkMenu::horizontal-padding = 0 + GtkMenu::vertical-padding = 0 + + WnckTasklist::fade-overlay-rect = 0 + # The following line hints to gecko (and possibly other appliations) + # that the entry should be drawn transparently on the canvas. + # Without this, gecko will fill in the background of the entry. + GtkEntry::honors-transparent-bg-hint = 1 + + GtkEntry::progress-border = { 2, 2, 2, 2 } + + #################### + # Color Definitions + #################### + bg[NORMAL] = @rt_bg_color + bg[PRELIGHT] = shade (1.02, @rt_bg_color) + bg[SELECTED] = @rt_selected_bg_color + bg[INSENSITIVE] = @rt_bg_color + bg[ACTIVE] = shade (0.9, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + text[NORMAL] = @rt_text_color + text[PRELIGHT] = @rt_text_color + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = darker (@rt_bg_color) + text[ACTIVE] = @rt_selected_fg_color + + base[NORMAL] = @rt_base_color + base[PRELIGHT] = shade (0.95, @rt_bg_color) + base[SELECTED] = @rt_selected_bg_color + base[INSENSITIVE] = @rt_bg_color + base[ACTIVE] = shade (0.9, @rt_selected_bg_color) + + engine "clearlooks" { + colorize_scrollbar = TRUE + reliefstyle = 1 + menubarstyle = 2 + toolbarstyle = 1 + animation = FALSE + radius = 3.0 + # style between CLASSIC, GLOSSY, INVERTED and GUMMY + style = GUMMY + + # Set a hint to disable backward compatibility fallbacks. + hint = "use-hints" + } +} + +style "wide" { + xthickness = 2 + ythickness = 2 +} + +style "wider" { + xthickness = 3 + ythickness = 3 +} + +style "clearlooks-entry" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = mix (1.4, @rt_selected_bg_color, @rt_base_color) + fg[SELECTED] = @rt_selected_fg_color + + engine "clearlooks" { + focus_color = shade (0.65, @rt_selected_bg_color) + } +} + +style "clearlooks-paned" { + + bg[PRELIGHT] = shade (0.8, @rt_bg_color) + + engine "clearlooks" { + hint = "paned" + } +} + +style "clearlooks-HSV" { + + engine "clearlooks" { + hint = "HSV" + disable_focus = TRUE + } +} + +style "clearlooks-spinbutton" { + + engine "clearlooks" { + hint = "spinbutton" + } +} + +style "clearlooks-framelessspinbutton" { + + # IMPORTANT! + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-scale" { + xthickness = 2 + ythickness = 2 + + bg[NORMAL] = shade (1.35, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + # when GtkScale::trough-side-details = 1, bg[SELECTED] set the color of the slider background on the left of the knob + #bg[SELECTED] = @rt_bg_color + + engine "clearlooks" { + focus_color = @rt_selected_bg_color + hint = "scale" + } +} + +style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 + + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) +} + +style "clearlooks-vscale" { + + engine "clearlooks" { + hint = "vscale" + } +} + +style "clearlooks-hscale" { + + engine "clearlooks" { + hint = "hscale" + } +} + +style "clearlooks-scrollbar" { + xthickness = 2 + ythickness = 2 + + bg[SELECTED] = shade (1.50, @rt_bg_color) + + engine "clearlooks" { + hint = "scrollbar" + } +} + +style "clearlooks-hscrollbar" { + + engine "clearlooks" { + hint = "hscrollbar" + } +} + +style "clearlooks-vscrollbar" { + + engine "clearlooks" { + hint = "vscrollbar" + } +} + +style "clearlooks-notebook_bg" { + + bg[NORMAL] = shade (1.02, @rt_bg_color) + bg[ACTIVE] = @rt_base_color +} + +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-frame" { + bg[NORMAL] = shade(0.85, @rt_bg_color) + bg[INSENSITIVE] = shade(0.85, @rt_bg_color) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-combobox" { + + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) + text[SELECTED] = @rt_selected_fg_color + text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + text[ACTIVE] = @rt_fg_color +} + +style "clearlooks-button" { + + bg[NORMAL] = shade (1.20, @rt_bg_color) + bg[PRELIGHT] = shade (1.30, @rt_bg_color) + bg[ACTIVE] = shade (1.40, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + engine "clearlooks" + { + hint = "button" + } +} + +style "clearlooks-histButton" { + + GtkButton::child-displacement-x = 0 + GtkButton::child-displacement-y = 0 +} + +# The color is changed by the notebook_bg style, this style +# changes the x/ythickness +style "clearlooks-notebook" { + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @rt_salt_pinch +} + +style "clearlooks-statusbar" { + + engine "clearlooks" { + hint = "statusbar" + } +} + +style "clearlooks-comboboxentry" { + + engine "clearlooks" { + # Note: + # If you set the appears-as-list option on comboboxes in the theme, + # then you should set this hint on the combobox instead. + hint = "comboboxentry" + } +} + +style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 + + fg[NORMAL] = @rt_salt_pinch + fg[PRELIGHT] = @rt_salt_pinch + fg[INSENSITIVE] = @rt_salt_pinch + + bg[PRELIGHT] = mix(0.8, @rt_selected_bg_color, @rt_bg_color) + + base[NORMAL] = @rt_salt_pinch + base[PRELIGHT] = @rt_salt_pinch + base[INSENSITIVE] = @rt_salt_pinch + + engine "clearlooks" { + hint = "expander" + } +} + +style "clearlooks-expanderLabel" { + + fg[NORMAL] = shade (1.26, @rt_text_color) + fg[PRELIGHT] = shade (1.26, @rt_text_color) +} + +style "clearlooks-menubar" { + + engine "clearlooks" { + hint = "menubar" + } +} + +style "clearlooks-menu" { + xthickness = 0 + ythickness = 0 + + bg[NORMAL] = @rt_base_color + + engine "clearlooks" { + radius = 0.0 + } +} + +style "clearlooks-menu_item" { + xthickness = 2 + ythickness = 3 + + fg[PRELIGHT] = @rt_selected_fg_color + text[NORMAL] = @rt_fg_color + text[PRELIGHT] = @rt_selected_fg_color +} + +# This style is there to modify the separator menu items. The goals are: +# 1. Get a specific height. +# 2. The line should go to the edges (ie. no border at the left/right) +style "clearlooks-separator_menu_item" { + xthickness = 1 + ythickness = 0 + + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkWidget::wide-separators = 1 + GtkWidget::separator-width = 1 + GtkWidget::separator-height = 7 +} + +style "clearlooks-frame_title" { + + fg[NORMAL] = lighter (@rt_fg_color) + fg[PRELIGHT] = lighter (@rt_fg_color) + fg[ACTIVE] = lighter (@rt_fg_color) + fg[SELECTED] = lighter (@rt_fg_color) +} + +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.20, @rt_fg_color, @rt_bg_color) +} + +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + +style "clearlooks-treeview" { + + base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) + + engine "clearlooks" { + hint = "treeview" + } +} + +# The almost useless progress bar style +style "clearlooks-progressbar" { + xthickness = 1 + ythickness = 1 + + fg[PRELIGHT] = @rt_selected_fg_color + + engine "clearlooks" { + # Explicitly set the radius for the progress bars inside menu items. + radius = 3.0 + + hint = "progressbar" + } +} + +# This style is based on the clearlooks-default style, so that the colors from the button +# style are overriden again. +style "clearlooks-treeview_header" = "clearlooks-default" { + xthickness = 2 + ythickness = 1 + + bg[NORMAL] = shade (0.80, @rt_bg_color) + + engine "clearlooks" { + radius = 0.0 + hint = "treeview-header" + } +} + +style "clearlooks-tooltips" { + xthickness = 4 + ythickness = 4 + + bg[NORMAL] = @rt_tooltip_bg_color + fg[NORMAL] = @rt_tooltip_fg_color +} + +############################################################################### +# The following part of the gtkrc applies the different styles to the widgets. +############################################################################### + +# The clearlooks-default style is applied to every widget +class "GtkWidget" style "clearlooks-default" + +class "GtkSeparator" style "wide" +class "GtkFrame" style "wide" +class "GtkCalendar" style "wide" +class "GtkCheckButton" style "wider" +class "GtkRadioButton" style "wider" +class "GtkEntry" style "clearlooks-entry" + +class "GtkPaned" style "clearlooks-paned" +class "GtkSpinButton" style "clearlooks-spinbutton" +class "GtkScale" style "clearlooks-scale" +class "GtkVScale" style "clearlooks-vscale" +class "GtkHScale" style "clearlooks-hscale" +class "GtkScrollbar" style "clearlooks-scrollbar" +class "GtkHScrollbar" style "clearlooks-hscrollbar" +class "GtkVScrollbar" style "clearlooks-vscrollbar" + +class "GtkExpander" style "clearlooks-expander" +class "GtkHSV" style "clearlooks-HSV" + +# General matching follows. The order is choosen so that the right styles override +# each other. EG. progressbar needs to be more important than the menu match. +widget_class "*" style "clearlooks-notebook_bg" +# This is not perfect, it could be done better. +# (That is modify *every* widget in the notebook, and change those back that +# we really don't want changed) +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" +widget_class "**" style "clearlooks-notebook_bg" + +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" +widget_class "*" style "clearlooks-notebook" +widget_class "**" style "clearlooks-statusbar" + +#widget_class "**" style "clearlooks-comboboxentry" +widget_class "**" style "clearlooks-combobox" + +widget_class "**" style "clearlooks-checkbutton" +widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" + +widget_class "**" style "clearlooks-menubar" +widget_class "**" style "clearlooks-menu" +widget_class "**" style "clearlooks-menu_item" +widget_class "**" style "clearlooks-separator_menu_item" + +widget_class "*." style "clearlooks-frame" +widget_class "*.." style "clearlooks-frame_title" +widget_class "*.*" style "clearlooks-treeview" + +widget_class "*" style "clearlooks-progressbar" + +# Treeview headers (and similar stock GTK+ widgets) +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" + +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" +widget "*.histButton" style "clearlooks-histButton" +widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" +widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" + +# The window of the tooltip is called "gtk-tooltip" +################################################################## +# FIXME: +# This will not work if one embeds eg. a button into the tooltip. +# As far as I can tell right now we will need to rework the theme +# quite a bit to get this working correctly. +# (It will involve setting different priorities, etc.) +################################################################## +widget "gtk-tooltip*" style "clearlooks-tooltips" + +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/21-Gray-Red.iconset b/rtdata/themes/21-Gray-Red.iconset new file mode 100644 index 000000000..99ac20640 --- /dev/null +++ b/rtdata/themes/21-Gray-Red.iconset @@ -0,0 +1,2 @@ +[General] +Iconset=Dark diff --git a/rtdata/themes/25-Gray-Gray.gtkrc b/rtdata/themes/25-Gray-Gray.gtkrc index 3d262d856..949be82a9 100644 --- a/rtdata/themes/25-Gray-Gray.gtkrc +++ b/rtdata/themes/25-Gray-Gray.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#606060\nrt_base_color:#484848\nrt_fg_color:#8c8c8c\nrt_tooltip_fg_color:#D2D2D2\nrt_selected_bg_color:#606060\nrt_selected_fg_color:#C0C0C0\nrt_text_color:#8c8c8c\nrt_bg_color:#404040\nrt_tooltip_bg_color:#5A5A5A" +gtk-color-scheme = "rt_salt_pinch:#606060\nrt_base_color:#525252\nrt_fg_color:#979797\nrt_tooltip_fg_color:#A0A0A0\nrt_selected_bg_color:#606060\nrt_selected_fg_color:#CDCDCD\nrt_text_color:#A2A2A2\nrt_bg_color:#404040\nrt_tooltip_bg_color:#252525\nrt_tool_bg:#3B3B3B\nrt_tool_border:#4D4D4D" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -75,13 +75,13 @@ style "clearlooks-default" { bg[ACTIVE] = shade (0.9, @rt_bg_color) fg[NORMAL] = @rt_fg_color - fg[PRELIGHT] = @rt_selected_fg_color + fg[PRELIGHT] = @rt_fg_color fg[SELECTED] = @rt_selected_fg_color fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) fg[ACTIVE] = @rt_fg_color text[NORMAL] = @rt_text_color - text[PRELIGHT] = @rt_selected_fg_color + text[PRELIGHT] = @rt_text_color text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = darker (@rt_bg_color) text[ACTIVE] = @rt_selected_fg_color @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.40, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = shade (0.80, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_selected_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -239,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (1.25, @rt_bg_color) - bg[PRELIGHT] = shade (1.50, @rt_bg_color) - bg[ACTIVE] = shade (1.70, @rt_bg_color) + bg[NORMAL] = shade (0.93, @rt_tool_bg) + bg[PRELIGHT] = shade (0.85, @rt_tool_bg) + bg[ACTIVE] = shade (0.70, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -282,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -357,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -441,13 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -456,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -466,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc index f2973fbd9..c74be6334 100644 --- a/rtdata/themes/25-Gray-Purple.gtkrc +++ b/rtdata/themes/25-Gray-Purple.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#843382\nrt_base_color:#525252\nrt_fg_color:#979797\nrt_tooltip_fg_color:#A0A0A0\nrt_selected_bg_color:#5D235C\nrt_selected_fg_color:#CDCDCD\nrt_text_color:#A2A2A2\nrt_bg_color:#404040\nrt_tooltip_bg_color:#252525" +gtk-color-scheme = "rt_salt_pinch:#843382\nrt_base_color:#525252\nrt_fg_color:#979797\nrt_tooltip_fg_color:#A0A0A0\nrt_selected_bg_color:#5D235C\nrt_selected_fg_color:#CDCDCD\nrt_text_color:#A2A2A2\nrt_bg_color:#404040\nrt_tooltip_bg_color:#252525\nrt_tool_bg:#3B3B3B\nrt_tool_border:#4D4D4D" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.40, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = shade (0.80, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -239,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (0.93, @rt_bg_color) - bg[PRELIGHT] = shade (0.85, @rt_bg_color) - bg[ACTIVE] = shade (0.70, @rt_bg_color) + bg[NORMAL] = shade (0.93, @rt_tool_bg) + bg[PRELIGHT] = shade (0.85, @rt_tool_bg) + bg[ACTIVE] = shade (0.70, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -282,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -357,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -441,13 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -456,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -466,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc index e26b0efaa..c41471100 100644 --- a/rtdata/themes/25-Gray-Red.gtkrc +++ b/rtdata/themes/25-Gray-Red.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#525252\nrt_fg_color:#979797\nrt_tooltip_fg_color:#A0A0A0\nrt_selected_bg_color:#703535\nrt_selected_fg_color:#CDCDCD\nrt_text_color:#A2A2A2\nrt_bg_color:#404040\nrt_tooltip_bg_color:#252525" +gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#525252\nrt_fg_color:#979797\nrt_tooltip_fg_color:#A0A0A0\nrt_selected_bg_color:#703535\nrt_selected_fg_color:#CDCDCD\nrt_text_color:#A2A2A2\nrt_bg_color:#404040\nrt_tooltip_bg_color:#252525\nrt_tool_bg:#3B3B3B\nrt_tool_border:#4D4D4D" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.40, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) bg[ACTIVE] = shade (0.80, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -239,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (0.93, @rt_bg_color) - bg[PRELIGHT] = shade (0.85, @rt_bg_color) - bg[ACTIVE] = shade (0.70, @rt_bg_color) + bg[NORMAL] = shade (0.93, @rt_tool_bg) + bg[PRELIGHT] = shade (0.85, @rt_tool_bg) + bg[ACTIVE] = shade (0.70, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -282,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -357,6 +404,22 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { base[ACTIVE] = mix(0.50, @rt_selected_bg_color, @rt_base_color) @@ -441,13 +504,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -456,6 +521,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -466,12 +532,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc index 062e8d709..508ef23c4 100644 --- a/rtdata/themes/37-Gray-Red-Textured.gtkrc +++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#707070\nrt_fg_color:#B2B2B2\nrt_tooltip_fg_color:#A5A5A5\nrt_selected_bg_color:#562020\nrt_selected_fg_color:#E2E2E2\nrt_text_color:#000000\nrt_bg_color:#5F5F5F\nrt_tooltip_bg_color:#404040" +gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#707070\nrt_fg_color:#A9A9A9\nrt_tooltip_fg_color:#A5A5A5\nrt_selected_bg_color:#562020\nrt_selected_fg_color:#E2E2E2\nrt_text_color:#C0C0C0\nrt_bg_color:#5F5F5F\nrt_tooltip_bg_color:#404040\nrt_tool_bg:#575757\nrt_tool_border:#6F6F6F" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -84,7 +84,7 @@ style "clearlooks-default" { text[PRELIGHT] = @rt_text_color text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = darker (@rt_bg_color) - text[ACTIVE] = @rt_text_color + text[ACTIVE] = @rt_selected_fg_color base[NORMAL] = @rt_base_color base[PRELIGHT] = shade (1.05, @rt_bg_color) @@ -122,7 +122,7 @@ style "clearlooks-entry" { ythickness = 3 bg[SELECTED] = mix (0.4, @rt_selected_bg_color, @rt_base_color) - fg[SELECTED] = @rt_text_color + fg[SELECTED] = @rt_selected_fg_color engine "clearlooks" { focus_color = shade (0.65, @rt_selected_bg_color) @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = @rt_bg_color + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.20, @rt_bg_color) - bg[PRELIGHT] = shade (1.50, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -482,7 +491,7 @@ style "clearlooks-range" { border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL - } + } image { function = BOX @@ -569,16 +578,46 @@ style "clearlooks-range" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = @rt_bg_color bg[ACTIVE] = shade (0.85, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.95, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_selected_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -586,9 +625,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (0.93, @rt_bg_color) - bg[PRELIGHT] = shade (0.85, @rt_bg_color) - bg[ACTIVE] = shade (0.70, @rt_bg_color) + bg[NORMAL] = shade (0.93, @rt_tool_bg) + bg[PRELIGHT] = shade (0.85, @rt_tool_bg) + bg[ACTIVE] = shade (0.70, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -629,6 +674,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -647,8 +694,8 @@ style "clearlooks-expander" { style "clearlooks-expanderLabel" { - fg[NORMAL] = @rt_text_color - fg[PRELIGHT] = lighter (@rt_fg_color) + fg[NORMAL] = shade (1.12, @rt_fg_color) + fg[PRELIGHT] = shade (1.20, @rt_fg_color) } style "clearlooks-menubar" { @@ -703,6 +750,23 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } + +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually @@ -768,12 +832,7 @@ class "GtkEntry" style "clearlooks-entry" class "GtkPaned" style "clearlooks-paned" class "GtkSpinButton" style "clearlooks-spinbutton" class "GtkRange" style "clearlooks-range" -#class "GtkScale" style "clearlooks-scale" -#class "GtkVScale" style "clearlooks-vscale" -#class "GtkHScale" style "clearlooks-hscale" class "GtkScrollbar" style "clearlooks-scrollbar" -#class "GtkHScrollbar" style "clearlooks-hscrollbar" -#class "GtkVScrollbar" style "clearlooks-vscrollbar" class "GtkExpander" style "clearlooks-expander" class "GtkHSV" style "clearlooks-HSV" @@ -790,13 +849,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -805,6 +866,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -815,12 +877,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc index abaaef6ab..ec645a6bf 100644 --- a/rtdata/themes/37-Gray-Red.gtkrc +++ b/rtdata/themes/37-Gray-Red.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#707070\nrt_fg_color:#B2B2B2\nrt_tooltip_fg_color:#A5A5A5\nrt_selected_bg_color:#562020\nrt_selected_fg_color:#E2E2E2\nrt_text_color:#000000\nrt_bg_color:#5F5F5F\nrt_tooltip_bg_color:#404040" +gtk-color-scheme = "rt_salt_pinch:#800000\nrt_base_color:#707070\nrt_fg_color:#A9A9A9\nrt_tooltip_fg_color:#A5A5A5\nrt_selected_bg_color:#562020\nrt_selected_fg_color:#E2E2E2\nrt_text_color:#C0C0C0\nrt_bg_color:#5F5F5F\nrt_tooltip_bg_color:#404040\nrt_tool_bg:#575757\nrt_tool_border:#6F6F6F" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -84,7 +84,7 @@ style "clearlooks-default" { text[PRELIGHT] = @rt_text_color text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = darker (@rt_bg_color) - text[ACTIVE] = @rt_text_color + text[ACTIVE] = @rt_selected_fg_color base[NORMAL] = @rt_base_color base[PRELIGHT] = shade (1.05, @rt_bg_color) @@ -122,7 +122,7 @@ style "clearlooks-entry" { ythickness = 3 bg[SELECTED] = mix (0.4, @rt_selected_bg_color, @rt_base_color) - fg[SELECTED] = @rt_text_color + fg[SELECTED] = @rt_selected_fg_color engine "clearlooks" { focus_color = shade (0.65, @rt_selected_bg_color) @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = @rt_bg_color + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.20, @rt_bg_color) - bg[PRELIGHT] = shade (1.50, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.45, @rt_bg_color) + bg[PRELIGHT] = shade (1.70, @rt_bg_color) + bg[SELECTED] = shade (2.00, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,16 +231,46 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = @rt_bg_color bg[ACTIVE] = shade (0.85, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.95, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color - text[PRELIGHT] = @rt_selected_fg_color + text[PRELIGHT] = shade(1.15, @rt_fg_color) text[SELECTED] = @rt_selected_fg_color text[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) text[ACTIVE] = @rt_fg_color @@ -239,9 +278,15 @@ style "clearlooks-combobox" { style "clearlooks-button" { - bg[NORMAL] = shade (0.93, @rt_bg_color) - bg[PRELIGHT] = shade (0.85, @rt_bg_color) - bg[ACTIVE] = shade (0.70, @rt_bg_color) + bg[NORMAL] = shade (0.93, @rt_tool_bg) + bg[PRELIGHT] = shade (0.85, @rt_tool_bg) + bg[ACTIVE] = shade (0.70, @rt_tool_bg) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = shade(1.15, @rt_fg_color) + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color engine "clearlooks" { @@ -282,6 +327,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = @rt_salt_pinch fg[PRELIGHT] = @rt_salt_pinch @@ -300,8 +347,8 @@ style "clearlooks-expander" { style "clearlooks-expanderLabel" { - fg[NORMAL] = @rt_text_color - fg[PRELIGHT] = lighter (@rt_fg_color) + fg[NORMAL] = shade (1.12, @rt_fg_color) + fg[PRELIGHT] = shade (1.20, @rt_fg_color) } style "clearlooks-menubar" { @@ -356,6 +403,23 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } + +style "clearlooks-checkbutton" { + + text[NORMAL] = @rt_selected_fg_color + + fg[PRELIGHT] = @rt_fg_color + + bg[SELECTED] = @rt_base_color + bg[PRELIGHT] = @rt_base_color + bg[SELECTED] = @rt_base_color + + engine "clearlooks" + { + hint = "checkbutton" + } +} + style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually @@ -442,13 +506,15 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +widget_class "**" style "clearlooks-checkbutton" widget_class "*." style "clearlooks-expanderLabel" widget_class "*.." style "clearlooks-expanderLabel" @@ -457,6 +523,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -467,12 +534,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc index 2db17e4f2..ba51ec29b 100644 --- a/rtdata/themes/63-Gray-Cyan.gtkrc +++ b/rtdata/themes/63-Gray-Cyan.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_salt_pinch:#95B0DB\nrt_base_color:#dddddd\nrt_fg_color:#0A0A0A\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#95B0DB\nrt_selected_fg_color:#FFFFFF\nrt_text_color:#000000\nrt_bg_color:#A1A1A1\nrt_tooltip_bg_color:#F5F5B5" +gtk-color-scheme = "rt_salt_pinch:#95B0DB\nrt_base_color:#dddddd\nrt_fg_color:#0A0A0A\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#95B0DB\nrt_selected_fg_color:#FFFFFF\nrt_text_color:#000000\nrt_bg_color:#A1A1A1\nrt_tooltip_bg_color:#F5F5B5\nrt_tool_bg:#a0a0a0\nrt_tool_border:#7d7d7d" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.05, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.15, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.20, @rt_bg_color) bg[PRELIGHT] = shade (1.40, @rt_bg_color) + bg[SELECTED] = shade (1.65, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,12 +231,42 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.05, @rt_bg_color) bg[ACTIVE] = shade (0.92, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color @@ -243,6 +282,12 @@ style "clearlooks-button" { bg[PRELIGHT] = shade (1.08, @rt_bg_color) bg[ACTIVE] = shade (0.80, @rt_bg_color) + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + engine "clearlooks" { hint = "button" @@ -283,6 +328,8 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 fg[NORMAL] = mix (0.6, @rt_selected_bg_color, @rt_text_color) fg[PRELIGHT] = mix (0.6, @rt_selected_bg_color, @rt_text_color) @@ -357,6 +404,7 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.10, @rt_fg_color, @rt_bg_color) } + style "clearlooks-treeview" { text[ACTIVE] = @rt_text_color @@ -442,7 +490,8 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" @@ -457,6 +506,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -467,12 +517,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc index 83615a2a7..9d101f389 100644 --- a/rtdata/themes/92-Beige-DarkCyan.gtkrc +++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_base_color:#ffffff\nrt_fg_color:#101010\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#7C99AD\nrt_selected_fg_color:#ffffff\nrt_text_color:#000000\nrt_bg_color:#EFEBE7\nrt_tooltip_bg_color:#FFFFBF" +gtk-color-scheme = "rt_base_color:#ffffff\nrt_fg_color:#101010\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#7C99AD\nrt_selected_fg_color:#ffffff\nrt_text_color:#000000\nrt_bg_color:#EFEBE7\nrt_tooltip_bg_color:#FFFFBF\nrt_tool_bg:#ebe5df\nrt_tool_border:#cbb9a8" style "clearlooks-default" { xthickness = 1 @@ -48,8 +48,8 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 18 - GtkExpander::expander-spacing = 0 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 @@ -156,8 +156,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -176,9 +179,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.15, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.20, @rt_bg_color) bg[PRELIGHT] = shade (1.40, @rt_bg_color) + bg[SELECTED] = shade (1.65, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -222,11 +231,41 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color @@ -242,6 +281,12 @@ style "clearlooks-button" { bg[PRELIGHT] = shade (1.06, @rt_bg_color) bg[ACTIVE] = shade (0.85, @rt_bg_color) + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = mix (0.2, @rt_fg_color, @rt_bg_color) + fg[ACTIVE] = @rt_fg_color + engine "clearlooks" { hint = "button" @@ -279,15 +324,17 @@ style "clearlooks-comboboxentry" { } style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 - fg[NORMAL] = @rt_selected_bg_color - fg[PRELIGHT] = @rt_selected_bg_color + fg[NORMAL] = mix (0.6, @rt_selected_bg_color, @rt_text_color) + fg[PRELIGHT] = mix (0.6, @rt_selected_bg_color, @rt_text_color) fg[INSENSITIVE] = @rt_selected_bg_color - bg[PRELIGHT] = mix (0.20, @rt_selected_bg_color, @rt_bg_color) + bg[PRELIGHT] = mix (0.5, @rt_selected_bg_color, @rt_bg_color) - base[NORMAL] = @rt_selected_bg_color - base[PRELIGHT] = @rt_selected_bg_color + base[NORMAL] = mix (0.6, @rt_selected_bg_color, @rt_text_color) + base[PRELIGHT] = @rt_selected_fg_color base[INSENSITIVE] = @rt_selected_bg_color engine "clearlooks" { @@ -295,6 +342,12 @@ style "clearlooks-expander" { } } +style "clearlooks-expanderLabel" { + + fg[NORMAL] = @rt_text_color + fg[PRELIGHT] = @rt_text_color +} + style "clearlooks-menubar" { engine "clearlooks" { @@ -347,6 +400,7 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.10, @rt_fg_color, @rt_bg_color) } + style "clearlooks-treeview" { # For an unkown reason, shading 7C99AD produce a redish color, so we have to set the value manually @@ -431,7 +485,8 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" @@ -446,6 +501,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -456,12 +512,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc index e01fd39d0..882a86216 100644 --- a/rtdata/themes/Default.gtkrc +++ b/rtdata/themes/Default.gtkrc @@ -19,7 +19,7 @@ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes. -gtk-color-scheme = "rt_base_color:#ffffff\nrt_fg_color:#000000\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#86ABD9\nrt_selected_fg_color:#ffffff\nrt_text_color:#1A1A1A\nrt_bg_color:#EDECEB\nrt_tooltip_bg_color:#F5F5B5" +gtk-color-scheme = "rt_base_color:#ffffff\nrt_fg_color:#000000\nrt_tooltip_fg_color:#000000\nrt_selected_bg_color:#86ABD9\nrt_selected_fg_color:#ffffff\nrt_text_color:#1A1A1A\nrt_bg_color:#EDECEB\nrt_tooltip_bg_color:#F5F5B5\nrt_tool_bg:#edeceb\nrt_tool_border:#9b9b9b" style "clearlooks-default" { xthickness = 1 @@ -47,9 +47,10 @@ style "clearlooks-default" { GtkScrollbar::min-slider-length = 30 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 16 + GtkExpander::expander-size = 12 + GtkExpander::expander-spacing = 2 GtkToolbar::internal-padding = 1 - GtkTreeView::expander-size = 14 + GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 0 GtkMenu::horizontal-padding = 0 @@ -145,8 +146,11 @@ style "clearlooks-spinbutton" { style "clearlooks-framelessspinbutton" { # IMPORTANT! - # base[NORMAL] must have the same color than notebook bg[NORMAL] - base[NORMAL] = shade (1.02, @rt_bg_color) + # base[NORMAL] must have the same color than clearlooks.toolContainer / bg[NORMAL] + base[NORMAL] = @rt_tool_bg + base[INSENSITIVE] = @rt_tool_bg + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg } style "clearlooks-scale" { @@ -159,9 +163,15 @@ style "clearlooks-scale" { } style "clearlooks-thresholdselector" { + xthickness = 6 + ythickness = 6 - bg[ACTIVE] = shade (1.15, @rt_bg_color) - bg[PRELIGHT] = shade (1.25, @rt_bg_color) + bg[NORMAL] = @rt_tool_bg + bg[ACTIVE] = shade (1.20, @rt_bg_color) + bg[PRELIGHT] = shade (1.40, @rt_bg_color) + bg[SELECTED] = shade (1.65, @rt_bg_color) + + fg[PRELIGHT] = shade (1.30, @rt_fg_color) } style "clearlooks-vscale" { @@ -203,11 +213,41 @@ style "clearlooks-vscrollbar" { style "clearlooks-notebook_bg" { - # IMPORTANT! - # If you modify bg[NORMAL] here under, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value bg[NORMAL] = shade (1.02, @rt_bg_color) } +style "clearlooks-toolContainer" { + xthickness = 0 + ythickness = 0 + + # IMPORTANT! + # If you modify bg[NORMAL] below, you must set clearlooks-framelessspinbutton -> base[NORMAL] to the very same value + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + +style "clearlooks-separator" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-frame" { + bg[NORMAL] = mix(0.85, @rt_tool_bg, @rt_tool_border) + bg[INSENSITIVE] = mix(0.60, @rt_tool_bg, @rt_tool_border) +} + +style "clearlooks-toolFrame" { + bg[NORMAL] = @rt_tool_bg + + fg[NORMAL] = @rt_tool_border + fg[INSENSITIVE] = mix(0.5, @rt_bg_color, @rt_tool_border) +} + +style "clearlooks-toolExpanderBox" { + bg[NORMAL] = @rt_tool_bg + bg[INSENSITIVE] = @rt_tool_bg +} + style "clearlooks-combobox" { text[NORMAL] = @rt_fg_color @@ -218,12 +258,21 @@ style "clearlooks-combobox" { } style "clearlooks-button" { - xthickness = 3 - ythickness = 3 bg[NORMAL] = shade (1.04, @rt_bg_color) bg[PRELIGHT] = shade (1.06, @rt_bg_color) bg[ACTIVE] = shade (0.85, @rt_bg_color) + + fg[NORMAL] = @rt_fg_color + fg[PRELIGHT] = @rt_fg_color + fg[SELECTED] = @rt_selected_fg_color + fg[INSENSITIVE] = darker (@rt_bg_color) + fg[ACTIVE] = @rt_fg_color + + engine "clearlooks" + { + hint = "button" + } } style "clearlooks-histButton" { @@ -256,6 +305,31 @@ style "clearlooks-comboboxentry" { } } +style "clearlooks-expander" { + xthickness = 3 + ythickness = 3 + + fg[NORMAL] = mix (0.6, @rt_selected_bg_color, @rt_text_color) + fg[PRELIGHT] = mix (0.6, @rt_selected_bg_color, @rt_text_color) + fg[INSENSITIVE] = @rt_selected_bg_color + + bg[PRELIGHT] = mix (0.5, @rt_selected_bg_color, @rt_bg_color) + + base[NORMAL] = mix (0.6, @rt_selected_bg_color, @rt_text_color) + base[PRELIGHT] = @rt_selected_fg_color + base[INSENSITIVE] = @rt_selected_bg_color + + engine "clearlooks" { + hint = "expander" + } +} + +style "clearlooks-expanderLabel" { + + fg[NORMAL] = @rt_text_color + fg[PRELIGHT] = @rt_text_color +} + style "clearlooks-menubar" { engine "clearlooks" { @@ -308,6 +382,7 @@ style "clearlooks-partialPasteHeaderSep" { bg[NORMAL] = mix (0.10, @rt_fg_color, @rt_bg_color) } + style "clearlooks-treeview" { engine "clearlooks" { @@ -370,6 +445,7 @@ class "GtkScrollbar" style "clearlooks-scrollbar" class "GtkHScrollbar" style "clearlooks-hscrollbar" class "GtkVScrollbar" style "clearlooks-vscrollbar" +class "GtkExpander" style "clearlooks-expander" class "GtkHSV" style "clearlooks-HSV" # General matching follows. The order is choosen so that the right styles override @@ -384,7 +460,8 @@ widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" widget_class "**" style "clearlooks-notebook_bg" -widget_class "*" style "clearlooks-button" +widget_class "*." style "clearlooks-combobox" +widget_class "**" style "clearlooks-button" widget_class "*" style "clearlooks-notebook" widget_class "**" style "clearlooks-statusbar" @@ -399,6 +476,7 @@ widget_class "**" style "clearlooks-menu" widget_class "**" style "clearlooks-menu_item" widget_class "**" style "clearlooks-separator_menu_item" +widget_class "*." style "clearlooks-frame" widget_class "*.." style "clearlooks-frame_title" widget_class "*.*" style "clearlooks-treeview" @@ -409,12 +487,17 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget_class "*..*." style "clearlooks-separator" +widget_class "*..*." style "clearlooks-toolExpanderBox" +widget_class "*.." style "clearlooks-toolFrame" +widget_class "*...*." style "clearlooks-toolExpanderBox" widget "*.partialPasteHeader.*" style "clearlooks-frame_title" widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" widget "*.histButton" style "clearlooks-histButton" widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton" widget "*.ThresholdSelector" style "clearlooks-thresholdselector" +widget "*.ToolPanel" style "clearlooks-toolContainer" # The window of the tooltip is called "gtk-tooltip" ################################################################## diff --git a/rtdata/themes/slim b/rtdata/themes/slim index 05da5df06..bc1c05937 100644 --- a/rtdata/themes/slim +++ b/rtdata/themes/slim @@ -45,7 +45,7 @@ style "clearlooks-default" { GtkScrollbar::slider-width = 12 GtkMenuBar::internal-padding = 0 - GtkExpander::expander-size = 11 + GtkExpander::expander-size = 12 GtkExpander::expander-spacing = 0 GtkToolbar::internal-padding = 0 GtkTreeView::expander-size = 10 @@ -95,6 +95,15 @@ style "clearlooks-notebook" { ythickness = 1 } +style "clearlooks-expander" { + xthickness = 0 + ythickness = 0 +} + +style "clearlooks-thresholdselector" { + xthickness = 1 + ythickness = 1 +} style "clearlooks-menu" { xthickness = 0 diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index 452ac233c..f213b6771 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -50,7 +50,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep delay = options.adjusterDelay; // delay is no more static, so we can set the delay individually (useful for the RAW editor tab) set_border_width (0); - set_spacing (2); + set_spacing (0); hbox = Gtk::manage (new Gtk::HBox ()); hbox->set_border_width(0); diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc index b41e3fbe4..224f0bade 100644 --- a/rtgui/blackwhite.cc +++ b/rtgui/blackwhite.cc @@ -28,10 +28,8 @@ using namespace rtengine; using namespace rtengine::procparams; -BlackWhite::BlackWhite (): Gtk::VBox(), FoldableToolPanel(this) { +BlackWhite::BlackWhite (): FoldableToolPanel(this) { CurveListener::setMulti(true); - set_border_width(4); - set_spacing(4); nextredbw = 0.3333; nextgreenbw = 0.3333; diff --git a/rtgui/blackwhite.h b/rtgui/blackwhite.h index efbcd2a2c..033b936b9 100644 --- a/rtgui/blackwhite.h +++ b/rtgui/blackwhite.h @@ -28,7 +28,7 @@ #include "mycurve.h" #include "colorprovider.h" -class BlackWhite : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoBWListener, public CurveListener, public ColorProvider{ +class BlackWhite : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoBWListener, public CurveListener, public ColorProvider{ protected: FlatCurveEditor* luminanceCurve; diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc index 0ac29e333..03ecf5d2b 100644 --- a/rtgui/cacorrection.cc +++ b/rtgui/cacorrection.cc @@ -23,9 +23,7 @@ using namespace rtengine; using namespace rtengine::procparams; -CACorrection::CACorrection () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +CACorrection::CACorrection () : FoldableToolPanel(this) { Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); diff --git a/rtgui/cacorrection.h b/rtgui/cacorrection.h index a93e582de..f0d77d286 100644 --- a/rtgui/cacorrection.h +++ b/rtgui/cacorrection.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class CACorrection : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class CACorrection : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* red; diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc index 7edc7d68f..a937a74d3 100644 --- a/rtgui/chmixer.cc +++ b/rtgui/chmixer.cc @@ -22,11 +22,7 @@ using namespace rtengine; using namespace rtengine::procparams; -extern Glib::ustring argv0; - -ChMixer::ChMixer (): Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +ChMixer::ChMixer (): FoldableToolPanel(this) { imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-RR.png")); imgIcon[1] = Gtk::manage (new RTImage ("Chanmixer-RG.png")); diff --git a/rtgui/chmixer.h b/rtgui/chmixer.h index 2490344f6..73ee7a865 100644 --- a/rtgui/chmixer.h +++ b/rtgui/chmixer.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class ChMixer : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class ChMixer : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster *red[3]; diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc index 8031270d7..b622a814c 100644 --- a/rtgui/colorappearance.cc +++ b/rtgui/colorappearance.cc @@ -25,14 +25,12 @@ using namespace rtengine; using namespace rtengine::procparams; -ColorAppearance::ColorAppearance () : Gtk::VBox(), FoldableToolPanel(this) { +ColorAppearance::ColorAppearance () : FoldableToolPanel(this) { CurveListener::setMulti(true); std::vector milestones; milestones.push_back( GradientMilestone(0., 0., 0., 0.) ); milestones.push_back( GradientMilestone(1., 1., 1., 1.) ); - set_border_width(4); - enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); pack_start (*enabled); diff --git a/rtgui/colorappearance.h b/rtgui/colorappearance.h index cbf55bcc9..3129e995c 100644 --- a/rtgui/colorappearance.h +++ b/rtgui/colorappearance.h @@ -28,7 +28,7 @@ #include "guiutils.h" #include "colorprovider.h" -class ColorAppearance : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoCamListener, public CurveListener, public ColorProvider { +class ColorAppearance : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoCamListener, public CurveListener, public ColorProvider { protected: Glib::RefPtr bgTTips; diff --git a/rtgui/crop.cc b/rtgui/crop.cc index 97cac164e..166452498 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -34,9 +34,7 @@ class RefreshSpinHelper { : crop(_crop), notify(_notify) {} }; -Crop::Crop (): Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Crop::Crop (): FoldableToolPanel(this) { clistener = NULL; diff --git a/rtgui/crop.h b/rtgui/crop.h index 31b12d15c..747f60754 100644 --- a/rtgui/crop.h +++ b/rtgui/crop.h @@ -38,7 +38,7 @@ class CropRatio { double value; }; -class Crop : public Gtk::VBox, public CropGUIListener, public FoldableToolPanel, public rtengine::SizeListener { +class Crop : public ToolParamBlock, public CropGUIListener, public FoldableToolPanel, public rtengine::SizeListener { protected: Gtk::CheckButton* enabled; diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc index c8a6655ed..9f62ab7ee 100644 --- a/rtgui/darkframe.cc +++ b/rtgui/darkframe.cc @@ -26,10 +26,8 @@ using namespace rtengine; using namespace rtengine::procparams; -DarkFrame::DarkFrame () : Gtk::VBox(), FoldableToolPanel(this) +DarkFrame::DarkFrame () : FoldableToolPanel(this) { - set_border_width(4); - hbdf = Gtk::manage(new Gtk::HBox()); darkFrameFile = Gtk::manage(new MyFileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN)); darkFrameFilePersister.reset(new FileChooserLastFolderPersister(darkFrameFile, options.lastDarkframeDir)); diff --git a/rtgui/darkframe.h b/rtgui/darkframe.h index 061871ee0..96d5f2cc1 100755 --- a/rtgui/darkframe.h +++ b/rtgui/darkframe.h @@ -31,7 +31,7 @@ class DFProvider { // add other info here }; -class DarkFrame : public Gtk::VBox, public FoldableToolPanel { +class DarkFrame : public ToolParamBlock, public FoldableToolPanel { protected: diff --git a/rtgui/defringe.cc b/rtgui/defringe.cc index bba25eac9..4ff612d28 100644 --- a/rtgui/defringe.cc +++ b/rtgui/defringe.cc @@ -23,9 +23,8 @@ using namespace rtengine; using namespace rtengine::procparams; -Defringe::Defringe () : Gtk::VBox(), FoldableToolPanel(this) { +Defringe::Defringe () : FoldableToolPanel(this) { - set_border_width(4); std::vector bottomMilestones; float R, G, B; for (int i=0; i<7; i++) { diff --git a/rtgui/defringe.h b/rtgui/defringe.h index 9edbe644c..fd60a1e99 100644 --- a/rtgui/defringe.h +++ b/rtgui/defringe.h @@ -27,7 +27,7 @@ #include "curveeditorgroup.h" #include "colorprovider.h" -class Defringe : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider{ +class Defringe : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider{ protected: CurveEditorGroup* curveEditorPF; diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc index 6d53fbd51..3d2a1bd89 100644 --- a/rtgui/dirpyrdenoise.cc +++ b/rtgui/dirpyrdenoise.cc @@ -23,10 +23,8 @@ using namespace rtengine; using namespace rtengine::procparams; -DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this), lastenhance(false) { +DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this), lastenhance(false) { - set_border_width(4); - enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_tooltip_text (M("TP_DIRPYRDENOISE_ENABLED_TOOLTIP")); diff --git a/rtgui/dirpyrdenoise.h b/rtgui/dirpyrdenoise.h index c0506d44a..5f7380cd6 100644 --- a/rtgui/dirpyrdenoise.h +++ b/rtgui/dirpyrdenoise.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class DirPyrDenoise : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class DirPyrDenoise : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* luma; diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc index e6fe1f26c..7bed81aaf 100644 --- a/rtgui/dirpyrequalizer.cc +++ b/rtgui/dirpyrequalizer.cc @@ -22,9 +22,7 @@ using namespace rtengine; using namespace rtengine::procparams; -DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this) { std::vector milestones; diff --git a/rtgui/dirpyrequalizer.h b/rtgui/dirpyrequalizer.h index d91ac70eb..56c26724d 100644 --- a/rtgui/dirpyrequalizer.h +++ b/rtgui/dirpyrequalizer.h @@ -26,7 +26,7 @@ #include "thresholdadjuster.h" #include "colorprovider.h" -class DirPyrEqualizer : public Gtk::VBox, public ThresholdAdjusterListener, public AdjusterListener, public FoldableToolPanel +class DirPyrEqualizer : public ToolParamBlock, public ThresholdAdjusterListener, public AdjusterListener, public FoldableToolPanel { protected: diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc index 1c3318b2e..f7b5bd34b 100644 --- a/rtgui/distortion.cc +++ b/rtgui/distortion.cc @@ -20,14 +20,10 @@ #include #include "rtimage.h" -extern Glib::ustring argv0; - using namespace rtengine; using namespace rtengine::procparams; -Distortion::Distortion (): Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Distortion::Distortion (): FoldableToolPanel(this) { rlistener = NULL; autoDistor = Gtk::manage (new Gtk::Button (M("TP_DISTORTION_AUTO"))); diff --git a/rtgui/distortion.h b/rtgui/distortion.h index 1d7c9b92a..447c3c692 100644 --- a/rtgui/distortion.h +++ b/rtgui/distortion.h @@ -24,7 +24,7 @@ #include "toolpanel.h" #include "lensgeomlistener.h" -class Distortion : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class Distortion : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Gtk::Button* autoDistor; diff --git a/rtgui/epd.cc b/rtgui/epd.cc index 7b31502f1..cdf10280c 100644 --- a/rtgui/epd.cc +++ b/rtgui/epd.cc @@ -23,9 +23,7 @@ using namespace rtengine; using namespace rtengine::procparams; -EdgePreservingDecompositionUI::EdgePreservingDecompositionUI () : Gtk::VBox(), FoldableToolPanel(this){ - - set_border_width(4); +EdgePreservingDecompositionUI::EdgePreservingDecompositionUI () : FoldableToolPanel(this){ enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); diff --git a/rtgui/epd.h b/rtgui/epd.h index 0a7273ef4..37dfa1a37 100644 --- a/rtgui/epd.h +++ b/rtgui/epd.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class EdgePreservingDecompositionUI : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class EdgePreservingDecompositionUI : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster *strength; Adjuster *edgeStopping; diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 46838cb2d..a5ce36555 100755 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -42,8 +42,6 @@ FileBrowser::FileBrowser () profileStore.addListener(this); - signal_style_changed().connect( sigc::mem_fun(*this, &FileBrowser::styleChanged) ); - int p = 0; pmenu = new Gtk::Menu (); pmenu->attach (*Gtk::manage(open = new Gtk::MenuItem (M("FILEBROWSER_POPUPOPEN"))), 0, 1, p, p+1); p++; diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc index 7de12711e..e6642a5c9 100755 --- a/rtgui/flatfield.cc +++ b/rtgui/flatfield.cc @@ -26,10 +26,8 @@ using namespace rtengine; using namespace rtengine::procparams; -FlatField::FlatField () : Gtk::VBox(), FoldableToolPanel(this) +FlatField::FlatField () : FoldableToolPanel(this) { - set_border_width(4); - hbff = Gtk::manage(new Gtk::HBox()); flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN)); flatFieldFilePersister.reset(new FileChooserLastFolderPersister(flatFieldFile, options.lastFlatfieldDir)); diff --git a/rtgui/flatfield.h b/rtgui/flatfield.h index 935c13bd8..2b79e0bae 100755 --- a/rtgui/flatfield.h +++ b/rtgui/flatfield.h @@ -28,11 +28,12 @@ class FFProvider { public: + virtual ~FFProvider() {} virtual rtengine::RawImage* getFF() = 0; // add other info here }; -class FlatField : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class FlatField : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc index 5eb163d0b..aa4a7cf9c 100644 --- a/rtgui/gradient.cc +++ b/rtgui/gradient.cc @@ -9,10 +9,8 @@ using namespace rtengine; using namespace rtengine::procparams; -Gradient::Gradient () : Gtk::VBox(), FoldableToolPanel(this), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.) +Gradient::Gradient () : FoldableToolPanel(this), EditSubscriber(ET_OBJECTS), lastObject(-1), draggedPointOldAngle(-1000.) { - set_border_width(4); - enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &Gradient::enabledChanged) ); diff --git a/rtgui/gradient.h b/rtgui/gradient.h index 192795c89..0a7b8660a 100644 --- a/rtgui/gradient.h +++ b/rtgui/gradient.h @@ -9,7 +9,7 @@ #include "toolpanel.h" #include "edit.h" -class Gradient : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public EditSubscriber { +class Gradient : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public EditSubscriber { private: int lastObject; diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc index f1cd465a8..4bd92bf9e 100644 --- a/rtgui/histogrampanel.cc +++ b/rtgui/histogrampanel.cc @@ -319,8 +319,6 @@ HistogramRGBArea::HistogramRGBArea () ://needChroma unactive by default harih->harea = this; harih->destroyed = false; harih->pending = 0; - - signal_style_changed().connect( sigc::mem_fun(*this, &HistogramRGBArea::styleChanged) ); } HistogramRGBArea::~HistogramRGBArea () { @@ -536,7 +534,7 @@ bool HistogramRGBArea::on_button_press_event (GdkEventButton* event) { return true; } -void HistogramRGBArea::styleChanged (const Glib::RefPtr& style) { +void HistogramRGBArea::on_style_changed (const Glib::RefPtr& style) { white = get_style()->get_base(Gtk::STATE_NORMAL); queue_draw (); @@ -559,8 +557,6 @@ HistogramArea::HistogramArea (FullModeListener *fml) : //needChroma unactive by haih->harea = this; haih->destroyed = false; haih->pending = 0; - - signal_style_changed().connect( sigc::mem_fun(*this, &HistogramArea::styleChanged) ); } HistogramArea::~HistogramArea () { @@ -801,7 +797,7 @@ void HistogramArea::drawMarks(Cairo::RefPtr &cr, cr->fill(); } -void HistogramArea::styleChanged (const Glib::RefPtr& style) { +void HistogramArea::on_style_changed (const Glib::RefPtr& style) { white = get_style()->get_base(Gtk::STATE_NORMAL); queue_draw (); diff --git a/rtgui/histogrampanel.h b/rtgui/histogrampanel.h index 6e32a52ac..91491b17d 100644 --- a/rtgui/histogrampanel.h +++ b/rtgui/histogrampanel.h @@ -95,7 +95,7 @@ class HistogramRGBArea : public Gtk::DrawingArea { void on_realize(); bool on_expose_event(GdkEventExpose* event); bool on_button_press_event (GdkEventButton* event); - void styleChanged (const Glib::RefPtr& style); + void on_style_changed (const Glib::RefPtr& style); private: // Some ... }; @@ -144,7 +144,7 @@ class HistogramArea : public Gtk::DrawingArea{ void on_realize(); bool on_expose_event(GdkEventExpose* event); bool on_button_press_event (GdkEventButton* event); - void styleChanged (const Glib::RefPtr& style); + void on_style_changed (const Glib::RefPtr& style); private: void drawCurve(Cairo::RefPtr &cr, LUTu & data, double scale, int hsize, int vsize); diff --git a/rtgui/hsvequalizer.cc b/rtgui/hsvequalizer.cc index c603007ea..2805968bf 100644 --- a/rtgui/hsvequalizer.cc +++ b/rtgui/hsvequalizer.cc @@ -25,10 +25,8 @@ using namespace rtengine::procparams; //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -HSVEqualizer::HSVEqualizer () : Gtk::VBox(), FoldableToolPanel(this) { +HSVEqualizer::HSVEqualizer () : FoldableToolPanel(this) { - set_border_width(4); - std::vector bottomMilestones; float R, G, B; // -0.1 rad < Hue < 1.6 rad diff --git a/rtgui/hsvequalizer.h b/rtgui/hsvequalizer.h index 037163f8c..7ba04d883 100644 --- a/rtgui/hsvequalizer.h +++ b/rtgui/hsvequalizer.h @@ -29,13 +29,11 @@ #include "colorprovider.h" -class HSVEqualizer : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider +class HSVEqualizer : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider { protected: - Gtk::CheckButton * enabled; - CurveEditorGroup* curveEditorG; FlatCurveEditor* hshape; FlatCurveEditor* sshape; diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index f68160a81..67f62276a 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -30,9 +30,8 @@ using namespace rtengine::procparams; extern Options options; -ICMPanel::ICMPanel () : Gtk::VBox(), FoldableToolPanel(this), iunchanged(NULL), icmplistener(NULL), lastRefFilename("") { +ICMPanel::ICMPanel () : FoldableToolPanel(this), iunchanged(NULL), icmplistener(NULL), lastRefFilename("") { - set_border_width(4); isBatchMode = lastToneCurve = lastBlendCMSMatrix = lastgamfree = false; ipDialog = Gtk::manage (new MyFileChooserButton (M("TP_ICM_INPUTDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN)); diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h index 17b82f6f8..045e670cf 100755 --- a/rtgui/icmpanel.h +++ b/rtgui/icmpanel.h @@ -34,7 +34,7 @@ class ICMPanelListener { virtual void saveInputICCReference (Glib::ustring fname) {} }; -class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class ICMPanel : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* gampos; diff --git a/rtgui/ilabel.cc b/rtgui/ilabel.cc index b393e22b6..753eb8346 100644 --- a/rtgui/ilabel.cc +++ b/rtgui/ilabel.cc @@ -30,8 +30,6 @@ void ILabel::on_realize() { int labw, labh; fn->get_pixel_size (labw, labh); set_size_request (2+labw,2+labh); - - signal_style_changed().connect( sigc::mem_fun(*this, &ILabel::styleChanged) ); } bool ILabel::on_expose_event (GdkEventExpose* event) { @@ -53,7 +51,7 @@ bool ILabel::on_expose_event (GdkEventExpose* event) { return true; } -void ILabel::styleChanged (const Glib::RefPtr& style) { +void ILabel::on_style_changed (const Glib::RefPtr& style) { Glib::RefPtr fn = create_pango_layout(label); fn->set_markup (label); diff --git a/rtgui/ilabel.h b/rtgui/ilabel.h index 48f0bf20f..b4de52342 100644 --- a/rtgui/ilabel.h +++ b/rtgui/ilabel.h @@ -29,7 +29,7 @@ class ILabel : public Gtk::DrawingArea { ILabel (Glib::ustring lab); bool on_expose_event(GdkEventExpose* event); void on_realize(); - void styleChanged (const Glib::RefPtr& style); + void on_style_changed (const Glib::RefPtr& style); }; #endif diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc index 42598bb7d..df626048e 100644 --- a/rtgui/imagearea.cc +++ b/rtgui/imagearea.cc @@ -47,7 +47,6 @@ ImageArea::ImageArea (ImageAreaPanel* p) : parent(p) { add_events(Gdk::LEAVE_NOTIFY_MASK); - signal_style_changed().connect( sigc::mem_fun(*this, &ImageArea::styleChanged) ); signal_size_allocate().connect( sigc::mem_fun(*this, &ImageArea::on_resized) ); dirty = false; @@ -126,7 +125,7 @@ void ImageArea::setPreviewHandler (PreviewHandler* ph) { previewHandler = ph; } -void ImageArea::styleChanged (const Glib::RefPtr& style) { +void ImageArea::on_style_changed (const Glib::RefPtr& style) { // TODO: notify all crop windows that the style has been changed queue_draw (); diff --git a/rtgui/imagearea.h b/rtgui/imagearea.h index 64836db1e..97814e379 100644 --- a/rtgui/imagearea.h +++ b/rtgui/imagearea.h @@ -87,15 +87,15 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener, public Edi // widget base events void on_realize (); - bool on_expose_event (GdkEventExpose* event); - bool on_motion_notify_event (GdkEventMotion* event); - bool on_button_press_event (GdkEventButton* event); + bool on_expose_event (GdkEventExpose* event); + bool on_motion_notify_event (GdkEventMotion* event); + bool on_button_press_event (GdkEventButton* event); bool on_button_release_event (GdkEventButton* event); - bool on_scroll_event (GdkEventScroll* event); - bool on_leave_notify_event (GdkEventCrossing* event); - void on_resized (Gtk::Allocation& req); - void styleChanged (const Glib::RefPtr& style); - void syncBeforeAfterViews (); + bool on_scroll_event (GdkEventScroll* event); + bool on_leave_notify_event (GdkEventCrossing* event); + void on_resized (Gtk::Allocation& req); + void on_style_changed (const Glib::RefPtr& style); + void syncBeforeAfterViews (); void setCropGUIListener (CropGUIListener* l); void setPointerMotionListener (PointerMotionListener* pml); diff --git a/rtgui/impulsedenoise.cc b/rtgui/impulsedenoise.cc index 379945581..2c2cc2b62 100644 --- a/rtgui/impulsedenoise.cc +++ b/rtgui/impulsedenoise.cc @@ -24,9 +24,7 @@ using namespace rtengine; using namespace rtengine::procparams; -ImpulseDenoise::ImpulseDenoise () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +ImpulseDenoise::ImpulseDenoise () : FoldableToolPanel(this) { enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); diff --git a/rtgui/impulsedenoise.h b/rtgui/impulsedenoise.h index 350c759d0..ab20c4aae 100644 --- a/rtgui/impulsedenoise.h +++ b/rtgui/impulsedenoise.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class ImpulseDenoise : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class ImpulseDenoise : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* thresh; diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc index 38695ce2d..9301ec0b4 100644 --- a/rtgui/labcurve.cc +++ b/rtgui/labcurve.cc @@ -24,9 +24,7 @@ using namespace rtengine; using namespace rtengine::procparams; -LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +LCurve::LCurve () : FoldableToolPanel(this) { std::vector milestones; diff --git a/rtgui/labcurve.h b/rtgui/labcurve.h index 590f13e8e..41cb522dd 100644 --- a/rtgui/labcurve.h +++ b/rtgui/labcurve.h @@ -26,7 +26,7 @@ #include "curveeditorgroup.h" #include "colorprovider.h" -class LCurve : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider { +class LCurve : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider { protected: CurveEditorGroup* curveEditorG; diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc index e5a0b6304..436423b56 100644 --- a/rtgui/lensgeom.cc +++ b/rtgui/lensgeom.cc @@ -23,9 +23,7 @@ using namespace rtengine; using namespace rtengine::procparams; -LensGeometry::LensGeometry () : Gtk::VBox(), FoldableToolPanel(this), rlistener(NULL) { - - set_border_width(4); +LensGeometry::LensGeometry () : FoldableToolPanel(this), rlistener(NULL) { fill = Gtk::manage (new Gtk::CheckButton (M("TP_LENSGEOM_FILL"))); pack_start (*fill); @@ -34,7 +32,7 @@ LensGeometry::LensGeometry () : Gtk::VBox(), FoldableToolPanel(this), rlistener( autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto.png"))); pack_start (*autoCrop, Gtk::PACK_SHRINK, 2); - packBox = Gtk::manage (new Gtk::VBox ()); + packBox = Gtk::manage (new ToolParamBlock ()); pack_start (*packBox); autoCrop->signal_pressed().connect( sigc::mem_fun(*this, &LensGeometry::autoCropPressed) ); diff --git a/rtgui/lensgeom.h b/rtgui/lensgeom.h index 0be5a8968..84d64e816 100644 --- a/rtgui/lensgeom.h +++ b/rtgui/lensgeom.h @@ -23,7 +23,7 @@ #include "toolpanel.h" #include "lensgeomlistener.h" -class LensGeometry : public Gtk::VBox, public FoldableToolPanel { +class LensGeometry : public ToolParamBlock, public FoldableToolPanel { protected: Gtk::Button* autoCrop; @@ -31,7 +31,7 @@ class LensGeometry : public Gtk::VBox, public FoldableToolPanel { Gtk::CheckButton* fill; bool lastFill; sigc::connection fillConn; - Gtk::VBox* packBox; + ToolParamBlock* packBox; public: diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index 63ca85603..b947fc4a3 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -27,10 +27,8 @@ using namespace rtengine; using namespace rtengine::procparams; -LensProfilePanel::LensProfilePanel () : Gtk::VBox(), FoldableToolPanel(this) +LensProfilePanel::LensProfilePanel () : FoldableToolPanel(this) { - set_border_width(4); - hbLCPFile = Gtk::manage(new Gtk::HBox()); lLCPFileHead = Gtk::manage(new Gtk::Label(M("GENERAL_FILE"))); diff --git a/rtgui/lensprofile.h b/rtgui/lensprofile.h index e25555a24..29f2ebcff 100644 --- a/rtgui/lensprofile.h +++ b/rtgui/lensprofile.h @@ -23,7 +23,7 @@ #include "toolpanel.h" #include "guiutils.h" -class LensProfilePanel : public Gtk::VBox, public FoldableToolPanel { +class LensProfilePanel : public ToolParamBlock, public FoldableToolPanel { protected: diff --git a/rtgui/mycurve.cc b/rtgui/mycurve.cc index 6a7f34cec..ec31124d1 100644 --- a/rtgui/mycurve.cc +++ b/rtgui/mycurve.cc @@ -45,7 +45,6 @@ MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal #else add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK); #endif - signal_style_changed().connect( sigc::mem_fun(*this, &MyCurve::styleChanged) ); mcih = new MyCurveIdleHelper; mcih->myCurve = this; @@ -115,7 +114,7 @@ bool MyCurve::snapCoordinateY(double testedVal, double realVal) { return false; } -void MyCurve::styleChanged (const Glib::RefPtr& style) { +void MyCurve::on_style_changed (const Glib::RefPtr& style) { setDirty(true); queue_draw (); } diff --git a/rtgui/mycurve.h b/rtgui/mycurve.h index 1c87d2c92..09d0c2f54 100644 --- a/rtgui/mycurve.h +++ b/rtgui/mycurve.h @@ -117,7 +117,7 @@ class MyCurve : public Gtk::DrawingArea, public BackBuffer, public ColorCaller { void forceResize() { sized = RS_Force; } void refresh(); void setCurveDirty () { curveIsDirty = true; } - void styleChanged (const Glib::RefPtr& style); + void on_style_changed (const Glib::RefPtr& style); virtual std::vector getPoints () = 0; virtual void setPoints (const std::vector& p) = 0; virtual bool handleEvents (GdkEvent* event) = 0; diff --git a/rtgui/pcvignette.cc b/rtgui/pcvignette.cc index 6fb258b13..bc287f40d 100644 --- a/rtgui/pcvignette.cc +++ b/rtgui/pcvignette.cc @@ -7,10 +7,8 @@ using namespace rtengine; using namespace rtengine::procparams; -PCVignette::PCVignette () : Gtk::VBox(), FoldableToolPanel(this) +PCVignette::PCVignette () : FoldableToolPanel(this) { - set_border_width(4); - enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &PCVignette::enabledChanged) ); diff --git a/rtgui/pcvignette.h b/rtgui/pcvignette.h index cab1c568c..158164429 100644 --- a/rtgui/pcvignette.h +++ b/rtgui/pcvignette.h @@ -8,7 +8,7 @@ #include "adjuster.h" #include "toolpanel.h" -class PCVignette : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class PCVignette : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Gtk::CheckButton* enabled; diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc index 2939ca248..c33e82c85 100644 --- a/rtgui/perspective.cc +++ b/rtgui/perspective.cc @@ -22,9 +22,7 @@ using namespace rtengine; using namespace rtengine::procparams; -PerspCorrection::PerspCorrection () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +PerspCorrection::PerspCorrection () : FoldableToolPanel(this) { Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-h1.png")); Gtk::Image* ipersHR = Gtk::manage (new RTImage ("perspective-h2.png")); diff --git a/rtgui/perspective.h b/rtgui/perspective.h index 48f33c882..35876e14b 100644 --- a/rtgui/perspective.h +++ b/rtgui/perspective.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class PerspCorrection : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class PerspCorrection : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* horiz; diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 6441b472b..5201aec2a 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -38,6 +38,7 @@ Preferences::Preferences (RTWindow *rtwindow) : rprofiles(NULL), iprofiles(NULL set_title (M("MAIN_BUTTON_PREFERENCES")); moptions.copyFrom (&options); + oldSlimUI = options.slimUI; /* * Do not increase height, since it's not visible on e.g. smaller netbook screens @@ -1427,8 +1428,11 @@ void Preferences::okPressed () { void Preferences::cancelPressed () { + bool currentSlimState = options.slimUI; + options.slimUI = oldSlimUI; + // set the initial theme back - if (theme->get_active_text () != options.theme) { + if (theme->get_active_text()!=options.theme || options.slimUI!=currentSlimState) { RTImage::setPaths(options); RTImage::updateImages(); switchThemeTo(options.theme, options.slimUI); @@ -1580,6 +1584,9 @@ void Preferences::switchThemeTo(Glib::ustring newTheme, bool slimInterface) { std::vector files; files.push_back (argv0+"/themes/"+newTheme+".gtkrc"); + + options.slimUI = slimInterface; + if (slimInterface) files.push_back (argv0+"/themes/slim"); Gtk::RC::set_default_files (files); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 587682d6b..c0bfa8841 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -159,6 +159,8 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener { Glib::ustring initialTheme; Glib::ustring initialFont; + bool oldSlimUI; + void fillPreferences (); void storePreferences (); void parseDir (Glib::ustring dirname, std::vector& items, Glib::ustring ext); diff --git a/rtgui/preprocess.cc b/rtgui/preprocess.cc index 002a3d623..783cabed2 100644 --- a/rtgui/preprocess.cc +++ b/rtgui/preprocess.cc @@ -24,10 +24,8 @@ using namespace rtengine; using namespace rtengine::procparams; -PreProcess::PreProcess () : Gtk::VBox(), FoldableToolPanel(this) +PreProcess::PreProcess () : FoldableToolPanel(this) { - set_border_width(4); - hotDeadPixel = Gtk::manage(new Gtk::CheckButton((M("TP_PREPROCESS_HOTDEADPIXFILT")))); hotDeadPixel->set_tooltip_markup (M("TP_PREPROCESS_HOTDEADPIXFILT_TOOLTIP")); diff --git a/rtgui/preprocess.h b/rtgui/preprocess.h index fe6683a64..345672b4e 100644 --- a/rtgui/preprocess.h +++ b/rtgui/preprocess.h @@ -24,7 +24,7 @@ #include "toolpanel.h" #include "../rtengine/rawimage.h" -class PreProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class PreProcess : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc index cb5f5c227..daeaf5894 100644 --- a/rtgui/rawcacorrection.cc +++ b/rtgui/rawcacorrection.cc @@ -25,10 +25,8 @@ using namespace rtengine; using namespace rtengine::procparams; -RAWCACorr::RAWCACorr () : Gtk::VBox(), FoldableToolPanel(this) +RAWCACorr::RAWCACorr () : FoldableToolPanel(this) { - set_border_width(4); - Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png")); diff --git a/rtgui/rawcacorrection.h b/rtgui/rawcacorrection.h index 5cf28f200..aa4d854dc 100644 --- a/rtgui/rawcacorrection.h +++ b/rtgui/rawcacorrection.h @@ -24,7 +24,7 @@ #include "toolpanel.h" #include "../rtengine/rawimage.h" -class RAWCACorr : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class RAWCACorr : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Gtk::CheckButton* caAutocorrect; diff --git a/rtgui/rawexposure.cc b/rtgui/rawexposure.cc index 719146517..4992d6b2f 100644 --- a/rtgui/rawexposure.cc +++ b/rtgui/rawexposure.cc @@ -24,10 +24,8 @@ using namespace rtengine; using namespace rtengine::procparams; -RAWExposure::RAWExposure () : Gtk::VBox(), FoldableToolPanel(this) +RAWExposure::RAWExposure () : FoldableToolPanel(this) { - set_border_width(4); - PexPos = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_LINEAR"),0.1,16.0,0.01,1)); PexPos->setAdjusterListener (this); if (PexPos->delay < 1000) PexPos->delay = 1000; diff --git a/rtgui/rawexposure.h b/rtgui/rawexposure.h index c65bfe4c1..2c0b3cd09 100644 --- a/rtgui/rawexposure.h +++ b/rtgui/rawexposure.h @@ -24,7 +24,7 @@ #include "toolpanel.h" #include "../rtengine/rawimage.h" -class RAWExposure : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class RAWExposure : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* PexPos; diff --git a/rtgui/rawprocess.cc b/rtgui/rawprocess.cc index 0fbc3a3d2..4a3c0dca1 100644 --- a/rtgui/rawprocess.cc +++ b/rtgui/rawprocess.cc @@ -22,10 +22,8 @@ using namespace rtengine; using namespace rtengine::procparams; -RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this) +RawProcess::RawProcess () : FoldableToolPanel(this) { - set_border_width(4); - Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ()); hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") +": ")),Gtk::PACK_SHRINK, 4); dmethod = Gtk::manage (new MyComboBoxText ()); diff --git a/rtgui/rawprocess.h b/rtgui/rawprocess.h index 4de09de9c..5fbee271d 100644 --- a/rtgui/rawprocess.h +++ b/rtgui/rawprocess.h @@ -25,7 +25,7 @@ #include "toolpanel.h" -class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel{ +class RawProcess : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel{ protected: diff --git a/rtgui/resize.cc b/rtgui/resize.cc index b56ee7400..58ea74900 100644 --- a/rtgui/resize.cc +++ b/rtgui/resize.cc @@ -23,9 +23,7 @@ using namespace rtengine; using namespace rtengine::procparams; -Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100000), lastEnabled(false) { - - set_border_width(4); +Resize::Resize () : FoldableToolPanel(this), maxw(100000), maxh(100000), lastEnabled(false) { cropw = 0; croph = 0; @@ -35,13 +33,16 @@ Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100 pack_start(*Gtk::manage (new Gtk::HSeparator()), Gtk::PACK_SHRINK, 2); Gtk::Table* combos = Gtk::manage (new Gtk::Table (2, 2)); + Gtk::Label *label = NULL; appliesTo = Gtk::manage (new MyComboBoxText ()); appliesTo->append_text (M("TP_RESIZE_CROPPEDAREA")); appliesTo->append_text (M("TP_RESIZE_FULLIMAGE")); appliesTo->set_active (0); - combos->attach (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_APPLIESTO"))), 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2); + label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_APPLIESTO"))); + label->set_alignment(0., 0.); + combos->attach (*label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2); combos->attach (*appliesTo, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2); method = Gtk::manage (new MyComboBoxText ()); @@ -53,7 +54,9 @@ Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100 method->append_text (M("TP_RESIZE_LANCZOS")); method->set_active (0); - combos->attach (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_METHOD"))), 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2); + label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_METHOD"))); + label->set_alignment(0., 0.); + combos->attach (*label, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2); combos->attach (*method, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2); spec = Gtk::manage (new MyComboBoxText ()); @@ -63,7 +66,9 @@ Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100 spec->append_text (M("TP_RESIZE_FITBOX")); spec->set_active (0); - combos->attach (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY"))), 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 2, 2); + label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY"))); + label->set_alignment(0., 0.); + combos->attach (*label, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 2, 2); combos->attach (*spec, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2); pack_start (*combos, Gtk::PACK_SHRINK, 4); @@ -80,14 +85,17 @@ Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100 Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ()); w = Gtk::manage (new MySpinButton ()); h = Gtk::manage (new MySpinButton ()); - wbox->pack_start (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_W"))), Gtk::PACK_SHRINK, 4); + wbox->set_spacing(3); + wbox->pack_start (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_W"))), Gtk::PACK_SHRINK, 0); wbox->pack_start (*w); - hbox->pack_start (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_H"))), Gtk::PACK_SHRINK, 4); + hbox->set_spacing(3); + hbox->pack_start (*Gtk::manage (new Gtk::Label (M("TP_RESIZE_H"))), Gtk::PACK_SHRINK, 0); hbox->pack_start (*h); + sbox->set_spacing(4); sbox->pack_start (*wbox); sbox->pack_start (*hbox); - sizeBox->pack_start (*sbox, Gtk::PACK_SHRINK, 4); + sizeBox->pack_start (*sbox, Gtk::PACK_SHRINK, 0); sizeBox->show_all (); sizeBox->reference (); diff --git a/rtgui/resize.h b/rtgui/resize.h index 0af6e8631..9ddbb6c9c 100644 --- a/rtgui/resize.h +++ b/rtgui/resize.h @@ -25,7 +25,7 @@ #include "toolpanel.h" #include "guiutils.h" -class Resize : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public rtengine::SizeListener { +class Resize : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::SizeListener { protected: Gtk::CheckButton* enabled; diff --git a/rtgui/rgbcurves.cc b/rtgui/rgbcurves.cc index a33e12683..a03080298 100644 --- a/rtgui/rgbcurves.cc +++ b/rtgui/rgbcurves.cc @@ -22,9 +22,7 @@ using namespace rtengine; using namespace rtengine::procparams; -RGBCurves::RGBCurves () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +RGBCurves::RGBCurves () : FoldableToolPanel(this) { lumamode = Gtk::manage (new Gtk::CheckButton (M("TP_RGBCURVES_LUMAMODE"))); lumamode->set_tooltip_markup (M("TP_RGBCURVES_LUMAMODE_TOOLTIP")); diff --git a/rtgui/rgbcurves.h b/rtgui/rgbcurves.h index 5c439c5c7..739ff0c0c 100644 --- a/rtgui/rgbcurves.h +++ b/rtgui/rgbcurves.h @@ -26,7 +26,7 @@ #include "curveeditorgroup.h" #include "colorprovider.h" -class RGBCurves : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider { +class RGBCurves : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider { protected: CurveEditorGroup* curveEditorG; diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc index dd478cdaa..79f0cf0bb 100644 --- a/rtgui/rotate.cc +++ b/rtgui/rotate.cc @@ -21,14 +21,10 @@ #include "guiutils.h" #include "rtimage.h" -extern Glib::ustring argv0; - using namespace rtengine; using namespace rtengine::procparams; -Rotate::Rotate () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Rotate::Rotate () : FoldableToolPanel(this) { rlistener = NULL; diff --git a/rtgui/rotate.h b/rtgui/rotate.h index 938710ed0..e096393e6 100644 --- a/rtgui/rotate.h +++ b/rtgui/rotate.h @@ -24,7 +24,7 @@ #include "toolpanel.h" #include "lensgeomlistener.h" -class Rotate : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class Rotate : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* degree; diff --git a/rtgui/shadowshighlights.cc b/rtgui/shadowshighlights.cc index 3306c7023..d59f9b890 100644 --- a/rtgui/shadowshighlights.cc +++ b/rtgui/shadowshighlights.cc @@ -21,9 +21,7 @@ using namespace rtengine; using namespace rtengine::procparams; -ShadowsHighlights::ShadowsHighlights () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +ShadowsHighlights::ShadowsHighlights () : FoldableToolPanel(this) { enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (false); diff --git a/rtgui/shadowshighlights.h b/rtgui/shadowshighlights.h index 12acae2b6..629fe8709 100644 --- a/rtgui/shadowshighlights.h +++ b/rtgui/shadowshighlights.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class ShadowsHighlights : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class ShadowsHighlights : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* highlights; diff --git a/rtgui/sharpenedge.cc b/rtgui/sharpenedge.cc index 0ab5fac1f..449673b0e 100644 --- a/rtgui/sharpenedge.cc +++ b/rtgui/sharpenedge.cc @@ -27,9 +27,7 @@ using namespace rtengine; using namespace rtengine::procparams; -SharpenEdge::SharpenEdge () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +SharpenEdge::SharpenEdge () : FoldableToolPanel(this) { enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (true); diff --git a/rtgui/sharpenedge.h b/rtgui/sharpenedge.h index 83b63e288..e0a0b3c1f 100644 --- a/rtgui/sharpenedge.h +++ b/rtgui/sharpenedge.h @@ -28,7 +28,7 @@ #include "adjuster.h" #include "toolpanel.h" -class SharpenEdge : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class SharpenEdge : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc index 4dd87a2cf..93a08e934 100644 --- a/rtgui/sharpening.cc +++ b/rtgui/sharpening.cc @@ -24,9 +24,7 @@ using namespace rtengine; using namespace rtengine::procparams; -Sharpening::Sharpening () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Sharpening::Sharpening () : FoldableToolPanel(this) { std::vector milestones; milestones.push_back( GradientMilestone(0.0, 0.0, 0.0, 0.0) ); diff --git a/rtgui/sharpening.h b/rtgui/sharpening.h index 1f87af11f..c9b8705d8 100644 --- a/rtgui/sharpening.h +++ b/rtgui/sharpening.h @@ -24,7 +24,7 @@ #include "thresholdadjuster.h" #include "toolpanel.h" -class Sharpening : public Gtk::VBox, public ThresholdAdjusterListener, public AdjusterListener, public FoldableToolPanel { +class Sharpening : public ToolParamBlock, public ThresholdAdjusterListener, public AdjusterListener, public FoldableToolPanel { protected: MyComboBoxText* method; diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc index 7d20822e4..f778fbf85 100644 --- a/rtgui/sharpenmicro.cc +++ b/rtgui/sharpenmicro.cc @@ -27,9 +27,7 @@ using namespace rtengine; using namespace rtengine::procparams; -SharpenMicro::SharpenMicro () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +SharpenMicro::SharpenMicro () : FoldableToolPanel(this) { enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled->set_active (true); diff --git a/rtgui/sharpenmicro.h b/rtgui/sharpenmicro.h index e0e3a43e0..c995b17d5 100644 --- a/rtgui/sharpenmicro.h +++ b/rtgui/sharpenmicro.h @@ -28,7 +28,7 @@ #include "adjuster.h" #include "toolpanel.h" -class SharpenMicro : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class SharpenMicro : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: diff --git a/rtgui/shcselector.cc b/rtgui/shcselector.cc index 891c14a44..d7e92036a 100644 --- a/rtgui/shcselector.cc +++ b/rtgui/shcselector.cc @@ -101,7 +101,10 @@ bool SHCSelector::on_expose_event(GdkEventExpose* event) { else { // solid background c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.96, c.get_green_p()*0.96, c.get_blue_p()*0.96); + else + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); // draw the box's background cr->rectangle (leftMargin+1, 1, w-2, int(float(h)*5.5f/7.f+0.5f)); @@ -111,8 +114,11 @@ bool SHCSelector::on_expose_event(GdkEventExpose* event) { // draw the box's borders cr->set_line_width (1.); cr->rectangle (leftMargin+0.5, 0.5, w-1, int(float(h)*5.5f/7.f+0.5f)+1); - c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); + c = style->get_bg (state); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + else + cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); cr->stroke (); // draw sliders @@ -128,8 +134,11 @@ bool SHCSelector::on_expose_event(GdkEventExpose* event) { c = style->get_bg (is_sensitive() ? Gtk::STATE_ACTIVE : Gtk::STATE_INSENSITIVE); cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); cr->fill_preserve (); - c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); + c = style->get_bg (state); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + else + cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); cr->stroke (); } diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc index 087354671..75ac57c83 100644 --- a/rtgui/thresholdadjuster.cc +++ b/rtgui/thresholdadjuster.cc @@ -79,7 +79,7 @@ void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb) { // TODO: let the user chose the default value of ThresholdAdjuster::delay, for slow machines delay = options.adjusterDelay; // delay is no more static, so we can set the delay individually (useful for the RAW editor tab) - set_border_width (2); + set_name("ThresholdAdjuster"); hbox = Gtk::manage (new Gtk::HBox ()); diff --git a/rtgui/thresholdselector.cc b/rtgui/thresholdselector.cc index 9969cb015..c5786e3f4 100644 --- a/rtgui/thresholdselector.cc +++ b/rtgui/thresholdselector.cc @@ -229,7 +229,10 @@ bool ThresholdSelector::on_expose_event(GdkEventExpose* event) { else { // solid background c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.96, c.get_green_p()*0.96, c.get_blue_p()*0.96); + else + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); // draw the box's background cr->rectangle (hb+hwslider-0.5, double(int(float(h)*1.5f/7.f))+0.5, iw+1, double(int(float(h)*4.f/7.f))); @@ -298,7 +301,7 @@ bool ThresholdSelector::on_expose_event(GdkEventExpose* event) { } else { c = style->get_bg (Gtk::STATE_INSENSITIVE); - cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); } cr->set_line_width (1.5); cr->stroke (); @@ -306,8 +309,11 @@ bool ThresholdSelector::on_expose_event(GdkEventExpose* event) { // draw the box's borders cr->set_line_width (1.); cr->rectangle (hb+hwslider-0.5, double(int(float(h)*1.5f/7.f))+0.5, iw+1, double(int(float(h)*4.f/7.f))); - c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); + c = style->get_bg (state); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + else + cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); cr->stroke (); // draw sliders @@ -349,8 +355,11 @@ bool ThresholdSelector::on_expose_event(GdkEventExpose* event) { c = style->get_bg (is_sensitive() ? Gtk::STATE_ACTIVE : Gtk::STATE_INSENSITIVE); cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); cr->fill_preserve (); - c = style->get_bg (state); - cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); + c = style->get_bg (state); + if (state==Gtk::STATE_INSENSITIVE) + cr->set_source_rgb (c.get_red_p()*0.85, c.get_green_p()*0.85, c.get_blue_p()*0.85); + else + cr->set_source_rgb (c.get_red_p()*0.7, c.get_green_p()*0.7, c.get_blue_p()*0.7); cr->stroke (); } } diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index ab0fe0615..0d29979d0 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -54,7 +54,6 @@ ThumbBrowserBase::ThumbBrowserBase () hscroll.signal_value_changed().connect( sigc::mem_fun(*this, &ThumbBrowserBase::scrollChanged) ); internal.signal_size_allocate().connect( sigc::mem_fun(*this, &ThumbBrowserBase::internalAreaResized) ); - signal_style_changed().connect( sigc::mem_fun(*this, &ThumbBrowserBase::styleChanged) ); } void ThumbBrowserBase::scrollChanged () { @@ -586,7 +585,7 @@ bool ThumbBrowserBase::Internal::on_query_tooltip (int x, int y, bool keyboard_t return false; } -void ThumbBrowserBase::styleChanged (const Glib::RefPtr& style) { +void ThumbBrowserBase::on_style_changed (const Glib::RefPtr& style) { // GUI will be acquired by refreshThumbImages refreshThumbImages (); } diff --git a/rtgui/thumbbrowserbase.h b/rtgui/thumbbrowserbase.h index 1892b49b1..40730a2f3 100644 --- a/rtgui/thumbbrowserbase.h +++ b/rtgui/thumbbrowserbase.h @@ -111,7 +111,7 @@ class ThumbBrowserBase : public Gtk::VBox { int getEffectiveHeight (); const std::vector& getEntries () { return fd; } - void styleChanged (const Glib::RefPtr& style); + void on_style_changed (const Glib::RefPtr& style); void redraw (); // arrange files and draw area void refreshThumbImages (); // refresh thumbnail sizes, re-generate thumbnail images, arrange and draw void refreshQuickThumbImages (); // refresh thumbnail sizes, re-generate thumbnail images, arrange and draw diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index 40fb77346..8558f9145 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -26,10 +26,7 @@ using namespace rtengine; using namespace rtengine::procparams; -ToneCurve::ToneCurve () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); - set_spacing(4); +ToneCurve::ToneCurve () : FoldableToolPanel(this) { CurveListener::setMulti(true); diff --git a/rtgui/tonecurve.h b/rtgui/tonecurve.h index eacf47f42..d823ec33d 100644 --- a/rtgui/tonecurve.h +++ b/rtgui/tonecurve.h @@ -27,7 +27,7 @@ #include "mycurve.h" #include "guiutils.h" -class ToneCurve : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoExpListener,public CurveListener { +class ToneCurve : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoExpListener,public CurveListener { protected: // from HLRecovery diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc index 6d8a7935b..4300b07ee 100644 --- a/rtgui/toolpanel.cc +++ b/rtgui/toolpanel.cc @@ -22,18 +22,95 @@ using namespace rtengine::procparams; -class Frame2: public Gtk::Frame +class Frame2: public Gtk::EventBox { Gtk::Container *pC; + public: - Frame2( Gtk::Container *p):pC(p){} + Frame2( Gtk::Container *p):pC(p){ updateStyle(); } ~Frame2( ){ delete pC;} + + void updateStyle() { + set_border_width(options.slimUI ? 2 : 8); // Outer space around the tool's frame 2:7 + } + + void on_style_changed (const Glib::RefPtr& style) { updateStyle(); } + bool on_expose_event(GdkEventExpose* event); }; +bool Frame2::on_expose_event(GdkEventExpose* event) { + bool retVal = Gtk::EventBox::on_expose_event(event); + + if (!options.useSystemTheme) { + Glib::RefPtr window = get_window(); + Glib::RefPtr style = get_style (); + Cairo::RefPtr cr = window->create_cairo_context(); + + int x_, y_, w_, h_, foo; + window->get_geometry(x_, y_, w_, h_, foo); + double x = 0.; + double y = 0.; + double w = double(w_); + double h = double(h_); + + cr->set_antialias (Cairo::ANTIALIAS_NONE); + + // draw a frame + cr->set_line_width (1.0); + Gdk::Color c = style->get_fg (Gtk::STATE_NORMAL); + cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); + cr->move_to(x+0.5, y+0.5); + cr->line_to(x+w, y+0.5); + cr->line_to(x+w, y+h); + cr->line_to(x+0.5, y+h); + cr->line_to(x+0.5, y+0.5); + cr->stroke (); + } + return retVal; +} + +ToolVBox::ToolVBox() { + updateStyle(); +} + +void ToolVBox::updateStyle() { + if (options.slimUI) { + set_spacing(3); // Vertical space between tools + set_border_width(1); // Space separating the tab's frame and the tools + } + else { + set_spacing(3); // Vertical space between tools + set_border_width(1); // Space separating the tab's frame and the tools 3 + } +} + +void ToolVBox::on_style_changed (const Glib::RefPtr& style) { + updateStyle(); +} + +ToolParamBlock::ToolParamBlock() { + updateStyle(); +} + +void ToolParamBlock::updateStyle() { + if (options.slimUI) { + set_spacing(2); // Vertical space between parameters in a single tool + set_border_width(6); // Space separating the parameters of a tool and its surrounding frame 6 + } + else { + set_spacing(4); // Vertical space between parameters in a single tool + set_border_width(8); // Space separating the parameters of a tool and its surrounding frame 8 + } +} + +void ToolParamBlock::on_style_changed (const Glib::RefPtr& style) { + updateStyle(); +} + FoldableToolPanel::FoldableToolPanel(Gtk::Box* content) : ToolPanel(), parentContainer(NULL), exp(NULL) { exp = Gtk::manage (new Gtk::Expander ()); - exp->set_border_width (4); + //exp->set_border_width (5); exp->set_use_markup (true); exp->signal_button_release_event().connect_notify( sigc::mem_fun(this, &FoldableToolPanel::foldThemAll) ); @@ -44,7 +121,6 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content) : ToolPanel(), parentCon pframe->add (*content); exp->add (*pframe); - pframe->set_shadow_type (Gtk::SHADOW_ETCHED_IN); pframe->show (); exp->show (); } diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index 9478d6a6e..72168298f 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -38,6 +38,26 @@ class ToolPanelListener { virtual void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr) {} }; +/// @brief This class control the space around the group of tools inside a tab, as well as the space separating each tool. */ +class ToolVBox : public Gtk::VBox { + private: + void updateStyle(); + + public: + ToolVBox(); + void on_style_changed (const Glib::RefPtr& style); +}; + +/// @brief This class control the space around a tool's block of parameter. */ +class ToolParamBlock : public Gtk::VBox { + private: + void updateStyle(); + + public: + ToolParamBlock(); + void on_style_changed (const Glib::RefPtr& style); +}; + class ToolPanel { protected: diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index acdf6e9e7..d091fa577 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -33,11 +33,11 @@ using namespace rtengine::procparams; ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { - exposurePanel = Gtk::manage (new Gtk::VBox ()); - detailsPanel = Gtk::manage (new Gtk::VBox ()); - colorPanel = Gtk::manage (new Gtk::VBox ()); - transformPanel = Gtk::manage (new Gtk::VBox ()); - rawPanel = Gtk::manage (new Gtk::VBox ()); + exposurePanel = Gtk::manage (new ToolVBox ()); + detailsPanel = Gtk::manage (new ToolVBox ()); + colorPanel = Gtk::manage (new ToolVBox ()); + transformPanel = Gtk::manage (new ToolVBox ()); + rawPanel = Gtk::manage (new ToolVBox ()); coarse = Gtk::manage (new CoarsePanel ()); toneCurve = Gtk::manage (new ToneCurve ()); @@ -144,24 +144,24 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { } exposurePanelSW->add (*exposurePanel); - exposurePanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + exposurePanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,0); exposurePanel->pack_start (*vbPanelEnd[0],Gtk::PACK_SHRINK,4); detailsPanelSW->add (*detailsPanel); - detailsPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + detailsPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,0); detailsPanel->pack_start (*vbPanelEnd[1],Gtk::PACK_SHRINK,4); colorPanelSW->add (*colorPanel); - colorPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + colorPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,0); colorPanel->pack_start (*vbPanelEnd[2],Gtk::PACK_SHRINK,4); transformPanelSW->add (*transformPanel); - transformPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + transformPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,0); transformPanel->pack_start (*vbPanelEnd[3],Gtk::PACK_SHRINK,4); rawPanelSW->add (*rawPanel); - rawPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); - rawPanel->pack_start (*vbPanelEnd[4],Gtk::PACK_SHRINK,4); + rawPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,0); + rawPanel->pack_start (*vbPanelEnd[4],Gtk::PACK_SHRINK,0); TOITypes type = options.UseIconNoText ? TOI_ICON : TOI_TEXT; @@ -203,16 +203,17 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label, bool need100Percent) { - if (where->children().size()) { + // no more separator! + /*if (where->children().size()) { Gtk::HSeparator *hsep = Gtk::manage (new Gtk::HSeparator()); where->pack_start(*hsep, Gtk::PACK_SHRINK, 0); hsep->show(); - } + }*/ panel->setParent(where); panel->setLabel(escapeHtmlChars(label), need100Percent); - expList.push_back (panel->exp); + expList.push_back (panel->exp); where->pack_start(*panel->exp, false, false); } diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 5d76254d6..ecb199347 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -128,11 +128,11 @@ class ToolPanelCoordinator : public ToolPanelListener, rtengine::StagedImageProcessor* ipc; std::vector toolPanels; - Gtk::VBox* exposurePanel; - Gtk::VBox* detailsPanel; - Gtk::VBox* colorPanel; - Gtk::VBox* transformPanel; - Gtk::VBox* rawPanel; + ToolVBox* exposurePanel; + ToolVBox* detailsPanel; + ToolVBox* colorPanel; + ToolVBox* transformPanel; + ToolVBox* rawPanel; Gtk::Notebook* metadataPanel; ExifPanel* exifpanel; IPTCPanel* iptcpanel; diff --git a/rtgui/vibrance.cc b/rtgui/vibrance.cc index 0eab03a0b..149725b93 100644 --- a/rtgui/vibrance.cc +++ b/rtgui/vibrance.cc @@ -24,9 +24,7 @@ using namespace rtengine; using namespace rtengine::procparams; -Vibrance::Vibrance () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Vibrance::Vibrance () : FoldableToolPanel(this) { std::vector milestones; float R, G, B; diff --git a/rtgui/vibrance.h b/rtgui/vibrance.h index 440afa0bb..0c79d686f 100644 --- a/rtgui/vibrance.h +++ b/rtgui/vibrance.h @@ -26,7 +26,7 @@ #include "curveeditorgroup.h" #include "toolpanel.h" -class Vibrance : public Gtk::VBox, public AdjusterListener, public ThresholdCurveProvider, public ThresholdAdjusterListener, +class Vibrance : public ToolParamBlock, public AdjusterListener, public ThresholdCurveProvider, public ThresholdAdjusterListener, public FoldableToolPanel, public CurveListener { diff --git a/rtgui/vignetting.cc b/rtgui/vignetting.cc index b968c82be..16cb6656b 100644 --- a/rtgui/vignetting.cc +++ b/rtgui/vignetting.cc @@ -22,9 +22,7 @@ using namespace rtengine; using namespace rtengine::procparams; -Vignetting::Vignetting () : Gtk::VBox(), FoldableToolPanel(this) { - - set_border_width(4); +Vignetting::Vignetting () : FoldableToolPanel(this) { amount = Gtk::manage (new Adjuster (M("TP_VIGNETTING_AMOUNT"), -100, 100, 1, 0)); amount->setAdjusterListener (this); diff --git a/rtgui/vignetting.h b/rtgui/vignetting.h index 45d8b603a..a6c22252f 100644 --- a/rtgui/vignetting.h +++ b/rtgui/vignetting.h @@ -23,7 +23,7 @@ #include "adjuster.h" #include "toolpanel.h" -class Vignetting : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class Vignetting : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { protected: Adjuster* amount; diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 029b0da0a..ae11ee73e 100755 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -115,9 +115,7 @@ static double wbTemp2Slider(double temp) { return sval; } -WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), wblistener(NULL) { - - set_border_width(4); +WhiteBalance::WhiteBalance () : FoldableToolPanel(this), wbp(NULL), wblistener(NULL) { Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ()); hbox->show (); diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h index 5e932fe25..39ad5ffe2 100644 --- a/rtgui/whitebalance.h +++ b/rtgui/whitebalance.h @@ -32,7 +32,7 @@ class SpotWBListener { virtual void spotWBRequested (int size) {} }; -class WhiteBalance : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel { +class WhiteBalance : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel { enum WB_LabelType { WBLT_GUI,