diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 756df1be3..ae89b7ad2 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1321,6 +1321,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index fccf5f847..fe59eb47c 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1429,6 +1429,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 09439c2e4..d349a7b5f 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -981,6 +981,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 67c2cf0e3..fcf7120fa 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -39,6 +39,7 @@ #38 2017-04-26 updated by mkyral #39 2017-07-21 updated by mkyral #40 2017-12-13 updated by mkyral + ABOUT_TAB_BUILD;Verze ABOUT_TAB_CREDITS;Zásluhy ABOUT_TAB_LICENSE;Licence @@ -2213,3 +2214,9 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Přizpůsobit obrazovce\nZkratka: Alt-ff ZOOMPANEL_ZOOMIN;Přiblížit\nZkratka: + ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - + +!!!!!!!!!!!!!!!!!!!!!!!!! +! Untranslated keys follow; remove the ! prefix after an entry is translated. +!!!!!!!!!!!!!!!!!!!!!!!!! + +!HISTORY_MSG_493;L*a*b* Adjustments diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 079d4d6d8..f4056c7c0 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index f011096b8..f0bc6e208 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -768,6 +768,9 @@ HISTORY_MSG_487;(Objektivkorrektur)\nProfil - Objektiv HISTORY_MSG_488;(HDR-Dynamikkompression) HISTORY_MSG_489;(HDR-Dynamikkompression)\nSchwelle HISTORY_MSG_490;(HDR-Dynamikkompression)\nIntensität +HISTORY_MSG_491;(Weißabgleich) +HISTORY_MSG_492;(RGB-Kurven) +HISTORY_MSG_493;(L*a*b*) HISTORY_NEWSNAPSHOT;Hinzufügen HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s HISTORY_SNAPSHOT;Schnappschuss @@ -1835,6 +1838,7 @@ TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Weicher Übergang zwischen Bereichen mit und ohn TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red +TP_RAW_RCD;RCD TP_RAW_SENSOR_BAYER_LABEL;Sensor mit Bayer-Matrix TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Mit “3-Pass“ erzielt man die besten Ergebnisse\n(empfohlen bei Bildern mit niedrigen ISO-Werten).\n\nBei hohen ISO-Werten unterscheidet sich “1-Pass“\nkaum gegenüber “3-Pass“, ist aber deutlich schneller. TP_RAW_SENSOR_XTRANS_LABEL;Sensor mit X-Trans-Matrix @@ -2221,10 +2225,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -HISTORY_MSG_491;(Weißabgleich) -HISTORY_MSG_492;(RGB-Kurven) -TP_RAW_RCD;RCD diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index ac956b114..cc712c985 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -807,6 +807,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT;Add !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index f251950ee..be0978784 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -725,6 +725,7 @@ !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT;Add !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index f27d211db..e0e3aa04c 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1713,6 +1713,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 57cdc631a..2bfe69e27 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 293ddd6be..0f8168645 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -2180,4 +2180,5 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !TP_RAW_RCD;RCD diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index 57cd9d0b3..25b28c449 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -976,6 +976,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index ed89ba392..71e9d7cf1 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index f532f3270..e17ded5f7 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1587,6 +1587,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 33b81ce8f..71a94eef0 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -1964,6 +1964,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index cbfa1d6ae..8e8228fe2 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index da38b0c4c..b90aa9808 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1250,6 +1250,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 6aaa8ce28..7f60d7b92 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2158,6 +2158,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters !LENSPROFILE_CORRECTION_LCPFILE;LCP File !LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 6a483966c..96fe6e432 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -976,6 +976,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 7af8c1404..c71334d72 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1670,6 +1670,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 4064a96a2..130353c45 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1670,6 +1670,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 894e5405e..ea4428d07 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 150ca91e3..438e9fdcd 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1530,6 +1530,7 @@ ZOOMPANEL_ZOOMOUT;Удалить - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index bdc693b54..c44c74985 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1563,6 +1563,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 58bcc871d..56205ec68 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1563,6 +1563,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index c42c22637..04f7a7f6b 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1039,6 +1039,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 1f14fad7c..9c04cd129 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -978,6 +978,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index 989207c05..543e3cb8e 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1957,6 +1957,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. !IPTCPANEL_COPYRIGHT;Copyright notice diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index ac3fa70a0..791055d29 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -977,6 +977,7 @@ TP_WBALANCE_TEMPERATURE;Isı !HISTORY_MSG_490;HDR TM - Amount !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves +!HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider. !IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image. diff --git a/rtgui/options.cc b/rtgui/options.cc index d1b91c3ac..031678ddd 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -1366,10 +1366,14 @@ void Options::readFromFile (Glib::ustring fname) FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow"); } +#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3) + // Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413 + hideTPVScrollbar = false; +#else if (keyFile.has_key ("GUI", "HideTPVScrollbar")) { hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar"); } - +#endif if (keyFile.has_key ("GUI", "UseIconNoText")) { UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText"); } diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 09547a503..e0a5747d9 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -205,8 +205,8 @@ Gtk::Widget* Preferences::getBatchProcPanel () mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_TM_FATTAL_LABEL")); - appendBehavList (mi, M ("TP_TM_FATTAL_ALPHA"), ADDSET_FATTAL_ALPHA, false); - appendBehavList (mi, M ("TP_TM_FATTAL_BETA"), ADDSET_FATTAL_BETA, false); + appendBehavList (mi, M ("TP_TM_FATTAL_THRESHOLD"), ADDSET_FATTAL_ALPHA, false); + appendBehavList (mi, M ("TP_TM_FATTAL_AMOUNT"), ADDSET_FATTAL_BETA, false); mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_RETINEX_LABEL")); @@ -1011,6 +1011,11 @@ Gtk::Widget* Preferences::getGeneralPanel () setExpandAlignProperties (hb4label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); ckbHideTPVScrollbar = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_VSCROLLBAR")) ); setExpandAlignProperties (ckbHideTPVScrollbar, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); +#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3) + // Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413 + ckbHideTPVScrollbar->set_active(false); + ckbHideTPVScrollbar->set_sensitive(false); +#endif ckbUseIconNoText = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_USEICONORTEXT")) ); setExpandAlignProperties (ckbUseIconNoText, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);