Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)

rtgui/editorpanel.h

@@ -49,6 +49,9 @@ class EditorPanel : public Gtk::VBox,
                     public ThumbnailListener,
                     public HistoryBeforeLineListener,
                     public rtengine::HistogramListener {
+    private:
+
+        Glib::ustring lastSaveAsFileName;
 
     protected:      
         Gtk::ProgressBar  *progressLabel;
@@ -97,7 +100,7 @@ class EditorPanel : public Gtk::VBox,
         HistogramPanel* histogramPanel;
         ToolPanelCoordinator* tpc;
         RTWindow* parent;
-        SaveAsDialog* saveAsDialog;
+        //SaveAsDialog* saveAsDialog;
         BatchToolPanelCoordinator* btpCoordinator;        
         FilePanel* fPanel;