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

Fixed deleting/moving image does not update image count; inconsistent brackets

Browse Source 
see issue 995
This commit is contained in:
Oliver Duis
2011-09-16 13:43:32 +02:00
parent 6b4bafd6f8
commit d37af496b4
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/filebrowser.cc
View File

@@ -394,6 +394,7 @@ FileBrowserEntry* FileBrowser::delEntry (const Glib::ustring& fname) {
#endif #endif
if (j!=selected.end()) { if (j!=selected.end()) {
if (checkFilter (*j)) numFiltered--;
selected.erase (j); selected.erase (j);
notifySelectionListener (); notifySelectionListener ();
} }

17
rtgui/filecatalog.cc
View File

@@ -533,7 +533,12 @@ void FileCatalog::_refreshProgressBar () {
hbb = Gtk::manage (new Gtk::HBox ()); hbb = Gtk::manage (new Gtk::HBox ());
if (!previewsToLoad ) { if (!previewsToLoad ) {
hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU))); hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")+" ("+Glib::ustring::format(fileBrowser->getNumFiltered())+"/"+Glib::ustring::format(previewsLoaded)+")")); int filteredCount=fileBrowser->getNumFiltered();
label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")+
(filteredCount!=previewsLoaded ? " ["+ Glib::ustring::format(filteredCount)+"/" : " (")
+ Glib::ustring::format(previewsLoaded) +
(filteredCount!=previewsLoaded ? "]" : ")")));
} else { } else {
hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::FIND, Gtk::ICON_SIZE_MENU))); hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::FIND, Gtk::ICON_SIZE_MENU)));
label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")+" [" +Glib::ustring::format(std::fixed, std::setprecision(0), std::setw(3), (double)previewsLoaded / previewsToLoad*100 )+"%]" )); label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")+" [" +Glib::ustring::format(std::fixed, std::setprecision(0), std::setw(3), (double)previewsLoaded / previewsToLoad*100 )+"%]" ));
@@ -729,7 +734,11 @@ void FileCatalog::deleteRequested (std::vector<FileBrowserEntry*> tbe, bool inc
Glib::ustring procfName = Glib::ustring::compose ("%1.%2", BatchQueue::calcAutoFileNameBase(fname), options.saveFormatBatch.format); Glib::ustring procfName = Glib::ustring::compose ("%1.%2", BatchQueue::calcAutoFileNameBase(fname), options.saveFormatBatch.format);
if (safe_file_test (procfName, Glib::FILE_TEST_EXISTS)) safe_g_remove (procfName); if (safe_file_test (procfName, Glib::FILE_TEST_EXISTS)) safe_g_remove (procfName);
} }
previewsLoaded--;
} }
_refreshProgressBar();
redrawAll (); redrawAll ();
} }
} }
@@ -749,7 +758,7 @@ void FileCatalog::copyMoveRequested (std::vector<FileBrowserEntry*> tbe, bool m
fc.add_button( Gtk::StockID("gtk-ok"), Gtk::RESPONSE_OK); fc.add_button( Gtk::StockID("gtk-ok"), Gtk::RESPONSE_OK);
// open dialog at the 1-st file's path // open dialog at the 1-st file's path
fc.set_filename(tbe[0]->filename); fc.set_filename(tbe[0]->filename);
//!!! TOFO prevent dialog closing on "enter" key press //!!! TODO prevent dialog closing on "enter" key press
bool filecopymovecomplete; bool filecopymovecomplete;
int i_copyindex; int i_copyindex;
@@ -790,6 +799,8 @@ void FileCatalog::copyMoveRequested (std::vector<FileBrowserEntry*> tbe, bool m
cacheMgr->renameEntry (src_fPath, tbe[i]->thumbnail->getMD5(), dest_fPath); cacheMgr->renameEntry (src_fPath, tbe[i]->thumbnail->getMD5(), dest_fPath);
// remove from browser // remove from browser
FileBrowserEntry* t = fileBrowser->delEntry (src_fPath); FileBrowserEntry* t = fileBrowser->delEntry (src_fPath);
previewsLoaded--;
} }
else else
src_file->copy(dest_file); src_file->copy(dest_file);
@@ -826,6 +837,8 @@ void FileCatalog::copyMoveRequested (std::vector<FileBrowserEntry*> tbe, bool m
}//while }//while
} // i<tbe.size() loop } // i<tbe.size() loop
redrawAll (); redrawAll ();
_refreshProgressBar();
} // Gtk::RESPONSE_OK } // Gtk::RESPONSE_OK
} }
void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe) { void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe) {