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

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