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

Merge branch 'master' into 'gtk3'

Browse Source
This commit is contained in:
Adam Reichold
2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rtgui/profilepanel.cc
View File

@@ -21,7 +21,6 @@
#include "profilestore.h"
#include "clipboard.h"
#include "multilangmgr.h"
#include "../rtengine/safegtk.h"
#include "rtimage.h"
using namespace rtengine;
@@ -272,24 +271,14 @@ void ProfilePanel::save_clicked (GdkEventButton* event)
dialog.set_current_name (lastFilename);
//Add the user's default (or global if multiuser=false) profile path to the Shortcut list
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_shortcut_dir(options.getPreferredProfilePath()))
#endif
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
} catch (Glib::Error &err) {}
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
} catch (Glib::Error&) {}
//Add the image's path to the Shortcut list
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_shortcut_dir(imagePath))
#endif
try {
dialog.add_shortcut_folder(imagePath);
} catch (Glib::Error &err) {}
try {
dialog.add_shortcut_folder(imagePath);
} catch (Glib::Error&) {}
//Add response buttons the the dialog:
dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
@@ -447,24 +436,14 @@ void ProfilePanel::load_clicked (GdkEventButton* event)
bindCurrentFolder (dialog, options.loadSaveProfilePath);
//Add the user's default (or global if multiuser=false) profile path to the Shortcut list
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_shortcut_dir(options.getPreferredProfilePath()))
#endif
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
} catch (Glib::Error &err) {}
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
} catch (Glib::Error&) {}
//Add the image's path to the Shortcut list
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_shortcut_dir(imagePath))
#endif
try {
dialog.add_shortcut_folder(imagePath);
} catch (Glib::Error &err) {}
try {
dialog.add_shortcut_folder(imagePath);
} catch (Glib::Error&) {}
//Add response buttons the the dialog:
dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);