diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake index ff0f12482..8ffaf0636 100644 --- a/UpdateInfo.cmake +++ b/UpdateInfo.cmake @@ -91,17 +91,15 @@ if (WIN32) set(ARCHITECTURE_ALLOWED "x86 x64 ia64") # installing in 32 bits mode even on 64 bits OS and architecture set(INSTALL_MODE "") - # set part of the output archive name - set(SYSTEM_NAME "WinXP") elseif (BIT_DEPTH EQUAL 8) set(BUILD_BIT_DEPTH 64) # Restricting the 64 bits builds to 64 bits systems only set(ARCHITECTURE_ALLOWED "x64 ia64") # installing in 64 bits mode for all 64 bits processors, even for itanium architecture set(INSTALL_MODE "x64 ia64") - # set part of the output archive name - set(SYSTEM_NAME "WinVista") endif (BIT_DEPTH EQUAL 4) + # set part of the output archive name + set(SYSTEM_NAME "WinVista") configure_file ("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss") endif (WIN32) diff --git a/rtdata/languages/default b/rtdata/languages/default index 110f0aade..c57d81f52 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1086,8 +1086,10 @@ PREFERENCES_PROFILEHANDLING;Processing Profile Handling PREFERENCES_PROFILELOADPR;Processing profile loading priority PREFERENCES_PROFILEPRCACHE;Profile in cache PREFERENCES_PROFILEPRFILE;Profile next to the input file +PREFERENCES_PROFILESAVELOCATION;Processing profile saving location PREFERENCES_PROFILESAVECACHE;Save processing profile to the cache PREFERENCES_PROFILESAVEINPUT;Save processing profile next to the input file +PREFERENCES_PROFILESAVEBOTH;Save processing profile both to the cache and next to the input file PREFERENCES_PROFILE_NONE;None PREFERENCES_PROPERTY;Property PREFERENCES_PRTINTENT;Rendering intent diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index de5988d9b..0afe612b9 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -566,7 +566,7 @@ std::string ImageMetaData::shutterToString (double shutter) char buffer[256]; - if (shutter > 0.0 && shutter < 0.9) { + if (shutter > 0.0 && shutter <= 0.5) { sprintf (buffer, "1/%0.0f", 1.0 / shutter); } else { sprintf (buffer, "%0.1f", shutter); diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc index b353fd246..1d4d180e3 100644 --- a/rtexif/rtexif.cc +++ b/rtexif/rtexif.cc @@ -976,7 +976,7 @@ Tag::Tag (TagDirectory* p, FILE* f, int base) // There are 2 format pentaxLensDataAttribs int offsetFirst = 4; // LensInfo2 - if ( strstr (model, "*ist") || strstr (model, "GX-1") || strstr (model, "K100D") || strstr (model, "K110D") ) { + if ( strstr (model, "*ist") || strstr (model, "GX-1") || strstr (model, "K200D") || (strstr (model, "K100D") && !strstr (model, "K100D Super")) || strstr (model, "K110D") || strstr (model, "645Z")) { offsetFirst = 3; // LensInfo } else if ( strstr (model, "645D") ) { offsetFirst = 13; // LensInfo3 diff --git a/rtexif/stdattribs.cc b/rtexif/stdattribs.cc index f82bbd832..514dd5215 100644 --- a/rtexif/stdattribs.cc +++ b/rtexif/stdattribs.cc @@ -389,7 +389,7 @@ public: char buffer[32]; double d = pow (2.0, -t->toDouble()); - if (d > 0.0 && d < 0.9) { + if (d > 0.0 && d <= 0.5) { sprintf (buffer, "1/%.0f", 1.0 / d); } else { sprintf (buffer, "%.1f", d); @@ -409,7 +409,7 @@ public: char buffer[32]; double d = t->toDouble(); - if (d > 0.0 && d < 0.9) { + if (d > 0.0 && d <= 0.5) { sprintf (buffer, "1/%.0f", 1.0 / d); } else { sprintf (buffer, "%.1f", d); diff --git a/rtgui/filmsimulation.cc b/rtgui/filmsimulation.cc index 464dcce4d..e21857ec9 100644 --- a/rtgui/filmsimulation.cc +++ b/rtgui/filmsimulation.cc @@ -133,6 +133,7 @@ void FilmSimulation::read( const rtengine::procparams::ProcParams* pp, const Par ? Glib::ustring(Glib::build_filename(options.clutsDir, pp->filmSimulation.clutFilename)) : pp->filmSimulation.clutFilename ); + m_oldClutFilename = m_clutComboBox->getSelectedClut(); } m_strength->setValue(pp->filmSimulation.strength); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 11350faaf..1acb7cfb4 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -486,20 +486,20 @@ Gtk::Widget* Preferences::getProcParamsPanel () mvbpp->pack_start (*cpfrm, Gtk::PACK_SHRINK, 4); Gtk::Frame* fdp = Gtk::manage (new Gtk::Frame (M("PREFERENCES_PROFILEHANDLING"))); - Gtk::VBox* vbdp = Gtk::manage (new Gtk::VBox ()); - saveParamsFile = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_PROFILESAVEINPUT"))); - vbdp->pack_start (*saveParamsFile, Gtk::PACK_SHRINK, 4); - saveParamsCache = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_PROFILESAVECACHE"))); - vbdp->pack_start (*saveParamsCache, Gtk::PACK_SHRINK, 4); + Gtk::Table* vbdp = Gtk::manage (new Gtk::Table (2, 2)); + saveParamsPreference = Gtk::manage (new Gtk::ComboBoxText ()); + saveParamsPreference->append(M("PREFERENCES_PROFILESAVEINPUT")); + saveParamsPreference->append(M("PREFERENCES_PROFILESAVECACHE")); + saveParamsPreference->append(M("PREFERENCES_PROFILESAVEBOTH")); + Gtk::Label *splab = Gtk::manage(new Gtk::Label(M("PREFERENCES_PROFILESAVELOCATION") + ":")); + vbdp->attach(*splab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2); + vbdp->attach(*saveParamsPreference, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M("PREFERENCES_PROFILELOADPR") + ":")); loadParamsPreference = Gtk::manage (new Gtk::ComboBoxText ()); loadParamsPreference->append (M("PREFERENCES_PROFILEPRCACHE")); loadParamsPreference->append (M("PREFERENCES_PROFILEPRFILE")); - Gtk::HBox* hb41 = Gtk::manage (new Gtk::HBox ()); - hb41->pack_start (*lplab, Gtk::PACK_SHRINK, 0); - hb41->pack_start (*loadParamsPreference, Gtk::PACK_EXPAND_WIDGET, 0); - hb41->set_spacing(4); - vbdp->pack_start (*hb41, Gtk::PACK_EXPAND_WIDGET, 4); + vbdp->attach(*lplab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2); + vbdp->attach(*loadParamsPreference, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); fdp->add (*vbdp); mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4); @@ -1729,8 +1729,9 @@ void Preferences::storePreferences () moptions.sameThumbSize = sameThumbSize->get_active(); moptions.internalThumbIfUntouched = ckbInternalThumbIfUntouched->get_active (); - moptions.saveParamsFile = saveParamsFile->get_active (); - moptions.saveParamsCache = saveParamsCache->get_active (); + auto save_where = saveParamsPreference->get_active_row_number(); + moptions.saveParamsFile = save_where == 0 || save_where == 2; + moptions.saveParamsCache = save_where == 1 || save_where == 2; moptions.paramsLoadLocation = (PPLoadLocation)loadParamsPreference->get_active_row_number (); moptions.useBundledProfiles = useBundledProfiles->get_active (); @@ -1949,8 +1950,8 @@ void Preferences::fillPreferences () sameThumbSize->set_active(moptions.sameThumbSize); ckbInternalThumbIfUntouched->set_active(moptions.internalThumbIfUntouched); - saveParamsFile->set_active (moptions.saveParamsFile); - saveParamsCache->set_active (moptions.saveParamsCache); + saveParamsPreference->set_active(moptions.saveParamsFile ? (moptions.saveParamsCache ? 2 : 0) : 1); + loadParamsPreference->set_active (moptions.paramsLoadLocation); useBundledProfiles->set_active (moptions.useBundledProfiles); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 18c8a466b..d392082bb 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -177,8 +177,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::Button* behSetAll; Gtk::CheckButton* chOverwriteOutputFile; - Gtk::CheckButton* saveParamsFile; - Gtk::CheckButton* saveParamsCache; + Gtk::ComboBoxText* saveParamsPreference; Gtk::CheckButton* useBundledProfiles; Gtk::ComboBoxText* loadParamsPreference; Gtk::ComboBoxText* editorLayout; diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index 2e8a904c1..cd33f393d 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -219,7 +219,7 @@ rtengine::procparams::ProcParams* Thumbnail::createProcParamsForUpdate(bool retu const bool create = (!hasProcParams() || force); const Glib::ustring outFName = - (options.paramsLoadLocation == PLL_Input) ? + (options.paramsLoadLocation == PLL_Input && options.saveParamsFile) ? fname + paramFileExtension : getCacheFileName("profiles", paramFileExtension);