merge with dev

2018-01-28 08:04:11 +01:00
parent 4edc7d0719 70379f4a19
commit 3bcd62e889
5 changed files with 173 additions and 153 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -163,13 +163,7 @@ protected:
    ToolVBox* transformPanel;
    ToolVBox* rawPanel;
    ToolVBox* advancedPanel;
-//<<<<<<< HEAD
    ToolVBox* locallabPanel;
-//    Gtk::Notebook* metadataPanel;
-//    ExifPanel* exifpanel;
-//    IPTCPanel* iptcpanel;
-//=======
-//>>>>>>> dev
    ToolBar* toolBar;

    TextOrIcon* toiE;
@@ -311,7 +305,10 @@ public:
    void toolSelected(ToolMode tool);
    void editModeSwitchedOff();

-    void setEditProvider(EditDataProvider *provider);
+    void setEditProvider (EditDataProvider *provider);
+
+private:
+    IdleRegister idle_register;
 };

 #endif