diff --git a/rtdata/languages/default b/rtdata/languages/default index daaaffba8..31f0fdcbd 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1192,12 +1192,6 @@ PREFERENCES_LANGAUTODETECT;Use system language PREFERENCES_LEVAUTDN;Denoising level PREFERENCES_LEVDN;Cell size PREFERENCES_LISS;Auto multi-zone smoothing -PREFERENCES_LOCAL;Local adjustements -PREFERENCES_LOCALAJUST_LABEL;Local adjustements Quality Method -PREFERENCES_LOCALAJUST_STD;Standard -PREFERENCES_LOCALAJUST_ENH;Enhanced -PREFERENCES_LOCALAJUST_ENHDEN;Enhanced + chroma denoise -PREFERENCES_LOCALSHOWDELIMSPOT;Show spot delimiters PREFERENCES_MAX;Maxi (Tile) PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders PREFERENCES_MED;Medium (Tile/2) @@ -1209,11 +1203,6 @@ PREFERENCES_MENUGROUPRANK;Group "Rank" PREFERENCES_MENUOPTIONS;Context Menu Options PREFERENCES_METADATA;Metadata PREFERENCES_MIN;Mini (100x115) -PREFERENCES_MIP;Mip Profiles -PREFERENCES_MIP_LABEL;Mip profiles: -PREFERENCES_MIP_OPT;Mip files in cache -PREFERENCES_MIP_PREV;Next Input file -PREFERENCES_MIP_TOOLTIP;Next input file allow multiple sessions of the same file, but do not allow path with NON ASCII characters.\nMip files in Cache, allow NON ASCII characters in path, allow multi session for the same file. PREFERENCES_MONINTENT;Default rendering intent PREFERENCES_MONITOR;Monitor PREFERENCES_MONPROFILE;Default color profile diff --git a/rtgui/options.cc b/rtgui/options.cc index 4a42c9a0c..cc192db75 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -422,8 +422,6 @@ void Options::setDefaults () histogramFullMode = false; curvebboxpos = 1; prevdemo = PD_Sidecar; - mip = MI_opt; - locaaju = lo_enhde; rgbDenoiseThreadLimit = 0; #if defined( _OPENMP ) && defined( __x86_64__ ) @@ -441,7 +439,6 @@ void Options::setDefaults () UseIconNoText = true; whiteBalanceSpotSize = 8; showFilmStripToolBar = false; - showdelimspot = false; menuGroupRank = true; menuGroupLabel = true; menuGroupFileOperations = true; @@ -1090,14 +1087,6 @@ void Options::readFromFile (Glib::ustring fname) prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar"); } - if (keyFile.has_key ("Performance", "Localajustqual")) { - locaaju = (locaaju_t)keyFile.get_integer ("Performance", "Localajustqual"); - } - - if (keyFile.has_key ("Profiles", "Mipfiles")) { - mip = (mip_t)keyFile.get_integer ("Profiles", "Mipfiles"); - } - if (keyFile.has_key ("Performance", "Daubechies")) { rtSettings.daubech = keyFile.get_boolean ("Performance", "Daubechies"); } @@ -1341,10 +1330,6 @@ void Options::readFromFile (Glib::ustring fname) showFilmStripToolBar = keyFile.get_boolean ("GUI", "ShowFilmStripToolBar"); } - if (keyFile.has_key ("GUI", "Showdelimspot")) { - showdelimspot = keyFile.get_boolean ("GUI", "Showdelimspot"); - } - if (keyFile.has_key ("GUI", "FileBrowserToolbarSingleRow")) { FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow"); } @@ -1890,7 +1875,6 @@ void Options::saveToFile (Glib::ustring fname) keyFile.set_integer ("Performance", "PreviewDemosaicFromSidecar", prevdemo); keyFile.set_boolean ("Performance", "Daubechies", rtSettings.daubech); keyFile.set_boolean ("Performance", "SerializeTiffRead", serializeTiffRead); - keyFile.set_integer ("Performance", "Localajustqual", locaaju); keyFile.set_integer("Performance", "ThumbnailInspectorMode", int(rtSettings.thumbnail_inspector_mode)); @@ -1930,7 +1914,6 @@ void Options::saveToFile (Glib::ustring fname) keyFile.set_integer ("Profiles", "LoadParamsFromLocation", paramsLoadLocation); keyFile.set_string ("Profiles", "CustomProfileBuilderPath", CPBPath); keyFile.set_integer ("Profiles", "CustomProfileBuilderKeys", CPBKeys); - keyFile.set_integer ("Profiles", "Mipfiles", mip); keyFile.set_integer ("GUI", "WindowWidth", windowWidth); keyFile.set_integer ("GUI", "WindowHeight", windowHeight); @@ -1990,7 +1973,6 @@ void Options::saveToFile (Glib::ustring fname) keyFile.set_integer ("GUI", "NavigatorRGBUnit", (int)navRGBUnit); keyFile.set_integer ("GUI", "NavigatorHSVUnit", (int)navHSVUnit); keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar); - keyFile.set_boolean ("GUI", "Showdelimspot", showdelimspot); keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow); keyFile.set_boolean ("GUI", "HideTPVScrollbar", hideTPVScrollbar); keyFile.set_boolean ("GUI", "UseIconNoText", UseIconNoText); diff --git a/rtgui/options.h b/rtgui/options.h index 8ac6a1673..f68cde353 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -68,8 +68,6 @@ enum ThFileType {FT_Invalid = -1, FT_None = 0, FT_Raw = 1, FT_Jpeg = 2, FT_Tiff enum PPLoadLocation {PLL_Cache = 0, PLL_Input = 1}; enum CPBKeyType {CPBKT_TID = 0, CPBKT_NAME = 1, CPBKT_TID_NAME = 2}; enum prevdemo_t {PD_Sidecar = 1, PD_Fast = 0}; -enum mip_t {MI_prev = 0, MI_opt = 1}; -enum locaaju_t {lo_std = 0, lo_enh = 1, lo_enhde = 2}; class Options { @@ -266,7 +264,6 @@ public: int curvebboxpos; // 0=above, 1=right, 2=below, 3=left bool showFilmStripToolBar; - bool showdelimspot; // cropping options int cropPPI; @@ -283,8 +280,6 @@ public: bool filledProfile; // Used as reminder for the ProfilePanel "mode" prevdemo_t prevdemo; // Demosaicing method used for the <100% preview bool serializeTiffRead; - mip_t mip; // MIP - locaaju_t locaaju; bool menuGroupRank; bool menuGroupLabel; diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 2031a41e2..679d2a277 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -548,21 +548,6 @@ Gtk::Widget* Preferences::getProcParamsPanel() fdp->add(*vbdp); mvbpp->pack_start(*fdp, Gtk::PACK_SHRINK, 4); - Gtk::Frame* fmip = Gtk::manage(new Gtk::Frame(M("PREFERENCES_MIP"))); - Gtk::HBox* hbmip = Gtk::manage(new Gtk::HBox(false, 4)); - Gtk::Label* lmip = Gtk::manage(new Gtk::Label(M("PREFERENCES_MIP_LABEL"))); - cmip = Gtk::manage(new Gtk::ComboBoxText()); - cmip->append(M("PREFERENCES_MIP_PREV")); - cmip->append(M("PREFERENCES_MIP_OPT")); - cmip->set_active(1); - cmip->set_tooltip_text(M("PREFERENCES_MIP_TOOLTIP")); - - hbmip->pack_start(*lmip, Gtk::PACK_SHRINK); - hbmip->pack_start(*cmip); - fmip->add(*hbmip); - hbmip->set_border_width(4); - mvbpp->pack_start(*fmip, Gtk::PACK_SHRINK, 4); - // Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) ); // Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ()); // darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); @@ -783,20 +768,6 @@ Gtk::Widget* Preferences::getPerformancePanel() // ---> fdenoise->add(*vbdenoise); mainContainer->pack_start(*fdenoise, Gtk::PACK_SHRINK, 4); - /* - Gtk::Frame* flocalajust = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_LOCAL"))); - Gtk::HBox* hblocalajust = Gtk::manage (new Gtk::HBox (false, 4)); - Gtk::Label* llocalajust = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LOCALAJUST_LABEL"))); - clocalajust = Gtk::manage (new Gtk::ComboBoxText ()); - clocalajust->append (M ("PREFERENCES_LOCALAJUST_STD")); - clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENH")); - clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENHDEN")); - clocalajust->set_active (2); - hblocalajust->pack_start (*llocalajust, Gtk::PACK_SHRINK); - hblocalajust->pack_start (*clocalajust); - flocalajust->add (*hblocalajust); - mainContainer->pack_start (*flocalajust, Gtk::PACK_SHRINK, 4); - */ return mainContainer; } @@ -1078,23 +1049,6 @@ Gtk::Widget* Preferences::getGeneralPanel() // --------------------------------------------- - - Gtk::Frame* flocal = Gtk::manage(new Gtk::Frame(M("PREFERENCES_LOCAL"))); - setExpandAlignProperties(flocal, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); - Gtk::Grid* localGrid = Gtk::manage(new Gtk::Grid()); - localGrid->set_column_spacing(4); - localGrid->set_row_spacing(4); - setExpandAlignProperties(localGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE); - - ckbShowdelimspot = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_LOCALSHOWDELIMSPOT"))); - setExpandAlignProperties(ckbShowdelimspot, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START); - localGrid->attach_next_to(*ckbShowdelimspot, Gtk::POS_LEFT, 3, 1); - - flocal->add(*localGrid); - mvbsd->attach_next_to(*flocal, *flang, Gtk::POS_BOTTOM, 2, 1); - - //-------------------------------------------------- - Gtk::Frame* ftheme = Gtk::manage(new Gtk::Frame(M("PREFERENCES_THEME"))); setExpandAlignProperties(ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); Gtk::Grid* themeGrid = Gtk::manage(new Gtk::Grid()); @@ -1164,7 +1118,7 @@ Gtk::Widget* Preferences::getGeneralPanel() themeGrid->attach_next_to(*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1); ftheme->add(*themeGrid); - mvbsd->attach_next_to(*ftheme, *flocal, Gtk::POS_BOTTOM, 2, 1); + mvbsd->attach_next_to(*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1); // --------------------------------------------- @@ -1798,8 +1752,6 @@ void Preferences::storePreferences() moptions.prevdemo = (prevdemo_t)cprevdemo->get_active_row_number(); moptions.serializeTiffRead = ctiffserialize->get_active(); - moptions.mip = (mip_t)cmip->get_active_row_number(); -// moptions.locaaju = (locaaju_t)clocalajust->get_active_row_number (); if (sdcurrent->get_active()) { moptions.startupDir = STARTUPDIR_CURRENT; @@ -1856,7 +1808,6 @@ void Preferences::storePreferences() moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2; moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active(); moptions.showFilmStripToolBar = ckbShowFilmStripToolBar->get_active(); - moptions.showdelimspot = ckbShowdelimspot->get_active(); moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active(); moptions.overwriteOutputFile = chOverwriteOutputFile->get_active(); moptions.UseIconNoText = ckbUseIconNoText->get_active(); @@ -1960,8 +1911,6 @@ void Preferences::fillPreferences() dnwavlev->set_active(moptions.rtSettings.nrwavlevel); cprevdemo->set_active(moptions.prevdemo); cbdaubech->set_active(moptions.rtSettings.daubech); - cmip->set_active(moptions.mip); -// clocalajust->set_active (moptions.locaaju); // cbAutocielab->set_active (moptions.rtSettings.autocielab); languages->set_active_text(moptions.language); @@ -2079,7 +2028,6 @@ void Preferences::fillPreferences() // ckbHistogramWorking->set_active(moptions.histogramWorking==1); ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow); ckbShowFilmStripToolBar->set_active(moptions.showFilmStripToolBar); - ckbShowdelimspot->set_active(moptions.showdelimspot); ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar); ckbUseIconNoText->set_active(moptions.UseIconNoText); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 4c48720ac..c129088f4 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -139,8 +139,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::ComboBoxText* cprevdemo; Gtk::CheckButton* ctiffserialize; Gtk::ComboBoxText* curveBBoxPosC; - Gtk::ComboBoxText* cmip; - Gtk::ComboBoxText* clocalajust; Gtk::ComboBoxText* theme; Gtk::FontButton* fontButton; @@ -199,7 +197,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::CheckButton* ckbHistogramPositionLeft; Gtk::CheckButton* ckbFileBrowserToolbarSingleRow; Gtk::CheckButton* ckbShowFilmStripToolBar; - Gtk::CheckButton* ckbShowdelimspot; Gtk::CheckButton* ckbHideTPVScrollbar; Gtk::CheckButton* ckbUseIconNoText;