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

One more markup fix, this one's in the file deletion dialog, rtgui/filecatalog.cc +724-5

Browse Source
This commit is contained in:
DrSlony
2012-06-03 15:15:39 +01:00
parent 22331ed69c
commit 3a611eb2c3
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/filecatalog.cc
View File

@@ -17,11 +17,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include "../rtengine/rt_math.h" #include "../rtengine/rt_math.h"
#include "filecatalog.h" #include "filecatalog.h"
#include "filepanel.h" #include "filepanel.h"
#include "options.h" #include "options.h"
@@ -34,7 +34,7 @@
#include "batchqueue.h" #include "batchqueue.h"
#include "rtimage.h" #include "rtimage.h"
using namespace std; using namespace std;
#define CHECKTIME 2000 #define CHECKTIME 2000
@@ -721,8 +721,8 @@ void FileCatalog::deleteRequested (std::vector<FileBrowserEntry*> tbe, bool inc
if (tbe.empty()) if (tbe.empty())
return; return;
Gtk::MessageDialog msd (M("FILEBROWSER_DELETEDLGLABEL"), false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true); Gtk::MessageDialog msd (M("FILEBROWSER_DELETEDLGLABEL"), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO, true);
msd.set_secondary_text(Glib::ustring::compose ( inclBatchProcessed ? M("FILEBROWSER_DELETEDLGMSGINCLPROC") : M("FILEBROWSER_DELETEDLGMSG"), tbe.size())); msd.set_secondary_text(Glib::ustring::compose ( inclBatchProcessed ? M("FILEBROWSER_DELETEDLGMSGINCLPROC") : M("FILEBROWSER_DELETEDLGMSG"), tbe.size()), true);
if (msd.run()==Gtk::RESPONSE_YES) { if (msd.run()==Gtk::RESPONSE_YES) {
for (unsigned int i=0; i<tbe.size(); i++) { for (unsigned int i=0; i<tbe.size(); i++) {
@@ -857,8 +857,8 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
if (listener) { if (listener) {
std::vector<BatchQueueEntry*> entries; std::vector<BatchQueueEntry*> entries;
#pragma omp parallel for ordered #pragma omp parallel for ordered
for (size_t i=0; i<tbe.size(); i++) { for (size_t i=0; i<tbe.size(); i++) {
rtengine::procparams::ProcParams params = tbe[i]->thumbnail->getProcParams(); rtengine::procparams::ProcParams params = tbe[i]->thumbnail->getProcParams();
@@ -1123,8 +1123,8 @@ void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b) {
toggled_stars_count = 1; toggled_stars_count = 1;
} }
if (toggled_stars_count == 1) { if (toggled_stars_count == 1) {
int current_star=min(start_star,toggled_button); int current_star=min(start_star,toggled_button);
int last_star =max(start_star,toggled_button); int last_star =max(start_star,toggled_button);
//we permute the start and the end star for the next loop //we permute the start and the end star for the next loop
for (; current_star <= last_star; current_star++) { for (; current_star <= last_star; current_star++) {
//we toggle on all the star in the range //we toggle on all the star in the range