merge with dev

2020-01-28 17:37:35 +01:00
parent 76fdb4f2d5 364fe35023
commit 9cacca3c0e
22 changed files with 99 additions and 25 deletions
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -124,6 +124,9 @@ private:
    Gtk::Button* zoomInButton;
    Gtk::Button* zoomOutButton;

+    RTImage* progressImage;
+    Gtk::Label* progressLabel;
+
    MyMutex dirEFSMutex;
    ExifFilterSettings dirEFS;
    ExifFilterSettings currentEFS;