From 80354c41887d45341132d4945888deacb8a9bbae Mon Sep 17 00:00:00 2001 From: DrSlony Date: Wed, 20 May 2015 20:51:35 +0200 Subject: [PATCH] Removed "Preferences > General > Show processing profile selector". Issue 2571 --- rtdata/languages/Catala | 1 - rtdata/languages/Chinese (Simplified) | 1 - rtdata/languages/Chinese (Traditional) | 1 - rtdata/languages/Czech | 1 - rtdata/languages/Dansk | 1 - rtdata/languages/Deutsch | 1 - rtdata/languages/English (UK) | 1 - rtdata/languages/English (US) | 1 - rtdata/languages/Espanol | 1 - rtdata/languages/Euskara | 1 - rtdata/languages/Francais | 1 - rtdata/languages/Greek | 1 - rtdata/languages/Hebrew | 1 - rtdata/languages/Italiano | 1 - rtdata/languages/Japanese | 1 - rtdata/languages/Latvian | 1 - rtdata/languages/Magyar | 1 - rtdata/languages/Nederlands | 1 - rtdata/languages/Norsk BM | 1 - rtdata/languages/Polish | 1 - rtdata/languages/Polish (Latin Characters) | 1 - rtdata/languages/Portugues (Brasil) | 1 - rtdata/languages/Russian | 1 - rtdata/languages/Serbian (Cyrilic Characters) | 1 - rtdata/languages/Serbian (Latin Characters) | 1 - rtdata/languages/Slovak | 1 - rtdata/languages/Suomi | 1 - rtdata/languages/Swedish | 1 - rtdata/languages/Turkish | 1 - rtdata/languages/default | 1 - rtgui/editorpanel.cc | 17 ++--------------- rtgui/editorpanel.h | 1 - rtgui/options.cc | 5 +---- rtgui/preferences.cc | 12 ------------ rtgui/preferences.h | 3 +-- rtgui/rtwindow.cc | 9 --------- rtgui/rtwindow.h | 1 - 37 files changed, 4 insertions(+), 74 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 35ed2c5c8..986d86321 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -619,7 +619,6 @@ PREFERENCES_SET;Fixa PREFERENCES_SHOWBASICEXIF;Mostra principals dades Exif PREFERENCES_SHOWDATETIME;Indica data i hora PREFERENCES_SHOWEXPOSURECOMPENSATION;Mostra compensació d'exposició -PREFERENCES_SHOWPROFILESELECTOR;Mostra selector de perfils de processat PREFERENCES_SHTHRESHOLD;Llindar pèrdues en foscos PREFERENCES_SINGLETABVERTAB;Mode simple treball, vistes verticals PREFERENCES_SINGLETAB;Mode simple treball diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 1b2cb35af..c393bce17 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1282,7 +1282,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index d5b9206c2..212f3d19a 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1090,7 +1090,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index c0a8b1498..d7ba8410a 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -942,7 +942,6 @@ PREFERENCES_SHOWBASICEXIF;Zobrazovat základní Exif informace PREFERENCES_SHOWDATETIME;Zobrazovat datum a čas PREFERENCES_SHOWEXPOSURECOMPENSATION;Přidat kompenzaci expozice PREFERENCES_SHOWFILMSTRIPTOOLBAR;Zobrazit lištu s filmovým pásem -PREFERENCES_SHOWPROFILESELECTOR;Zobrazit výběr profilu zpracování PREFERENCES_SHTHRESHOLD;Práh oříznutých stínů PREFERENCES_SIMPLAUT;Režim nástrojů PREFERENCES_SINGLETABVERTAB;Mód jedné karty editoru, svislé karty diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 2636974af..f12f0243f 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index dc07e82d3..0bad2261c 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -736,7 +736,6 @@ PREFERENCES_SET;SETZEN PREFERENCES_SHOWBASICEXIF;Exif-Daten anzeigen PREFERENCES_SHOWDATETIME;Datum und Uhrzeit anzeigen PREFERENCES_SHOWEXPOSURECOMPENSATION;Belichtungskorrektur anfügen -PREFERENCES_SHOWPROFILESELECTOR;Profilauswahl anzeigen PREFERENCES_SHTHRESHOLD;Schwellenwert - zu dunkel PREFERENCES_SINGLETABVERTAB;Ein-Reiter Modus (vertikale Reiter) PREFERENCES_SINGLETAB;Ein-Reiter Modus diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 5f67950e3..793597307 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -1007,7 +1007,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !PREFERENCES_SHOWDATETIME;Show date and time !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index b4a93cc1a..7be0e7172 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -949,7 +949,6 @@ !PREFERENCES_SHOWDATETIME;Show date and time !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index f3d8658d6..3ab7a9b5c 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -883,7 +883,6 @@ PREFERENCES_SET;Establecer PREFERENCES_SHOWBASICEXIF;Mostrar datos Exif básicos PREFERENCES_SHOWDATETIME;Mostrar fecha y hora PREFERENCES_SHOWEXPOSURECOMPENSATION;Mostrar compensación de exposición -PREFERENCES_SHOWPROFILESELECTOR;Mostrar selector de perfiles de procesamiento PREFERENCES_SHTHRESHOLD;Umbral de sombras cortadas PREFERENCES_SINGLETABVERTAB;Modo Editor de pestaña única, pestañas verticales PREFERENCES_SINGLETAB;Modo Editor de pestaña única diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index e581455d5..adea9d357 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 460bf6852..c9a77fc5e 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -820,7 +820,6 @@ PREFERENCES_SET;Remplace PREFERENCES_SHOWBASICEXIF;Voir les infos EXIF basiques PREFERENCES_SHOWDATETIME;Voir la date et l'heure PREFERENCES_SHOWEXPOSURECOMPENSATION;Ajoute la compensation d'exposition -PREFERENCES_SHOWPROFILESELECTOR;Affiche le sélecteur de profils PREFERENCES_SHTHRESHOLD;Seuil pour le dépassement de domaine inférieur PREFERENCES_SINGLETABVERTAB;Éditeur unique, onglets verticaux PREFERENCES_SINGLETAB;Éditeur unique diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index 9595dc4a7..86b8e98f0 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1087,7 +1087,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 7c9b01df9..157f9ca16 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 28ec0b162..4b055c63c 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -784,7 +784,6 @@ PREFERENCES_SET;Imposta PREFERENCES_SHOWBASICEXIF;Mostra dati Exif di base PREFERENCES_SHOWDATETIME;Mostra data e ora PREFERENCES_SHOWEXPOSURECOMPENSATION;Accoda compensazione dell'esposizione -PREFERENCES_SHOWPROFILESELECTOR;Mostra il selettore di profilo di sviluppo PREFERENCES_SHTHRESHOLD;Soglia per le ombre tosate PREFERENCES_SINGLETABVERTAB;Modalità a Scheda Singola, schede verticali PREFERENCES_SINGLETAB;Modalità a Scheda Singola diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 0dc39284b..d00e2edbe 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -968,7 +968,6 @@ PREFERENCES_SHOWBASICEXIF;基本Exif情報を表示 PREFERENCES_SHOWDATETIME;日付表示 PREFERENCES_SHOWEXPOSURECOMPENSATION;露光補正追加 PREFERENCES_SHOWFILMSTRIPTOOLBAR;画像スライドのツールバーを表示する -PREFERENCES_SHOWPROFILESELECTOR;プロファイル・セレクタの表示 PREFERENCES_SHTHRESHOLD;シャドウ・クリッピング領域のしきい値 PREFERENCES_SIMPLAUT;ツールのモード PREFERENCES_SINGLETABVERTAB;シングル編集タブモード, 垂直タブ diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 5935acd2e..a5c95672f 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 0e7a3f01d..20f52d720 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -599,7 +599,6 @@ PREFERENCES_SET;Beállítás PREFERENCES_SHOWBASICEXIF;Fontosabb EXIF információk megjelenítése PREFERENCES_SHOWDATETIME;Felvétel dátumának és idejének megjelenítése PREFERENCES_SHOWEXPOSURECOMPENSATION;Expozíciókompenzáció megjelenítése -PREFERENCES_SHOWPROFILESELECTOR;Profilválasztó megjelenítése PREFERENCES_SHTHRESHOLD;Küszöbérték bebukott árnyékokhoz PREFERENCES_SINGLETABVERTAB;Egyetlen fül mód, függőleges előnézeti képek PREFERENCES_SINGLETAB;Egyetlen szerkesztőfül diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 04080171d..f3c8b63c1 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -920,7 +920,6 @@ PREFERENCES_SHOWBASICEXIF;Toon standaard Exif-info PREFERENCES_SHOWDATETIME;Toon datum en tijd PREFERENCES_SHOWEXPOSURECOMPENSATION;Toon belichtingscompensatie PREFERENCES_SHOWFILMSTRIPTOOLBAR;Toon filmstrip werkbalk -PREFERENCES_SHOWPROFILESELECTOR;Toon profielkiezer PREFERENCES_SHTHRESHOLD;Grenswaarde onderbelichting PREFERENCES_SIMPLAUT;Gereedschap PREFERENCES_SINGLETABVERTAB;Enkel-tab ('filmstrip') modus met verticale tabs diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 28f002ea2..108b061ba 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1087,7 +1087,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index ff75d4061..4b717cf03 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -838,7 +838,6 @@ PREFERENCES_SET;Ustaw PREFERENCES_SHOWBASICEXIF;Pokaż podstawowe dane Exif PREFERENCES_SHOWDATETIME;Pokaż datę i czas PREFERENCES_SHOWEXPOSURECOMPENSATION;Pokaż korektę ekspozycji -PREFERENCES_SHOWPROFILESELECTOR;Pokaż panel wyboru profilów przetwarzania PREFERENCES_SHTHRESHOLD;Próg dla niedoświetleń PREFERENCES_SINGLETABVERTAB;Tryb pojedynczej zakładki, pionowy układ PREFERENCES_SINGLETAB;Tryb pojedynczej zakładki diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 08edc689a..cb7fd7fd2 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -838,7 +838,6 @@ PREFERENCES_SET;Ustaw PREFERENCES_SHOWBASICEXIF;Pokaz podstawowe dane Exif PREFERENCES_SHOWDATETIME;Pokaz date i czas PREFERENCES_SHOWEXPOSURECOMPENSATION;Pokaz korekte ekspozycji -PREFERENCES_SHOWPROFILESELECTOR;Pokaz panel wyboru profilow przetwarzania PREFERENCES_SHTHRESHOLD;Prog dla niedoswietlen PREFERENCES_SINGLETABVERTAB;Tryb pojedynczej zakladki, pionowy uklad PREFERENCES_SINGLETAB;Tryb pojedynczej zakladki diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 162a549c3..d435c0a10 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;Temperatura !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 502892a3f..ddb4343b4 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -765,7 +765,6 @@ PREFERENCES_SET;Установить PREFERENCES_SHOWBASICEXIF;Показывать основные данные Exif PREFERENCES_SHOWDATETIME;Показывать дату и время PREFERENCES_SHOWEXPOSURECOMPENSATION;Показывать компенсацию выдержки -PREFERENCES_SHOWPROFILESELECTOR;Показать выбор профиля обработки PREFERENCES_SHTHRESHOLD;Порог обрезки теней PREFERENCES_SINGLETABVERTAB;Одна вкладка редактирования, вертикальная панель вкладок PREFERENCES_SINGLETAB;Одна вкладка редактирования diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 77358fedd..6c0fd4ed1 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -545,7 +545,6 @@ PREFERENCES_SELECTTHEME;Тема PREFERENCES_SET;Постави PREFERENCES_SHOWBASICEXIF;Прикажи основне Exif податке PREFERENCES_SHOWDATETIME;Прикажи датум и време -PREFERENCES_SHOWPROFILESELECTOR;Прикажи избор профила PREFERENCES_SHTHRESHOLD;Праг за одсечене тамне делове PREFERENCES_SINGLETABVERTAB;Режим у једном листу, вертикални листови PREFERENCES_SINGLETAB;Режим у једном листу diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 327caaca2..3bbc3cd0e 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -545,7 +545,6 @@ PREFERENCES_SELECTTHEME;Tema PREFERENCES_SET;Postavi PREFERENCES_SHOWBASICEXIF;Prikaži osnovne Exif podatke PREFERENCES_SHOWDATETIME;Prikaži datum i vreme -PREFERENCES_SHOWPROFILESELECTOR;Prikaži izbor profila PREFERENCES_SHTHRESHOLD;Prag za odsečene tamne delove PREFERENCES_SINGLETABVERTAB;Režim u jednom listu, vertikalni listovi PREFERENCES_SINGLETAB;Režim u jednom listu diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 464b3e348..b0113f5b3 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1133,7 +1133,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation. !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SLIMUI;Slim interface diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 29f669b5c..00c6b76b3 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1089,7 +1089,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index e30554808..0fa9389b9 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -755,7 +755,6 @@ PREFERENCES_SET;Ange PREFERENCES_SHOWBASICEXIF;Visa grundlig Exif-information PREFERENCES_SHOWDATETIME;Visa datum och tid PREFERENCES_SHOWEXPOSURECOMPENSATION;Lägg till exponeringskompensation -PREFERENCES_SHOWPROFILESELECTOR;Visa profilväljaren PREFERENCES_SHTHRESHOLD;Tröskelvärde för skuggor PREFERENCES_SINGLETABVERTAB;Enkelfliksläge, vertikala flikar PREFERENCES_SINGLETAB;Öppna en bild åt gången diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 118268650..2efca763e 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1088,7 +1088,6 @@ TP_WBALANCE_TEMPERATURE;Isı !PREFERENCES_SET;Set !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation !PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -!PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector !PREFERENCES_SIMPLAUT;Tool mode !PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs !PREFERENCES_SINGLETAB;Single Editor Tab Mode diff --git a/rtdata/languages/default b/rtdata/languages/default index ceb6715a8..a2f78b21c 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -949,7 +949,6 @@ PREFERENCES_SHOWBASICEXIF;Show basic Exif info PREFERENCES_SHOWDATETIME;Show date and time PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show filmstrip toolbar -PREFERENCES_SHOWPROFILESELECTOR;Show processing profile selector PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows PREFERENCES_SIMPLAUT;Tool mode PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 94062e351..8e435594b 100755 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -170,7 +170,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) vboxright->set_border_width (2); - if (options.showProfileSelector) vboxright->pack_start (*ppframe, Gtk::PACK_SHRINK, 2); + vboxright->pack_start (*ppframe, Gtk::PACK_SHRINK, 2); // main notebook vboxright->pack_start (*tpc->toolPanelNotebook); @@ -435,7 +435,7 @@ void EditorPanel::setAspect () { info->set_active (options.showInfo); } -void EditorPanel::on_realize () { +void EditorPanel::on_realize () { realized = true; Gtk::VBox::on_realize (); // This line is needed to avoid autoexpansion of the window :-/ @@ -1597,19 +1597,6 @@ void EditorPanel::updateTabsUsesIcons (bool useIcons) { tpc->updateTabsUsesIcons (useIcons); } -void EditorPanel::updateProfileSelector (bool showMe) { - if (showMe) { - // add the profile panel - vboxright->pack_start (*ppframe, Gtk::PACK_SHRINK, 2); - vboxright->reorder_child(*ppframe, 0 + (options.histogramPosition==2?1:0)); - ppframe->show_all(); - } - else { - // remove (but don't delete) the profile panel - removeIfThere(vboxright, ppframe, false); - } -} - void EditorPanel::updateHistogramPosition (int oldPosition, int newPosition) { switch (newPosition) { diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index 8d213d0cc..bdeb7b64a 100644 --- a/rtgui/editorpanel.h +++ b/rtgui/editorpanel.h @@ -196,7 +196,6 @@ class EditorPanel : public Gtk::VBox, bool handleShortcutKey (GdkEventKey* event); bool getIsProcessing() const { return isProcessing; } - void updateProfileSelector(bool showMe); void updateTPVScrollbar (bool hide); void updateTabsUsesIcons (bool useIcons); void updateHistogramPosition (int oldPosition, int newPosition); diff --git a/rtgui/options.cc b/rtgui/options.cc index 0f677bf1a..416618229 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -373,9 +373,8 @@ void Options::setDefaults () { #endif filledProfile = false; maxInspectorBuffers = 2; // a rather conservative value for low specced systems... - serializeTiffRead = true; + serializeTiffRead = true; - showProfileSelector = true; FileBrowserToolbarSingleRow = false; hideTPVScrollbar = false; UseIconNoText = true; @@ -851,7 +850,6 @@ if (keyFile.has_group ("GUI")) { if (keyFile.has_key ("GUI", "HistogramBar")) histogramBar = keyFile.get_boolean ("GUI", "HistogramBar"); if (keyFile.has_key ("GUI", "HistogramFullMode")) histogramFullMode = keyFile.get_boolean ("GUI", "HistogramFullMode"); if (keyFile.has_key ("GUI", "ShowFilmStripToolBar")) showFilmStripToolBar = keyFile.get_boolean ("GUI", "ShowFilmStripToolBar"); - if (keyFile.has_key ("GUI", "ShowProfileSelector")) showProfileSelector = keyFile.get_boolean ("GUI", "ShowProfileSelector"); if (keyFile.has_key ("GUI", "FileBrowserToolbarSingleRow")) FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow"); if (keyFile.has_key ("GUI", "HideTPVScrollbar")) hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar"); if (keyFile.has_key ("GUI", "UseIconNoText")) UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText"); @@ -1188,7 +1186,6 @@ int Options::saveToFile (Glib::ustring fname) { keyFile.set_boolean ("GUI", "HistogramBar", histogramBar); keyFile.set_boolean ("GUI", "HistogramFullMode", histogramFullMode); keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar); - keyFile.set_boolean ("GUI", "ShowProfileSelector", showProfileSelector); keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow); keyFile.set_boolean ("GUI", "HideTPVScrollbar", hideTPVScrollbar); keyFile.set_boolean ("GUI", "UseIconNoText", UseIconNoText); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 820417404..9820ead15 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -812,11 +812,6 @@ Gtk::Widget* Preferences::getGeneralPanel () { hbworkflow2->pack_start (*ckbHistogramWorking); vbworkflow->pack_start (*hbworkflow2, Gtk::PACK_SHRINK); - ckbShowProfileSelector = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWPROFILESELECTOR")) ); - Gtk::HBox* hbworkflow2d5 = Gtk::manage( new Gtk::HBox () ); - hbworkflow2d5->pack_start (*ckbShowProfileSelector, Gtk::PACK_SHRINK); - vbworkflow->pack_start (*hbworkflow2d5, Gtk::PACK_SHRINK); - Gtk::HBox* hbworkflow3 = Gtk::manage( new Gtk::HBox () ); ckbFileBrowserToolbarSingleRow = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_FILEBROWSERTOOLBARSINGLEROW")) ); ckbShowFilmStripToolBar = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SHOWFILMSTRIPTOOLBAR")) ); @@ -1448,7 +1443,6 @@ void Preferences::storePreferences () { moptions.curvebboxpos = curveBBoxPosC->get_active_row_number(); moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2; - moptions.showProfileSelector = ckbShowProfileSelector->get_active(); moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active(); moptions.showFilmStripToolBar = ckbShowFilmStripToolBar->get_active(); moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active(); @@ -1602,7 +1596,6 @@ void Preferences::fillPreferences () { curveBBoxPosC->set_active(moptions.curvebboxpos); ckbHistogramPositionLeft->set_active(moptions.histogramPosition==1); // ckbHistogramWorking->set_active(moptions.histogramWorking==1); - ckbShowProfileSelector->set_active(moptions.showProfileSelector); ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow); ckbShowFilmStripToolBar->set_active(moptions.showFilmStripToolBar); ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar); @@ -1917,11 +1910,6 @@ void Preferences::workflowUpdate (){ // Update the position of the Histogram parent->updateHistogramPosition(options.histogramPosition, moptions.histogramPosition); } - - if(moptions.showProfileSelector != options.showProfileSelector) { - // Update the position of the Profile selector - parent->updateTPProfileSelector(moptions.showProfileSelector); - } } diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 30d95544f..c7fa8e74b 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -108,7 +108,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener { Gtk::Label* waveletTileSizeLabel; Gtk::ComboBoxText* waveletTileSizeCombo; - Gtk::ComboBoxText* cprevdemo; + Gtk::ComboBoxText* cprevdemo; Gtk::CheckButton* ctiffserialize; Gtk::ComboBoxText* curveBBoxPosC; @@ -167,7 +167,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener { Gtk::CheckButton* ckbHistogramPositionLeft; Gtk::CheckButton* ckbHistogramWorking; - Gtk::CheckButton* ckbShowProfileSelector; Gtk::CheckButton* ckbFileBrowserToolbarSingleRow; Gtk::CheckButton* ckbShowFilmStripToolBar; Gtk::CheckButton* ckbHideTPVScrollbar; diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 6aaa4a690..751189aa0 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -717,15 +717,6 @@ void RTWindow::MoveFileBrowserToEditor() } } -void RTWindow::updateTPProfileSelector (bool showMe) { - epanel->updateProfileSelector (showMe); - - std::map::const_iterator itr; - for(itr = epanels.begin(); itr != epanels.end(); ++itr){ - ((*itr).second)->updateProfileSelector (showMe); - } -} - void RTWindow::updateTPVScrollbar (bool hide) { fpanel->updateTPVScrollbar (hide); epanel->updateTPVScrollbar (hide); diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h index 8d84935ab..cdd2bf290 100644 --- a/rtgui/rtwindow.h +++ b/rtgui/rtwindow.h @@ -98,7 +98,6 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{ void MoveFileBrowserToMain(); void updateTPVScrollbar (bool hide); - void updateTPProfileSelector (bool showMe); void updateHistogramPosition (int oldPosition, int newPosition); void updateTabsUsesIcons (bool useIcons); void updateFBQueryTB (bool singleRow);