merge with dev

2019-07-23 06:40:40 +02:00
parent ea1de1cf89 c5e9482a29
commit 779ae39f17
131 changed files with 452 additions and 976 deletions
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -141,7 +141,7 @@ private:
    IdleRegister idle_register;

    void addAndOpenFile (const Glib::ustring& fname);
-    void checkAndAddFile (Glib::RefPtr<Gio::File> info);
+    void addFile (const Glib::ustring& fName);
    std::vector<Glib::ustring> getFileList ();
    BrowserFilter getFilter ();
    void trashChanged ();