diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc index 11d3d7dec..576ccd642 100644 --- a/rtdata/themes/09-Gray-Orange.gtkrc +++ b/rtdata/themes/09-Gray-Orange.gtkrc @@ -326,6 +326,14 @@ 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) +} + +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.25, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -437,6 +445,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc index bac8545ae..85fcbbceb 100644 --- a/rtdata/themes/17-Gray-Red.gtkrc +++ b/rtdata/themes/17-Gray-Red.gtkrc @@ -326,6 +326,14 @@ style "clearlooks-separator_menu_item" { 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.25, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -437,6 +445,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/21-Gray-Gray.gtkrc b/rtdata/themes/21-Gray-Gray.gtkrc index 860066c5c..0c706f14e 100644 --- a/rtdata/themes/21-Gray-Gray.gtkrc +++ b/rtdata/themes/21-Gray-Gray.gtkrc @@ -234,6 +234,16 @@ style "clearlooks-button" { } } +style "clearlooks-checkbutton" { + + bg[SELECTED] = darker (@rt_fg_color) + + engine "clearlooks" + { + hint = "checkbutton" + } +} + # The color is changed by the notebook_bg style, this style # changes the x/ythickness style "clearlooks-notebook" { @@ -326,6 +336,14 @@ 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) +} + +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.20, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -413,6 +431,7 @@ 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-notebook" widget_class "**" style "clearlooks-statusbar" @@ -437,6 +456,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/25-Gray-Gray.gtkrc b/rtdata/themes/25-Gray-Gray.gtkrc index c5d6a9b49..fe8288de6 100644 --- a/rtdata/themes/25-Gray-Gray.gtkrc +++ b/rtdata/themes/25-Gray-Gray.gtkrc @@ -326,6 +326,14 @@ style "clearlooks-separator_menu_item" { 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.25, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -437,6 +445,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc index 6b509405f..1c6171a6e 100644 --- a/rtdata/themes/25-Gray-Purple.gtkrc +++ b/rtdata/themes/25-Gray-Purple.gtkrc @@ -326,6 +326,14 @@ style "clearlooks-separator_menu_item" { 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.25, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -437,6 +445,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc index 0e20c62c9..fd76e8248 100644 --- a/rtdata/themes/25-Gray-Red.gtkrc +++ b/rtdata/themes/25-Gray-Red.gtkrc @@ -326,6 +326,14 @@ style "clearlooks-separator_menu_item" { 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.25, @rt_fg_color, @rt_bg_color) } style "clearlooks-treeview" { @@ -437,6 +445,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc index 744520bec..23531d001 100644 --- a/rtdata/themes/37-Gray-Red-Textured.gtkrc +++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc @@ -675,8 +675,15 @@ style "clearlooks-separator_menu_item" { 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.25, @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 @@ -789,6 +796,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc index f763153a4..ae5732761 100644 --- a/rtdata/themes/37-Gray-Red.gtkrc +++ b/rtdata/themes/37-Gray-Red.gtkrc @@ -326,8 +326,15 @@ style "clearlooks-separator_menu_item" { 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.25, @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 @@ -439,6 +446,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc index d4cfc15e6..6cea351d0 100644 --- a/rtdata/themes/63-Gray-Cyan.gtkrc +++ b/rtdata/themes/63-Gray-Cyan.gtkrc @@ -327,8 +327,15 @@ style "clearlooks-separator_menu_item" { style "clearlooks-frame_title" { fg[NORMAL] = shade (1.40, @rt_bg_color) + fg[PRELIGHT] = shade (1.40, @rt_bg_color) + fg[ACTIVE] = shade (1.40, @rt_bg_color) + fg[SELECTED] = shade (1.40, @rt_bg_color) } +style "clearlooks-partialPasteHeaderSep" { + + bg[NORMAL] = mix (0.10, @rt_fg_color, @rt_bg_color) +} style "clearlooks-treeview" { text[ACTIVE] = @rt_text_color @@ -439,6 +446,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc index 142bd6220..c95e651f5 100644 --- a/rtdata/themes/92-Beige-DarkCyan.gtkrc +++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc @@ -317,8 +317,15 @@ style "clearlooks-separator_menu_item" { 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.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 @@ -426,6 +433,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc index 90e0f4974..05e59c87b 100644 --- a/rtdata/themes/Default.gtkrc +++ b/rtdata/themes/Default.gtkrc @@ -278,8 +278,15 @@ style "clearlooks-separator_menu_item" { 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.10, @rt_fg_color, @rt_bg_color) +} style "clearlooks-treeview" { engine "clearlooks" { @@ -379,6 +386,9 @@ widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" widget_class "*.." style "clearlooks-treeview_header" +widget "*.partialPasteHeader.*" style "clearlooks-frame_title" +widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep" + # The window of the tooltip is called "gtk-tooltip" ################################################################## # FIXME: diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index 1af1ba8f5..e28e6c508 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -25,14 +25,22 @@ PartialPasteDlg::PartialPasteDlg () { set_title (M("PARTIALPASTE_DIALOGLABEL")); everything = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EVERYTHING"))); + everything ->set_name("partialPasteHeader"); basic = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_BASICGROUP"))); + basic ->set_name("partialPasteHeader"); detail = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DETAILGROUP"))); + detail ->set_name("partialPasteHeader"); color = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORGROUP"))); + color ->set_name("partialPasteHeader"); lens = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LENSGROUP"))); + lens ->set_name("partialPasteHeader"); composition = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMPOSITIONGROUP"))); + composition ->set_name("partialPasteHeader"); metaicm = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_METAICMGROUP"))); + metaicm ->set_name("partialPasteHeader"); raw = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWGROUP"))); + raw ->set_name("partialPasteHeader"); // options in basic: wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE"))); @@ -104,6 +112,7 @@ PartialPasteDlg::PartialPasteDlg () { vboxes[i] = Gtk::manage (new Gtk::VBox ()); vboxes[i]->set_border_width (6); hseps[i] = Gtk::manage (new Gtk::HSeparator ()); + hseps[i]->set_name("partialPasteHeaderSep"); } vboxes[0]->pack_start (*basic, Gtk::PACK_SHRINK, 2);