Merge branch 'dev' into newlocallab

2019-08-08 16:18:58 +02:00
parent 3603cad472 82e329ca83
commit b3e0013e56
96 changed files with 1000 additions and 1654 deletions
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -32,6 +32,7 @@
 #include "previewloader.h"
 #include "multilangmgr.h"
 #include "threadutils.h"
+#include "../rtengine/noncopyable.h"

 class FilePanel;
 /*
@@ -44,7 +45,8 @@ class FileCatalog : public Gtk::VBox,
    public PreviewLoaderListener,
    public FilterPanelListener,
    public FileBrowserListener,
-    public ExportPanelListener
+    public ExportPanelListener,
+    public rtengine::NonCopyable
 {
 public:
    typedef sigc::slot<void, const Glib::ustring&> DirSelectionSlot;