diff --git a/rtdata/images/Dark/actions/zoom-100-identifier.png b/rtdata/images/Dark/actions/zoom-100-identifier.png new file mode 100644 index 000000000..45d8f2bef Binary files /dev/null and b/rtdata/images/Dark/actions/zoom-100-identifier.png differ diff --git a/rtdata/images/Light/actions/zoom-100-identifier.png b/rtdata/images/Light/actions/zoom-100-identifier.png new file mode 100644 index 000000000..390fdebf2 Binary files /dev/null and b/rtdata/images/Light/actions/zoom-100-identifier.png differ diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 07eeb0fff..3d63147c9 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -301,7 +301,7 @@ HISTORY_MSG_62;Correction de la distorsion HISTORY_MSG_63;Signet sélectionné HISTORY_MSG_64;Recadrage de la Photo HISTORY_MSG_65;Aberration chromatique -HISTORY_MSG_66;Reconst. HL +HISTORY_MSG_66;Reconst. Hautes Lumières HISTORY_MSG_67;Reconst. HL - Quantité HISTORY_MSG_68;Reconst. HL - Méthode HISTORY_MSG_69;Espace de couleur de travail @@ -1205,6 +1205,7 @@ TP_GAMMA_CURV;Gamma TP_GAMMA_FREE;Manuel TP_GAMMA_OUTPUT;Gamma de sortie TP_GAMMA_SLOP;Pente (linéaire) +TP_GENERAL_11SCALE_TOOLTIP;L'effet de cet outil ou de l'un de ses sous-composant n'est visible qu'avec un aperçu à l'échelle 1:1. TP_GRADIENT_CENTER;Centre TP_GRADIENT_CENTER_X;Centre X TP_GRADIENT_CENTER_X_TOOLTIP;Coord. X du point d'ancrage de la rotation: -100=bord gauche, 0=centre, +100=bord droit diff --git a/rtdata/languages/default b/rtdata/languages/default index 75a62c482..3a6d8a8cc 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -300,9 +300,9 @@ HISTORY_MSG_62;Lens Distortion Correction HISTORY_MSG_63;Snapshot Selected HISTORY_MSG_64;Crop Photo HISTORY_MSG_65;CA correction -HISTORY_MSG_66;Highlight Recovery -HISTORY_MSG_67;Highlight Recovery Amount -HISTORY_MSG_68;Highlight Recovery Method +HISTORY_MSG_66;Highlight Reconstruction +HISTORY_MSG_67;HL Reconstruction - Amount +HISTORY_MSG_68;HL Reconstruction - Method HISTORY_MSG_69;Working Color Space HISTORY_MSG_70;Output Color Space HISTORY_MSG_71;Input Color Space @@ -1213,6 +1213,7 @@ TP_GAMMA_CURV;Gamma TP_GAMMA_FREE;Free gamma TP_GAMMA_OUTPUT;Output Gamma TP_GAMMA_SLOP;Slope (linear) +TP_GENERAL_11SCALE_TOOLTIP;The effect of this tool or some of its sub-component is only visible at 1:1 preview scale. TP_GRADIENT_CENTER;Center TP_GRADIENT_CENTER_X;Center X TP_GRADIENT_CENTER_X_TOOLTIP;Rotation anchor point X: -100=left edge, 0=center, +100=right edge diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc index f58deb2b3..a5f0626e6 100644 --- a/rtdata/themes/09-Gray-Orange.gtkrc +++ b/rtdata/themes/09-Gray-Orange.gtkrc @@ -451,6 +451,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc index 8852e496b..d504a38d9 100644 --- a/rtdata/themes/17-Gray-Red.gtkrc +++ b/rtdata/themes/17-Gray-Red.gtkrc @@ -451,6 +451,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/21-Gray-Gray.gtkrc b/rtdata/themes/21-Gray-Gray.gtkrc index 5c7cef224..03feec79d 100644 --- a/rtdata/themes/21-Gray-Gray.gtkrc +++ b/rtdata/themes/21-Gray-Gray.gtkrc @@ -463,6 +463,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/25-Gray-Gray.gtkrc b/rtdata/themes/25-Gray-Gray.gtkrc index c1e8c7959..3d262d856 100644 --- a/rtdata/themes/25-Gray-Gray.gtkrc +++ b/rtdata/themes/25-Gray-Gray.gtkrc @@ -449,6 +449,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc index 3da71deda..f2973fbd9 100644 --- a/rtdata/themes/25-Gray-Purple.gtkrc +++ b/rtdata/themes/25-Gray-Purple.gtkrc @@ -449,6 +449,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc index 2956da69d..e26b0efaa 100644 --- a/rtdata/themes/25-Gray-Red.gtkrc +++ b/rtdata/themes/25-Gray-Red.gtkrc @@ -449,6 +449,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc index f3095612a..062e8d709 100644 --- a/rtdata/themes/37-Gray-Red-Textured.gtkrc +++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc @@ -75,7 +75,7 @@ style "clearlooks-default" { bg[ACTIVE] = shade (0.7, @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 @@ -107,8 +107,6 @@ style "clearlooks-default" { } } -pixmap_path "themes/gray_textured" - style "wide" { xthickness = 2 ythickness = 2 @@ -206,7 +204,7 @@ style "clearlooks-scrollbar" { { function = BOX detail = "trough" - file = "trough2.png" + file = "gray_textured/trough2.png" border = { 6,6,6,6 } stretch = TRUE orientation = VERTICAL @@ -215,7 +213,7 @@ style "clearlooks-scrollbar" { { function = BOX detail = "trough" - file = "trough2-h.png" + file = "gray_textured/trough2-h.png" border = { 6,6,6,6 } stretch = TRUE orientation = HORIZONTAL @@ -223,8 +221,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = NORMAL - file = "slider-h.png" + state = NORMAL + file = "gray_textured/slider-h.png" border = { 6,6,2,2 } stretch = TRUE orientation = HORIZONTAL @@ -232,8 +230,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = PRELIGHT - file = "slider-h-pre.png" + state = PRELIGHT + file = "gray_textured/slider-h-pre.png" border = { 6,6,2,2 } stretch = TRUE orientation = HORIZONTAL @@ -241,8 +239,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = INSENSITIVE - file = "slider-h-ins.png" + state = INSENSITIVE + file = "gray_textured/slider-h-ins.png" border = { 6,6,2,2 } stretch = TRUE orientation = HORIZONTAL @@ -250,8 +248,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = NORMAL - file = "slider-v.png" + state = NORMAL + file = "gray_textured/slider-v.png" border = { 2, 2, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -259,8 +257,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = PRELIGHT - file = "slider-v-pre.png" + state = PRELIGHT + file = "gray_textured/slider-v-pre.png" border = { 2, 2, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -268,8 +266,8 @@ style "clearlooks-scrollbar" { image { function = SLIDER - state = INSENSITIVE - file = "slider-v-ins.png" + state = INSENSITIVE + file = "gray_textured/slider-v-ins.png" border = { 2,2,6,6 } stretch = TRUE orientation = VERTICAL @@ -278,176 +276,176 @@ style "clearlooks-scrollbar" { { function = STEPPER state = NORMAL - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = UP - overlay_file = "arrow-up.png" + overlay_file = "gray_textured/arrow-up.png" overlay_stretch = FALSE } image { function = STEPPER state = PRELIGHT - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = UP - overlay_file = "arrow-up-pre.png" + overlay_file = "gray_textured/arrow-up-pre.png" overlay_stretch = FALSE } image { function = STEPPER state = ACTIVE - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = UP - overlay_file = "arrow-up.png" + overlay_file = "gray_textured/arrow-up.png" overlay_stretch = FALSE } image { function = STEPPER state = INSENSITIVE - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = UP - overlay_file = "arrow-up-ins.png" + overlay_file = "gray_textured/arrow-up-ins.png" overlay_stretch = FALSE } image { function = STEPPER state = NORMAL - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = DOWN - overlay_file = "arrow-down.png" + overlay_file = "gray_textured/arrow-down.png" overlay_stretch = FALSE } image { function = STEPPER state = PRELIGHT - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = DOWN - overlay_file = "arrow-down-pre.png" + overlay_file = "gray_textured/arrow-down-pre.png" overlay_stretch = FALSE } image { function = STEPPER state = ACTIVE - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = DOWN - overlay_file = "arrow-down.png" + overlay_file = "gray_textured/arrow-down.png" overlay_stretch = FALSE } image { function = STEPPER state = INSENSITIVE - file = "null.png" + file = "gray_textured/null.png" border = { 1,1,4,4 } stretch = TRUE arrow_direction = DOWN - overlay_file = "arrow-down-ins.png" + overlay_file = "gray_textured/arrow-down-ins.png" overlay_stretch = FALSE } image { function = STEPPER state = NORMAL - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = RIGHT - overlay_file = "arrow-right.png" + overlay_file = "gray_textured/arrow-right.png" overlay_stretch = FALSE } image { function = STEPPER state = PRELIGHT - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = RIGHT - overlay_file = "arrow-right-pre.png" + overlay_file = "gray_textured/arrow-right-pre.png" overlay_stretch = FALSE } image { function = STEPPER state = ACTIVE - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = RIGHT - overlay_file = "arrow-right.png" + overlay_file = "gray_textured/arrow-right.png" overlay_stretch = FALSE } image { function = STEPPER state = INSENSITIVE - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = RIGHT - overlay_file = "arrow-right-ins.png" + overlay_file = "gray_textured/arrow-right-ins.png" overlay_stretch = FALSE } image { function = STEPPER state = NORMAL - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = LEFT - overlay_file = "arrow-left.png" + overlay_file = "gray_textured/arrow-left.png" overlay_stretch = FALSE } image { function = STEPPER state = PRELIGHT - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = LEFT - overlay_file = "arrow-left-pre.png" + overlay_file = "gray_textured/arrow-left-pre.png" overlay_stretch = FALSE } image { function = STEPPER state = ACTIVE - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = LEFT - overlay_file = "arrow-left.png" + overlay_file = "gray_textured/arrow-left.png" overlay_stretch = FALSE } image { function = STEPPER state = INSENSITIVE - file = "null.png" + file = "gray_textured/null.png" border = { 4,4,1,1 } stretch = TRUE arrow_direction = LEFT - overlay_file = "arrow-left-ins.png" + overlay_file = "gray_textured/arrow-left-ins.png" overlay_stretch = FALSE } } @@ -473,14 +471,14 @@ style "clearlooks-range" { # image # { # function = FOCUS - # file = "null.png" + # file = "gray_textured/null.png" # stretch = TRUE # } image { function = BOX detail = "trough" - file = "pbtroughh.png" + file = "gray_textured/pbtroughh.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL @@ -489,7 +487,7 @@ style "clearlooks-range" { { function = BOX detail = "trough" - file = "pbtroughv.png" + file = "gray_textured/pbtroughv.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -497,8 +495,8 @@ style "clearlooks-range" { image { function = SLIDER - state = NORMAL - file = "rangeslider.png" + state = NORMAL + file = "gray_textured/rangeslider.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL @@ -506,8 +504,8 @@ style "clearlooks-range" { image { function = SLIDER - state = PRELIGHT - file = "rangeslider-pre.png" + state = PRELIGHT + file = "gray_textured/rangeslider-pre.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL @@ -515,8 +513,8 @@ style "clearlooks-range" { image { function = SLIDER - state = ACTIVE - file = "rangeslider-pre.png" + state = ACTIVE + file = "gray_textured/rangeslider-pre.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL @@ -524,8 +522,8 @@ style "clearlooks-range" { image { function = SLIDER - state = INSENSITIVE - file = "rangeslider-ins.png" + state = INSENSITIVE + file = "gray_textured/rangeslider-ins.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = HORIZONTAL @@ -533,8 +531,8 @@ style "clearlooks-range" { image { function = SLIDER - state = NORMAL - file = "rangeslider.png" + state = NORMAL + file = "gray_textured/rangeslider.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -542,8 +540,8 @@ style "clearlooks-range" { image { function = SLIDER - state = PRELIGHT - file = "rangeslider-pre.png" + state = PRELIGHT + file = "gray_textured/rangeslider-pre.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -551,8 +549,8 @@ style "clearlooks-range" { image { function = SLIDER - state = ACTIVE - file = "rangeslider-pre.png" + state = ACTIVE + file = "gray_textured/rangeslider-pre.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -560,8 +558,8 @@ style "clearlooks-range" { image { function = SLIDER - state = INSENSITIVE - file = "rangeslider-ins.png" + state = INSENSITIVE + file = "gray_textured/rangeslider-ins.png" border = { 6, 6, 6, 6 } stretch = TRUE orientation = VERTICAL @@ -800,6 +798,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc index aa5c37cb5..abaaef6ab 100644 --- a/rtdata/themes/37-Gray-Red.gtkrc +++ b/rtdata/themes/37-Gray-Red.gtkrc @@ -75,7 +75,7 @@ style "clearlooks-default" { bg[ACTIVE] = shade (0.7, @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 @@ -450,6 +450,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc index d6c6d5a70..2db17e4f2 100644 --- a/rtdata/themes/63-Gray-Cyan.gtkrc +++ b/rtdata/themes/63-Gray-Cyan.gtkrc @@ -450,6 +450,7 @@ widget_class "**" style "clearlooks-statusbar" widget_class "**" style "clearlooks-combobox" widget_class "*." style "clearlooks-expanderLabel" +widget_class "*.." style "clearlooks-expanderLabel" widget_class "**" style "clearlooks-menubar" widget_class "**" style "clearlooks-menu" diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc index 6d4faf9f1..83615a2a7 100644 --- a/rtdata/themes/92-Beige-DarkCyan.gtkrc +++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc @@ -438,6 +438,9 @@ widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +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" diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc index 37383a20a..e01fd39d0 100644 --- a/rtdata/themes/Default.gtkrc +++ b/rtdata/themes/Default.gtkrc @@ -391,6 +391,9 @@ widget_class "**" style "clearlooks-statusbar" #widget_class "**" style "clearlooks-comboboxentry" widget_class "**" style "clearlooks-combobox" +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" @@ -423,5 +426,4 @@ widget "*.ThresholdSelector" style "clearlooks-thresholdselector" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" - gtk-icon-theme-name="Light" diff --git a/rtengine/procevents.h b/rtengine/procevents.h index b3a205a14..2f136367b 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -88,7 +88,7 @@ enum ProcEvent { EvCrop=63, EvCACorr=64, EvHREnabled=65, - EvHRAmount=66, + EvHRAmount=66, //obsolete EvHRMethod=67, EvWProfile=68, EvOProfile=69, diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index eee6326e2..d32da9e7c 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -358,7 +358,6 @@ bool MyScrolledWindow::on_scroll_event (GdkEventScroll* event) { MyComboBoxText::MyComboBoxText () { set_size_request(40, -1); - set_border_width(2); } bool MyComboBoxText::on_scroll_event (GdkEventScroll* event) { @@ -374,7 +373,6 @@ bool MyComboBoxText::on_scroll_event (GdkEventScroll* event) { MyComboBox::MyComboBox () { set_size_request(40, -1); - set_border_width(2); } bool MyComboBox::on_scroll_event (GdkEventScroll* event) { diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc index 93f0022e3..6d8a7935b 100644 --- a/rtgui/toolpanel.cc +++ b/rtgui/toolpanel.cc @@ -57,3 +57,21 @@ void FoldableToolPanel::foldThemAll (GdkEventButton* event) { (static_cast(tmp))->foldAllButOne( parentContainer, this); } } + +void FoldableToolPanel::setLabel (Glib::ustring label, bool need100Percent) { + if (!need100Percent) + exp->set_label(Glib::ustring("") + label + Glib::ustring("")); + else { + Gtk::Label *labelWidget = Gtk::manage (new Gtk::Label(Glib::ustring("") + label + Glib::ustring(""))); + labelWidget->set_use_markup(); + RTImage *image = Gtk::manage (new RTImage("zoom-100-identifier.png")); + image->set_tooltip_text(M("TP_GENERAL_11SCALE_TOOLTIP")); + Gtk::HBox *hbox = Gtk::manage (new Gtk::HBox()); + + hbox->set_spacing(4); + hbox->pack_start(*labelWidget, false, false, 0); + hbox->pack_end(*image, false, false, 0); + exp->set_label_widget(*hbox); + exp->set_label_fill(); + } +} diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index 946ca3fc6..cae6cd949 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -87,7 +87,7 @@ class FoldableToolPanel : public ToolPanel { void setParent (Gtk::Box* parent) { parentContainer = parent; } Gtk::Box* getParent () { return parentContainer; } - void setLabel (Glib::ustring label) { exp->set_label(Glib::ustring("") + label + Glib::ustring("")); } + void setLabel (Glib::ustring label, bool need100Percent=false); }; #endif diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 495f056a1..c03ab1b61 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -79,43 +79,43 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { rawcacorrection = Gtk::manage (new RAWCACorr ()); rawexposure = Gtk::manage (new RAWExposure ()); - addPanel (colorPanel, whitebalance, M("TP_WBALANCE_LABEL")); toolPanels.push_back (whitebalance); - addPanel (exposurePanel, toneCurve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (toneCurve); - addPanel (colorPanel, vibrance, M("TP_VIBRANCE_LABEL")); toolPanels.push_back (vibrance); - addPanel (colorPanel, chmixer, M("TP_CHMIXER_LABEL")); toolPanels.push_back (chmixer); - addPanel (colorPanel, blackwhite, M("TP_BWMIX_LABEL")); toolPanels.push_back (blackwhite); - addPanel (exposurePanel, shadowshighlights, M("TP_SHADOWSHLIGHTS_LABEL")); toolPanels.push_back (shadowshighlights); - addPanel (detailsPanel, sharpening, M("TP_SHARPENING_LABEL")); toolPanels.push_back (sharpening); - addPanel (detailsPanel, sharpenEdge, M("TP_SHARPENEDGE_LABEL")); toolPanels.push_back (sharpenEdge); - addPanel (detailsPanel, sharpenMicro, M("TP_SHARPENMICRO_LABEL")); toolPanels.push_back (sharpenMicro); - addPanel (colorPanel, hsvequalizer, M("TP_HSVEQUALIZER_LABEL")); toolPanels.push_back (hsvequalizer); - addPanel (colorPanel, rgbcurves, M("TP_RGBCURVES_LABEL")); toolPanels.push_back (rgbcurves); - addPanel (exposurePanel, edgePreservingDecompositionUI, M("TP_EPD_LABEL")); toolPanels.push_back (edgePreservingDecompositionUI); - addPanel (exposurePanel, pcvignette, M("TP_PCVIGNETTE_LABEL")); toolPanels.push_back (pcvignette); - addPanel (exposurePanel, gradient, M("TP_GRADIENT_LABEL")); toolPanels.push_back (gradient); - addPanel (exposurePanel, lcurve, M("TP_LABCURVE_LABEL")); toolPanels.push_back (lcurve); -// addPanel (exposurePanel, edgePreservingDecompositionUI, M("TP_EPD_LABEL")); toolPanels.push_back (edgePreservingDecompositionUI); - addPanel (exposurePanel, colorappearance, M("TP_COLORAPP_LABEL")); toolPanels.push_back (colorappearance); - addPanel (detailsPanel, impulsedenoise, M("TP_IMPULSEDENOISE_LABEL")); toolPanels.push_back (impulsedenoise); - addPanel (detailsPanel, dirpyrdenoise, M("TP_DIRPYRDENOISE_LABEL")); toolPanels.push_back (dirpyrdenoise); - addPanel (detailsPanel, defringe, M("TP_DEFRINGE_LABEL")); toolPanels.push_back (defringe); - addPanel (detailsPanel, dirpyrequalizer, M("TP_DIRPYREQUALIZER_LABEL")); toolPanels.push_back (dirpyrequalizer); - addPanel (transformPanel, crop, M("TP_CROP_LABEL")); toolPanels.push_back (crop); - addPanel (transformPanel, resize, M("TP_RESIZE_LABEL")); toolPanels.push_back (resize); - addPanel (transformPanel, lensgeom, M("TP_LENSGEOM_LABEL")); toolPanels.push_back (lensgeom); - addPanel (lensgeom->getPackBox(), rotate, M("TP_ROTATE_LABEL")); toolPanels.push_back (rotate); - addPanel (lensgeom->getPackBox(), perspective, M("TP_PERSPECTIVE_LABEL")); toolPanels.push_back (perspective); - addPanel (lensgeom->getPackBox(), lensProf, M("TP_LENSPROFILE_LABEL")); toolPanels.push_back (lensProf); - addPanel (lensgeom->getPackBox(), distortion, M("TP_DISTORTION_LABEL")); toolPanels.push_back (distortion); - addPanel (lensgeom->getPackBox(), cacorrection, M("TP_CACORRECTION_LABEL")); toolPanels.push_back (cacorrection); - addPanel (lensgeom->getPackBox(), vignetting, M("TP_VIGNETTING_LABEL")); toolPanels.push_back (vignetting); - addPanel (colorPanel, icm, M("TP_ICM_LABEL")); toolPanels.push_back (icm); - addPanel (rawPanel, rawprocess, M("TP_RAW_LABEL")); toolPanels.push_back (rawprocess); - addPanel (rawPanel, preprocess, M("TP_PREPROCESS_LABEL")); toolPanels.push_back (preprocess); - addPanel (rawPanel, rawexposure, M("TP_EXPOSCORR_LABEL")); toolPanels.push_back (rawexposure); - addPanel (rawPanel, darkframe, M("TP_DARKFRAME_LABEL")); toolPanels.push_back (darkframe); - addPanel (rawPanel, flatfield, M("TP_FLATFIELD_LABEL")); toolPanels.push_back (flatfield); - addPanel (rawPanel, rawcacorrection, M("TP_CHROMATABERR_LABEL")); toolPanels.push_back (rawcacorrection); + addPanel (colorPanel, whitebalance, M("TP_WBALANCE_LABEL")); toolPanels.push_back (whitebalance); + addPanel (exposurePanel, toneCurve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (toneCurve); + addPanel (colorPanel, vibrance, M("TP_VIBRANCE_LABEL")); toolPanels.push_back (vibrance); + addPanel (colorPanel, chmixer, M("TP_CHMIXER_LABEL")); toolPanels.push_back (chmixer); + addPanel (colorPanel, blackwhite, M("TP_BWMIX_LABEL")); toolPanels.push_back (blackwhite); + addPanel (exposurePanel, shadowshighlights, M("TP_SHADOWSHLIGHTS_LABEL")); toolPanels.push_back (shadowshighlights); + addPanel (detailsPanel, sharpening, M("TP_SHARPENING_LABEL"), true); toolPanels.push_back (sharpening); + addPanel (detailsPanel, sharpenEdge, M("TP_SHARPENEDGE_LABEL"), true); toolPanels.push_back (sharpenEdge); + addPanel (detailsPanel, sharpenMicro, M("TP_SHARPENMICRO_LABEL"), true); toolPanels.push_back (sharpenMicro); + addPanel (colorPanel, hsvequalizer, M("TP_HSVEQUALIZER_LABEL")); toolPanels.push_back (hsvequalizer); + addPanel (colorPanel, rgbcurves, M("TP_RGBCURVES_LABEL")); toolPanels.push_back (rgbcurves); + addPanel (exposurePanel, edgePreservingDecompositionUI, M("TP_EPD_LABEL")); toolPanels.push_back (edgePreservingDecompositionUI); + addPanel (exposurePanel, pcvignette, M("TP_PCVIGNETTE_LABEL")); toolPanels.push_back (pcvignette); + addPanel (exposurePanel, gradient, M("TP_GRADIENT_LABEL")); toolPanels.push_back (gradient); + addPanel (exposurePanel, lcurve, M("TP_LABCURVE_LABEL")); toolPanels.push_back (lcurve); +// addPanel (exposurePanel, edgePreservingDecompositionUI, M("TP_EPD_LABEL")); toolPanels.push_back (edgePreservingDecompositionUI); + addPanel (exposurePanel, colorappearance, M("TP_COLORAPP_LABEL")); toolPanels.push_back (colorappearance); + addPanel (detailsPanel, impulsedenoise, M("TP_IMPULSEDENOISE_LABEL"), true); toolPanels.push_back (impulsedenoise); + addPanel (detailsPanel, dirpyrdenoise, M("TP_DIRPYRDENOISE_LABEL"), true); toolPanels.push_back (dirpyrdenoise); + addPanel (detailsPanel, defringe, M("TP_DEFRINGE_LABEL"), true); toolPanels.push_back (defringe); + addPanel (detailsPanel, dirpyrequalizer, M("TP_DIRPYREQUALIZER_LABEL"), true); toolPanels.push_back (dirpyrequalizer); + addPanel (transformPanel, crop, M("TP_CROP_LABEL")); toolPanels.push_back (crop); + addPanel (transformPanel, resize, M("TP_RESIZE_LABEL")); toolPanels.push_back (resize); + addPanel (transformPanel, lensgeom, M("TP_LENSGEOM_LABEL")); toolPanels.push_back (lensgeom); + addPanel (lensgeom->getPackBox(), rotate, M("TP_ROTATE_LABEL")); toolPanels.push_back (rotate); + addPanel (lensgeom->getPackBox(), perspective, M("TP_PERSPECTIVE_LABEL")); toolPanels.push_back (perspective); + addPanel (lensgeom->getPackBox(), lensProf, M("TP_LENSPROFILE_LABEL")); toolPanels.push_back (lensProf); + addPanel (lensgeom->getPackBox(), distortion, M("TP_DISTORTION_LABEL")); toolPanels.push_back (distortion); + addPanel (lensgeom->getPackBox(), cacorrection, M("TP_CACORRECTION_LABEL")); toolPanels.push_back (cacorrection); + addPanel (lensgeom->getPackBox(), vignetting, M("TP_VIGNETTING_LABEL")); toolPanels.push_back (vignetting); + addPanel (colorPanel, icm, M("TP_ICM_LABEL")); toolPanels.push_back (icm); + addPanel (rawPanel, rawprocess, M("TP_RAW_LABEL"), true); toolPanels.push_back (rawprocess); + addPanel (rawPanel, preprocess, M("TP_PREPROCESS_LABEL"), true); toolPanels.push_back (preprocess); + addPanel (rawPanel, rawexposure, M("TP_EXPOSCORR_LABEL")); toolPanels.push_back (rawexposure); + addPanel (rawPanel, darkframe, M("TP_DARKFRAME_LABEL")); toolPanels.push_back (darkframe); + addPanel (rawPanel, flatfield, M("TP_FLATFIELD_LABEL")); toolPanels.push_back (flatfield); + addPanel (rawPanel, rawcacorrection, M("TP_CHROMATABERR_LABEL")); toolPanels.push_back (rawcacorrection); toolPanels.push_back (coarse); toolPanels.push_back (exifpanel); @@ -202,7 +202,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { toolBar->setToolBarListener(this); } -void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label) { +void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label, bool need100Percent) { if (where->children().size()) { Gtk::HSeparator *hsep = Gtk::manage (new Gtk::HSeparator()); @@ -211,7 +211,7 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, } panel->setParent(where); - panel->setLabel(escapeHtmlChars(label)); + panel->setLabel(escapeHtmlChars(label), need100Percent); expList.push_back (panel->exp); where->pack_start(*panel->exp, false, false); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index dc809dfde..47415a33a 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -171,7 +171,7 @@ class ToolPanelCoordinator : public ToolPanelListener, bool hasChanged; - void addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label); + void addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label, bool need100Percent=false); void foldThemAll (GdkEventButton* event); void updateVScrollbars (bool hide); void updateTabsHeader (bool useIcons); diff --git a/tools/source_icons/scalable/zoom-100-identifier.file b/tools/source_icons/scalable/zoom-100-identifier.file new file mode 100644 index 000000000..b88690fb1 --- /dev/null +++ b/tools/source_icons/scalable/zoom-100-identifier.file @@ -0,0 +1 @@ +zoom-100-identifier.png,w12,actions diff --git a/tools/source_icons/scalable/zoom-100-identifier.svg b/tools/source_icons/scalable/zoom-100-identifier.svg new file mode 100644 index 000000000..d9b8112ff --- /dev/null +++ b/tools/source_icons/scalable/zoom-100-identifier.svg @@ -0,0 +1,665 @@ + + + + + gtk-zoom-100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + gtk-zoom-100 + + http://www.rawtherapee.com/ + 2013-04-10 + + + DrSlony + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +