diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 683810a50..2adfcaf3a 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -665,14 +665,11 @@ PREFERENCES_BLINKCLIPPED;Faire clignoter les zones hors domaine PREFERENCES_CACHECLEARALL;Tout nettoyer PREFERENCES_CACHECLEARPROFILES;Nettoyer les profils PREFERENCES_CACHECLEARTHUMBS;Nettoyer les vignettes -PREFERENCES_CACHEFORMAT1;Propriétaire (plus rapide et de meilleure qualité) -PREFERENCES_CACHEFORMAT2;JPEG (moins volumineux sur le disque) PREFERENCES_CACHEMAXENTRIES;Nombre maximal d'éléments dans le Cache PREFERENCES_CACHEOPTS;Options du Cache PREFERENCES_CACHESTRAT1;Optimiser la vitesse au détriment de la consommation mémoire PREFERENCES_CACHESTRAT2;Optimiser la consommation mémoire au détriment de la vitesse PREFERENCES_CACHESTRAT;Stratégie de gestion du Cache -PREFERENCES_CACHETHUMBFORM;Format des vignettes du Cache PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes PREFERENCES_CLIPPINGIND;Indication du dépassement de plage dynamique PREFERENCES_CMETRICINTENT;Intention Colorimétrique diff --git a/rtdata/languages/default b/rtdata/languages/default index 91dcba1fb..0f04c4c9f 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -669,14 +669,11 @@ PREFERENCES_BLINKCLIPPED;Blink clipped areas PREFERENCES_CACHECLEARALL;Clear All PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails -PREFERENCES_CACHEFORMAT1;Proprietary (faster and better quality) -PREFERENCES_CACHEFORMAT2;JPEG (smaller disk footprint) PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries PREFERENCES_CACHEOPTS;Cache Options PREFERENCES_CACHESTRAT1;Prefer Speed to Low Memory Consumption PREFERENCES_CACHESTRAT2;Prefer Low Memory Consumption to Speed PREFERENCES_CACHESTRAT;Cache Strategy -PREFERENCES_CACHETHUMBFORM;Cache thumbnail format PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height PREFERENCES_CIEART;CIECAM02 optimization PREFERENCES_CIEART_LABEL;Use float precision instead of double diff --git a/rtgui/options.cc b/rtgui/options.cc index 4f924a2a9..303f8c82b 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -265,7 +265,6 @@ void Options::setDefaults () { useSystemTheme = false; maxThumbnailHeight = 400; maxCacheEntries = 20000; - thumbnailFormat = FT_Custom; // was FT_Custom16 thumbInterp = 1; autoSuffix = false; saveMethodNum = 0; // 0->immediate, 1->putToQueuHead, 2->putToQueueTail @@ -572,7 +571,6 @@ if (keyFile.has_group ("File Browser")) { if (keyFile.has_key ("File Browser", "BrowserShowsHidden")) fbShowHidden = keyFile.get_boolean ("File Browser", "BrowserShowsHidden"); if (keyFile.has_key ("File Browser", "MaxPreviewHeight")) maxThumbnailHeight = keyFile.get_integer ("File Browser", "MaxPreviewHeight"); if (keyFile.has_key ("File Browser", "MaxCacheEntries")) maxCacheEntries = keyFile.get_integer ("File Browser", "MaxCacheEntries"); - if (keyFile.has_key ("File Browser", "ThumbnailFormat")) thumbnailFormat = (ThFileType)keyFile.get_integer ("File Browser", "ThumbnailFormat"); if (keyFile.has_key ("File Browser", "ParseExtensions")) parseExtensions = keyFile.get_string_list ("File Browser", "ParseExtensions"); if (keyFile.has_key ("File Browser", "ParseExtensionsEnabled")) parseExtensionsEnabled = keyFile.get_integer_list ("File Browser", "ParseExtensionsEnabled"); if (keyFile.has_key ("File Browser", "ThumbnailArrangement")) fbArrangement = keyFile.get_integer ("File Browser", "ThumbnailArrangement"); @@ -787,7 +785,6 @@ int Options::saveToFile (Glib::ustring fname) { keyFile.set_integer ("File Browser", "ThumbnailSizeTab", thumbSizeTab); keyFile.set_integer ("File Browser", "MaxPreviewHeight", maxThumbnailHeight); keyFile.set_integer ("File Browser", "MaxCacheEntries", maxCacheEntries); - keyFile.set_integer ("File Browser", "ThumbnailFormat", (int)thumbnailFormat); Glib::ArrayHandle pext = parseExtensions; keyFile.set_string_list ("File Browser", "ParseExtensions", pext); Glib::ArrayHandle pextena = parseExtensionsEnabled; diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index a331bf4a6..24a12c162 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -889,18 +889,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel () { frc->add (*vbc); vbc->set_border_width (4); - Gtk::Label* cflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBFORM")+":") ); - cflab->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP); - cformat = Gtk::manage( new Gtk::ComboBoxText () ); - cformat->set_size_request(50, -1); - cformat->append_text (M("PREFERENCES_CACHEFORMAT1")); - cformat->append_text (M("PREFERENCES_CACHEFORMAT2")); - cformat->append_text (M("PREFERENCES_CACHEFORMAT1")+", 16 bit"); - cformat->signal_changed().connect( sigc::mem_fun(*this, &Preferences::cacheFormatComboChanged) ); - cacheFormatComboChanged(); // update the tooltip - vbc->pack_start (*cflab, Gtk::PACK_SHRINK, 2); - vbc->pack_start (*cformat); - Gtk::HBox* hb3 = Gtk::manage( new Gtk::HBox () ); Gtk::Label* chlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBHEIGHT")+":") ); maxThumbSize = Gtk::manage( new Gtk::SpinButton () ); @@ -1111,13 +1099,6 @@ void Preferences::storePreferences () { moptions.parseExtensionsEnabled.push_back (c[i][extensionColumns.enabled]); } - if (cformat->get_active_row_number() == 0) - moptions.thumbnailFormat = FT_Custom; - else if (cformat->get_active_row_number() == 1) - moptions.thumbnailFormat = FT_Jpeg; - else if (cformat->get_active_row_number() == 2) - moptions.thumbnailFormat = FT_Custom16; - moptions.maxThumbnailHeight = (int)maxThumbSize->get_value (); moptions.maxCacheEntries = (int)maxCacheEntries->get_value (); moptions.overlayedFileNames = overlayedFileNames->get_active (); @@ -1241,13 +1222,6 @@ void Preferences::fillPreferences () { row[extensionColumns.ext] = moptions.parseExtensions[i]; } - if (moptions.thumbnailFormat == FT_Custom) - cformat->set_active (0); - else if (moptions.thumbnailFormat == FT_Jpeg) - cformat->set_active (1); - else if (moptions.thumbnailFormat == FT_Custom16) - cformat->set_active (2); - maxThumbSize->set_value (moptions.maxThumbnailHeight); maxCacheEntries->set_value (moptions.maxCacheEntries); overlayedFileNames->set_active (moptions.overlayedFileNames); @@ -1411,11 +1385,6 @@ void Preferences::layoutComboChanged () { editorLayout->set_tooltip_text(editorLayout->get_active_text()); } -void Preferences::cacheFormatComboChanged () { - cformat->set_tooltip_text(cformat->get_active_text()); -} - - void Preferences::fontChanged () { switchFontTo(fontbutton->get_font_name()); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index d0cd991e7..14512a1bf 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -100,7 +100,6 @@ class Preferences : public Gtk::Dialog { Gtk::FontButton* fontbutton; Gtk::ColorButton* butCropCol; - Gtk::ComboBoxText* cformat; Gtk::SpinButton* maxThumbSize; Gtk::SpinButton* maxCacheEntries; Gtk::Button* clearThumbnails; @@ -162,7 +161,6 @@ class Preferences : public Gtk::Dialog { void forRAWComboChanged (); void forImageComboChanged (); void layoutComboChanged (); - void cacheFormatComboChanged (); void switchThemeTo (Glib::ustring newTheme, bool slimInterface); void switchFontTo (Glib::ustring newFont); bool splashClosed(GdkEventAny* event);