diff --git a/rtdata/languages/English b/rtdata/languages/English index 38ae9123a..1776f0002 100644 --- a/rtdata/languages/English +++ b/rtdata/languages/English @@ -409,9 +409,6 @@ !PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format !PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height !PREFERENCES_CACORRECTION;Apply CA auto correction -!PREFERENCES_CLEARDLG_LINE1;Clearing cache -!PREFERENCES_CLEARDLG_LINE2;This may take a few seconds. -!PREFERENCES_CLEARDLG_TITLE;Please wait !PREFERENCES_CLIPPINGIND;Clipping indication !PREFERENCES_CMETRICINTENT;Colorimetric Intent !PREFERENCES_DATEFORMAT;Date Format @@ -455,9 +452,9 @@ !PREFERENCES_OUTDIR;Output Directory !PREFERENCES_OUTDIRFOLDER;Save to folder !PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder -!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OUTDIRTEMPLATE;Use Template -!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails !PREFERENCES_PARSEDEXT;Parsed Extensions !PREFERENCES_PARSEDEXTADD;Add Extension @@ -610,15 +607,15 @@ !TP_EXPOSURE_BLACKLEVEL;Black !TP_EXPOSURE_BRIGHTNESS;Brightness !TP_EXPOSURE_CLIP;Clip -!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight rolloff -!TP_EXPOSURE_COMPRSHADOWS;Shadow compression +!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight recovery +!TP_EXPOSURE_COMPRSHADOWS;Shadow recovery !TP_EXPOSURE_CONTRAST;Contrast !TP_EXPOSURE_CURVEEDITOR;Tone Curve !TP_EXPOSURE_EXPCOMP;Exp. Comp. !TP_EXPOSURE_LABEL;Exposure !TP_HLREC_CIELAB;CIELab Blending !TP_HLREC_COLOR;Color Propagation -!TP_HLREC_LABEL;Highlight Recovery +!TP_HLREC_LABEL;Highlight Reconstruction !TP_HLREC_LUMINANCE;Luminance Recovery !TP_HLREC_METHOD;Method: !TP_ICM_FILEDLGFILTERANY;Any files diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 6451f73c8..8d0099ac2 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -412,9 +412,6 @@ TP_HLREC_COLOR;Colour Propagation !PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format !PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height !PREFERENCES_CACORRECTION;Apply CA auto correction -!PREFERENCES_CLEARDLG_LINE1;Clearing cache -!PREFERENCES_CLEARDLG_LINE2;This may take a few seconds. -!PREFERENCES_CLEARDLG_TITLE;Please wait !PREFERENCES_CLIPPINGIND;Clipping indication !PREFERENCES_CMETRICINTENT;Colorimetric Intent !PREFERENCES_DATEFORMAT;Date Format @@ -457,9 +454,9 @@ TP_HLREC_COLOR;Colour Propagation !PREFERENCES_OUTDIR;Output Directory !PREFERENCES_OUTDIRFOLDER;Save to folder !PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder -!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OUTDIRTEMPLATE;Use Template -!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails !PREFERENCES_PARSEDEXT;Parsed Extensions !PREFERENCES_PARSEDEXTADD;Add Extension @@ -607,14 +604,14 @@ TP_HLREC_COLOR;Colour Propagation !TP_EXPOSURE_BLACKLEVEL;Black !TP_EXPOSURE_BRIGHTNESS;Brightness !TP_EXPOSURE_CLIP;Clip -!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight rolloff -!TP_EXPOSURE_COMPRSHADOWS;Shadow compression +!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight recovery +!TP_EXPOSURE_COMPRSHADOWS;Shadow recovery !TP_EXPOSURE_CONTRAST;Contrast !TP_EXPOSURE_CURVEEDITOR;Tone Curve !TP_EXPOSURE_EXPCOMP;Exp. Comp. !TP_EXPOSURE_LABEL;Exposure !TP_HLREC_CIELAB;CIELab Blending -!TP_HLREC_LABEL;Highlight Recovery +!TP_HLREC_LABEL;Highlight Reconstruction !TP_HLREC_LUMINANCE;Luminance Recovery !TP_HLREC_METHOD;Method: !TP_ICM_FILEDLGFILTERANY;Any files diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 6c92ded89..b1307a18e 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -409,9 +409,6 @@ !PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format !PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height !PREFERENCES_CACORRECTION;Apply CA auto correction -!PREFERENCES_CLEARDLG_LINE1;Clearing cache -!PREFERENCES_CLEARDLG_LINE2;This may take a few seconds. -!PREFERENCES_CLEARDLG_TITLE;Please wait !PREFERENCES_CLIPPINGIND;Clipping indication !PREFERENCES_CMETRICINTENT;Colorimetric Intent !PREFERENCES_DATEFORMAT;Date Format @@ -455,9 +452,9 @@ !PREFERENCES_OUTDIR;Output Directory !PREFERENCES_OUTDIRFOLDER;Save to folder !PREFERENCES_OUTDIRFOLDERHINT;Put the saved images to the selected folder -!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OUTDIRTEMPLATE;Use Template -!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n%f, %d1, %d2, ..., %p1, %p2, ...\n\nThese formatting strings refer to the different parts of the photo's pathname.\n\nFor example, if the photo being processed has the following pathname:\n/home/tom/photos/2010-10-31/dsc0042.nef\nthe meaning of the formatting strings are:\n%d4 = home\n%d3 = tom\n%d2 = photos\n%d1 = 2010-10-31\n%f = dsc0042\n%p1 = /home/tom/photos/2010-10-31/\n%p2 = /home/tom/photos/\n%p3 = /home/tom/\n%p4 = /home/\n\nIf you want to save the output image where the original is, write:\n%p1/%f\n\nIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:\n%p1/converted/%f\n\nIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:\n%p2/converted/%d1/%f +!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n%f, %d1, %d2, ..., %p1, %p2, ...nnThese formatting strings refer to the different parts of the photo's pathname.nnFor example, if the photo being processed has the following pathname:n/home/tom/photos/2010-10-31/dsc0042.nefnthe meaning of the formatting strings are:n%d4 = homen%d3 = tomn%d2 = photosn%d1 = 2010-10-31n%f = dsc0042n%p1 = /home/tom/photos/2010-10-31/n%p2 = /home/tom/photos/n%p3 = /home/tom/n%p4 = /home/nnIf you want to save the output image where the original is, write:n%p1/%fnnIf you want to save the output image in a directory named "converted" located in the directory of the opened image, write:n%p1/converted/%fnnIf you want to save the output image in a directory named "/home/tom/photos/converted/2010-10-31", write:n%p2/converted/%d1/%f !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails !PREFERENCES_PARSEDEXT;Parsed Extensions !PREFERENCES_PARSEDEXTADD;Add Extension @@ -610,15 +607,15 @@ !TP_EXPOSURE_BLACKLEVEL;Black !TP_EXPOSURE_BRIGHTNESS;Brightness !TP_EXPOSURE_CLIP;Clip -!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight rolloff -!TP_EXPOSURE_COMPRSHADOWS;Shadow compression +!TP_EXPOSURE_COMPRHIGHLIGHTS;Highlight recovery +!TP_EXPOSURE_COMPRSHADOWS;Shadow recovery !TP_EXPOSURE_CONTRAST;Contrast !TP_EXPOSURE_CURVEEDITOR;Tone Curve !TP_EXPOSURE_EXPCOMP;Exp. Comp. !TP_EXPOSURE_LABEL;Exposure !TP_HLREC_CIELAB;CIELab Blending !TP_HLREC_COLOR;Color Propagation -!TP_HLREC_LABEL;Highlight Recovery +!TP_HLREC_LABEL;Highlight Reconstruction !TP_HLREC_LUMINANCE;Luminance Recovery !TP_HLREC_METHOD;Method: !TP_ICM_FILEDLGFILTERANY;Any files diff --git a/rtdata/languages/default b/rtdata/languages/default index 76e929483..b7d3116fb 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -402,9 +402,6 @@ PREFERENCES_CACHESTRAT;Cache Strategy PREFERENCES_CACHETHUMBFORM;Cache Thumbnail Format PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height PREFERENCES_CACORRECTION;Apply CA auto correction -PREFERENCES_CLEARDLG_LINE1;Clearing cache -PREFERENCES_CLEARDLG_LINE2;This may take a few seconds. -PREFERENCES_CLEARDLG_TITLE;Please wait PREFERENCES_CLIPPINGIND;Clipping indication PREFERENCES_CMETRICINTENT;Colorimetric Intent PREFERENCES_DATEFORMAT;Date Format diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc index 08c74ef94..f44fcb165 100644 --- a/rtgui/cachemanager.cc +++ b/rtgui/cachemanager.cc @@ -227,12 +227,12 @@ void CacheManager::clearAll () { deleteDir ("data"); // re-generate thumbnail images and clear profiles of open thumbnails - string_thumb_map::iterator i; - for (i=openEntries.begin(); i!=openEntries.end(); i++) { - i->second->clearProcParams (CACHEMGR); - i->second->generateThumbnailImage (); - i->second->updateCache (); - } + //string_thumb_map::iterator i; + //for (i=openEntries.begin(); i!=openEntries.end(); i++) { + // i->second->clearProcParams (CACHEMGR); + // i->second->generateThumbnailImage (); + // i->second->updateCache (); + //} } void CacheManager::clearThumbImages () { @@ -243,9 +243,9 @@ void CacheManager::clearThumbImages () { deleteDir ("embprofiles"); // re-generate thumbnail images of open thumbnails - string_thumb_map::iterator i; - for (i=openEntries.begin(); i!=openEntries.end(); i++) - i->second->generateThumbnailImage (); + //string_thumb_map::iterator i; + //for (i=openEntries.begin(); i!=openEntries.end(); i++) + // i->second->generateThumbnailImage (); } void CacheManager::clearProfiles () { diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 49a09d7bf..b6483285d 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1185,34 +1185,16 @@ void Preferences::delExtPressed () { void Preferences::clearProfilesPressed () { - Gtk::MessageDialog md (*this, M("PREFERENCES_CLEARDLG_LINE1"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true); - md.set_secondary_text (M("PREFERENCES_CLEARDLG_LINE2")); - md.set_title (M("PREFERENCES_CLEARDLG_TITLE")); - md.show_all (); - while (gtk_events_pending ()) gtk_main_iteration (); cacheMgr->clearProfiles (); - md.hide (); } void Preferences::clearThumbImagesPressed () { - Gtk::MessageDialog md (*this, M("PREFERENCES_CLEARDLG_LINE1"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true); - md.set_secondary_text (M("PREFERENCES_CLEARDLG_LINE2")); - md.set_title (M("PREFERENCES_CLEARDLG_TITLE")); - md.show_all (); - while (gtk_events_pending ()) gtk_main_iteration (); cacheMgr->clearThumbImages (); - md.hide (); } void Preferences::clearAllPressed () { - Gtk::MessageDialog md (*this, M("PREFERENCES_CLEARDLG_LINE1"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE, true); - md.set_secondary_text (M("PREFERENCES_CLEARDLG_LINE2")); - md.set_title (M("PREFERENCES_CLEARDLG_TITLE")); - md.show_all (); - while (gtk_events_pending ()) gtk_main_iteration (); cacheMgr->clearAll (); - md.hide (); }