From d6c45f90b5fb56398f5ddfa282597f049ef1c05a Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 18 May 2018 12:43:15 +0200 Subject: [PATCH] Reset tooltips improved Now the "reset" tooltips state what happens on click vs ctrl+click. Commit includes required fixes to other modules which used incorrect reset language keys. Fixes #4563 --- rtdata/languages/default | 17 ++++++++--------- rtgui/adjuster.cc | 2 +- rtgui/blackwhite.cc | 4 +--- rtgui/colortoning.cc | 6 +++--- rtgui/thresholdadjuster.cc | 2 +- rtgui/wavelet.cc | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 1c6b2a593..e0f03e53b 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -7,7 +7,7 @@ ABOUT_TAB_CREDITS;Credits ABOUT_TAB_LICENSE;License ABOUT_TAB_RELEASENOTES;Release Notes ABOUT_TAB_SPLASH;Splash -ADJUSTER_RESET_TO_DEFAULT;Reset to default +ADJUSTER_RESET_TO_DEFAULT;Click - reset to default value.\nCtrl+click - reset to initial value. BATCHQUEUE_AUTOSTART;Auto-start BATCHQUEUE_AUTOSTARTHINT;Start processing automatically when a new job arrives. BATCHQUEUE_DESTFILENAME;Path and file name @@ -231,6 +231,7 @@ GENERAL_NONE;None GENERAL_OK;OK GENERAL_OPEN;Open GENERAL_PORTRAIT;Portrait +GENERAL_RESET;Reset GENERAL_SAVE;Save GENERAL_SLIDER;Slider GENERAL_UNCHANGED;(Unchanged) @@ -481,9 +482,9 @@ HISTORY_MSG_231;B&W - 'Before' curve HISTORY_MSG_232;B&W - 'Before' curve type HISTORY_MSG_233;B&W - 'After' curve HISTORY_MSG_234;B&W - 'After' curve type -HISTORY_MSG_235;B&W - Auto channel mixer +HISTORY_MSG_235;B&W - CM - Auto HISTORY_MSG_236;--unused-- -HISTORY_MSG_237;B&W - Mixer +HISTORY_MSG_237;B&W - CM HISTORY_MSG_238;GF - Feather HISTORY_MSG_239;GF - Strength HISTORY_MSG_240;GF - Center @@ -519,7 +520,7 @@ HISTORY_MSG_269;CT - High - Red HISTORY_MSG_270;CT - High - Green HISTORY_MSG_271;CT - High - Blue HISTORY_MSG_272;CT - Balance -HISTORY_MSG_273;CT - Reset +HISTORY_MSG_273;CT - Color Balance SMH HISTORY_MSG_274;CT - Sat. Shadows HISTORY_MSG_275;CT - Sat. Highlights HISTORY_MSG_276;CT - Opacity @@ -638,7 +639,7 @@ HISTORY_MSG_388;W - Residual - CB green mid HISTORY_MSG_389;W - Residual - CB blue mid HISTORY_MSG_390;W - Residual - CB green low HISTORY_MSG_391;W - Residual - CB blue low -HISTORY_MSG_392;W - Residual - CB Reset +HISTORY_MSG_392;W - Residual - Color Balance HISTORY_MSG_393;DCP - Look table HISTORY_MSG_394;DCP - Baseline exposure HISTORY_MSG_395;DCP - Base table @@ -1255,7 +1256,6 @@ TP_BWMIX_ALGO_LI;Linear TP_BWMIX_ALGO_SP;Special effects TP_BWMIX_ALGO_TOOLTIP;Linear: will produce a normal linear response.\nSpecial effects: will produce special effects by mixing channels non-linearly. TP_BWMIX_AUTOCH;Auto -TP_BWMIX_AUTOCH_TIP;Calculate values optimizing Channel Mixer. TP_BWMIX_CC_ENABLED;Adjust complementary color TP_BWMIX_CC_TOOLTIP;Enable to allow automatic adjustment of complementary colors in ROYGCBPM mode. TP_BWMIX_CHANNEL;Luminance equalizer @@ -1282,9 +1282,8 @@ TP_BWMIX_MET;Method TP_BWMIX_MET_CHANMIX;Channel Mixer TP_BWMIX_MET_DESAT;Desaturation TP_BWMIX_MET_LUMEQUAL;Luminance Equalizer -TP_BWMIX_MIXC;Mixer -TP_BWMIX_NEUTRAL;Reset mixer -TP_BWMIX_NEUTRAL_TIP;Reset all values (Color Filter, Channel Mixer) to default. +TP_BWMIX_MIXC;Channel Mixer +TP_BWMIX_NEUTRAL;Reset TP_BWMIX_RGBLABEL;R: %1%% G: %2%% B: %3%% Total: %4%% TP_BWMIX_RGBLABEL_HINT;Final RGB factors that take care of all the mixer options.\n"Total" displays the sum of the RGB values:\n- always 100% in relative mode\n- higher (lighter) or lower (darker) than 100% in absolute mode. TP_BWMIX_RGB_TOOLTIP;Mix the RGB channels. Use presets for guidance.\nPay attention to negative values that may cause artifacts or erratic behavior. diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index a4f57499d..b66f617a4 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -82,7 +82,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); setExpandAlignProperties(reset, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); reset->set_relief (Gtk::RELIEF_NONE); - reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); + reset->set_tooltip_markup (M("ADJUSTER_RESET_TO_DEFAULT")); reset->get_style_context()->add_class(GTK_STYLE_CLASS_FLAT); reset->set_can_focus(false); diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc index 0788a465d..6970a2f31 100644 --- a/rtgui/blackwhite.cc +++ b/rtgui/blackwhite.cc @@ -90,11 +90,9 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB autoHBox = Gtk::manage (new Gtk::HBox ()); autoch = Gtk::manage (new Gtk::ToggleButton (M("TP_BWMIX_AUTOCH"))); - autoch->set_tooltip_markup (M("TP_BWMIX_AUTOCH_TIP")); autoconn = autoch->signal_toggled().connect( sigc::mem_fun(*this, &BlackWhite::autoch_toggled) ); neutral = Gtk::manage (new Gtk::Button (M("TP_BWMIX_NEUTRAL"))); - neutral->set_tooltip_text (M("TP_BWMIX_NEUTRAL_TIP")); neutralconn = neutral->signal_pressed().connect( sigc::mem_fun(*this, &BlackWhite::neutral_pressed) ); neutral->show(); @@ -887,7 +885,7 @@ void BlackWhite::neutral_pressed () updateRGBLabel(); if(listener) { - listener->panelChanged (EvNeutralBW, M("ADJUSTER_RESET_TO_DEFAULT")); + listener->panelChanged (EvNeutralBW, M("GENERAL_RESET")); } } diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc index 3d3d21d66..a7f063460 100644 --- a/rtgui/colortoning.cc +++ b/rtgui/colortoning.cc @@ -327,7 +327,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR labgridReset->add (*Gtk::manage(new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); setExpandAlignProperties(labgridReset, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START); labgridReset->set_relief(Gtk::RELIEF_NONE); - labgridReset->set_tooltip_text(M("ADJUSTER_RESET_TO_DEFAULT")); + labgridReset->set_tooltip_markup(M("ADJUSTER_RESET_TO_DEFAULT")); labgridReset->get_style_context()->add_class(GTK_STYLE_CLASS_FLAT); labgridReset->set_can_focus(false); labgridReset->set_size_request(-1, 20); @@ -373,7 +373,7 @@ void ColorToning::neutralCurves_pressed () { enableListener(); if (listener && enabled->get_active() && changed) - listener->panelChanged (EvColorToningNeutralcur, M("ADJUSTER_RESET_TO_DEFAULT")); + listener->panelChanged (EvColorToningNeutralcur, M("GENERAL_RESET")); } */ @@ -395,7 +395,7 @@ void ColorToning::neutral_pressed () enableListener(); if (listener && getEnabled()) { - listener->panelChanged (EvColorToningNeutral, M("ADJUSTER_RESET_TO_DEFAULT")); + listener->panelChanged (EvColorToningNeutral, M("GENERAL_RESET")); } } diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc index 7afd128b5..f9afae0ea 100644 --- a/rtgui/thresholdadjuster.cc +++ b/rtgui/thresholdadjuster.cc @@ -98,7 +98,7 @@ void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb) reset = Gtk::manage (new Gtk::Button ()); reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); reset->set_relief (Gtk::RELIEF_NONE); - reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); + reset->set_tooltip_markup (M("ADJUSTER_RESET_TO_DEFAULT")); hbox->pack_end (*reset, Gtk::PACK_SHRINK, 0); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index d788b5b8b..ca6a28708 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -934,7 +934,7 @@ void Wavelet::neutral_pressed () enableListener(); if (listener && getEnabled()) { - listener->panelChanged (EvWavNeutral, M("ADJUSTER_RESET_TO_DEFAULT")); + listener->panelChanged (EvWavNeutral, M("GENERAL_RESET")); } }