Reverted changes introduced in mistakingly committed changeset e158af8f269f

This commit is contained in:
torger
2013-10-23 13:29:05 +02:00
parent 89cbf495bb
commit 87bc2331ed
9 changed files with 29 additions and 136 deletions

View File

@@ -67,7 +67,6 @@ FlatField::FlatField () : Gtk::VBox(), FoldableToolPanel(this)
flatFieldFileReset->signal_clicked().connect( sigc::mem_fun(*this, &FlatField::flatFieldFile_Reset), true );
flatFieldAutoSelectconn = flatFieldAutoSelect->signal_toggled().connect ( sigc::mem_fun(*this, &FlatField::flatFieldAutoSelectChanged), true);
flatFieldBlurTypeconn = flatFieldBlurType->signal_changed().connect( sigc::mem_fun(*this, &FlatField::flatFieldBlurTypeChanged) );
lastShortcutPath = "";
}
void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
@@ -229,22 +228,3 @@ void FlatField::flatFieldAutoSelectChanged()
listener->panelChanged (EvFlatFieldAutoSelect, flatFieldAutoSelect->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
}
void FlatField::setShortcutPath(Glib::ustring path)
{
if (path == "") return;
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_shortcut_dir(path))
#endif
{
if (lastShortcutPath != "") {
flatFieldFile->remove_shortcut_folder(lastShortcutPath);
}
lastShortcutPath = path;
try {
flatFieldFile->add_shortcut_folder(path);
}
catch (Gtk::FileChooserError &err) {}
}
}