Merge ( dcraw made C++ )

2010-11-27 23:38:13 +01:00
parent 7e1e46aee5
commit 20c7a87900
65 changed files with 1399 additions and 607 deletions
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -30,7 +30,6 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{

    private:
        Gtk::Notebook* mainNB;
-        FilePanel* fpanel;       
        BatchQueuePanel* bpanel;
        std::set<Glib::ustring> filesEdited;
        std::map<Glib::ustring, EditorPanel*> epanels;
@@ -66,7 +65,10 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{
        void setProgressState (int state);
        void error (Glib::ustring descr);
        rtengine::ProgressListener* getProgressListener () { return pldBridge; }
+        
        EditorPanel*  epanel;
+        FilePanel* fpanel;
+
        void SetEditorCurrent();
        void SetMainCurrent();
        void MoveFileBrowserToEditor();