liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed program hang from issue 185 (see issue tracker for comments); re-generated translations

Browse Source
This commit is contained in:
Wyatt Olson
2010-10-28 19:51:15 -06:00
parent 37ea6a7380
commit bb1a7ce4bc
6 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtdata/languages/English
View File

@@ -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<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATE;Use Template
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!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

13
rtdata/languages/English (UK)
View File

@@ -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<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATE;Use Template
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!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

13
rtdata/languages/English (US)
View File

@@ -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<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATE;Use Template
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...\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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
!PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ...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<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>nthe meaning of the formatting strings are:n<b>%d4</b> = <i>home</i>n<b>%d3</b> = <i>tom</i>n<b>%d2</b> = <i>photos</i>n<b>%d1</b> = <i>2010-10-31</i>n<b>%f</b> = <i>dsc0042</i>n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>n<b>%p2</b> = <i>/home/tom/photos/</i>n<b>%p3</b> = <i>/home/tom/</i>n<b>%p4</b> = <i>/home/</i>nnIf you want to save the output image where the original is, write:n<b>%p1/%f</b>nnIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:n<b>%p1/converted/%f</b>nnIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:n<b>%p2/converted/%d1/%f</b>
!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

3
rtdata/languages/default
View File

@@ -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

18
rtgui/cachemanager.cc
View File

@@ -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 () {

18
rtgui/preferences.cc
View File

@@ -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 ();
}