Reverted changes introduced in mistakingly committed changeset e158af8f269f

rtgui/filepanel.cc

@@ -61,7 +61,6 @@ FilePanel::FilePanel () : parent(NULL) {
     dirBrowser->addDirSelectionListener (fileCatalog);
     dirBrowser->addDirSelectionListener (recentBrowser);
     dirBrowser->addDirSelectionListener (placesBrowser);
-    dirBrowser->addDirSelectionListener (tpc);
     fileCatalog->setFileSelectionListener (this);
     fileCatalog->setDirBrowserRemoteInterface (dirBrowser);
 

rtgui/flatfield.cc

@@ -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) {}
-	}
-}

rtgui/flatfield.h

@@ -49,7 +49,6 @@ protected:
 	bool lastFFAutoSelect;
 	FFProvider *ffp;
 	sigc::connection flatFieldFileconn, flatFieldAutoSelectconn, flatFieldBlurTypeconn;
-        Glib::ustring lastShortcutPath;
 
 public:
 
@@ -65,7 +64,6 @@ public:
     void flatFieldFile_Reset        ();
     void flatFieldAutoSelectChanged ();
     void flatFieldBlurTypeChanged   ();
-    void setShortcutPath(Glib::ustring path);
     void setFFProvider              (FFProvider* p) { ffp = p; };
 };
 

rtgui/thumbnail.cc

@@ -751,9 +751,8 @@ void Thumbnail::updateCache (bool updatePParams, bool updateCacheImageData) {
 
     if (updatePParams && pparamsValid) {
         pparams.save (
-            options.saveParamsFile  ? fname + paramFileExtension : "",
             options.saveParamsCache ? getCacheFileName ("profiles")+paramFileExtension : "",
-            options.saveParamsCache
+            options.saveParamsFile  ? fname + paramFileExtension : ""
         );
     }
     if (updateCacheImageData)

rtgui/toolpanelcoord.cc

@@ -362,7 +362,6 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
         ipc->setSizeListener (crop);
         ipc->setSizeListener (resize);
     }
-    flatfield->setShortcutPath(Glib::path_get_dirname(ipc->getInitialImage()->getFileName()));
 
     icm->setRawMeta (raw, (const rtengine::ImageData*)pMetaData); 
     lensProf->setRawMeta (raw, pMetaData); 
@@ -631,8 +630,3 @@ void ToolPanelCoordinator::toolSelected (ToolMode tool) {
 		break;
 	}
 }
-
-void ToolPanelCoordinator::dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile) {
-
-    flatfield->setShortcutPath(dirname);
-}

rtgui/toolpanelcoord.h

@@ -54,7 +54,6 @@
 #include "toolbar.h"
 #include "lensgeom.h"
 #include "lensgeomlistener.h"
-#include "dirselectionlistener.h"
 #include "dirpyrequalizer.h"
 #include "hsvequalizer.h"
 #include "rawprocess.h"
@@ -79,7 +78,6 @@ class ToolPanelCoordinator :    public ToolPanelListener,
                                 public SpotWBListener,
                                 public CropPanelListener,
                                 public ICMPanelListener,
-                                public DirSelectionListener,
                                 public ImageAreaToolListener {
 
     protected:
@@ -194,9 +192,6 @@ class ToolPanelCoordinator :    public ToolPanelListener,
         void profileChange  (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited=NULL);
         void setDefaults    (rtengine::procparams::ProcParams* defparams);
 
-        // DirSelectionListener interface
-        void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile="");
-
         // to support the GUI:
         CropGUIListener* getCropGUIListener (); // through the CropGUIListener the editor area can notify the "crop" ToolPanel when the crop selection changes