Save and restore last used directory in file chooser; Issue #29

pyinat · Jun 13, 2020 · ce53179 · ce53179
1 parent 3e88bf7
commit ce53179
Show file tree

Hide file tree

Showing 14 changed files with 140 additions and 295 deletions.
diff --git a/default_settings.yml b/default_settings.yml
@@ -2,6 +2,9 @@
 
 display:
   dark_mode: false
+  # Not yet configurable
+  md_primary_palette: 'Teal'
+  md_accent_palette: 'Cyan'
 inaturalist:
   locale: null
   preferred_place_id: 1
@@ -11,3 +14,11 @@ metadata:
   create_xmp: true
   darwin_core: true
   hierarchical_keywords: true
+photos:
+  start_dir: '/'
+  # Not yet configurable
+  filetypes: ['jpg', 'jpeg', 'png', 'gif']
+# Not yet configurable
+search:
+  autocomplete_delay: 0.5
+  autocomplete_min_chars: 3
diff --git a/kv/image_selection.kv b/kv/image_selection.kv
@@ -64,29 +64,14 @@
                         orientation: 'vertical'
                         md_bg_color: .1, .1, .1, .75
                         FileChooserListView:
-                            rootpath: 'D:\\NextCloud\\Photos'  # TODO: remove, just for debugging
                             id: file_chooser
                             dirselect: True
                             filters: IMAGE_FILETYPES
 
-                        # List of selected files
-                        MDBoxLayout:
-                            orientation: 'vertical'
-                            md_bg_color: app.theme_cls.primary_color
-
-                            MDLabel:
-                                text: 'Selected Files:'
-                                size_hint_max_y: dp(20)
-                            TextInput:
-                                id: file_list_text_box
-                                readonly: True
-                                multiline: True
-                                size_hint_y: .3
-
                         # Buttons; TODO: Make this less ugly
                         MDBoxLayout:
                             size_hint_y: None
-                            height: dp(30)
+                            height: dp(50)
                             spacing: dp(5)
 
                             MDRaisedButton:
@@ -95,10 +80,10 @@
                                 height: dp(50)
                                 theme_text_color: 'Primary'
                                 md_bg_color: app.theme_cls.accent_color
-#                            MDRaisedButton:
-#                                id: debug_button
-#                                text: 'Debug'
-#                                md_bg_color: app.theme_cls.accent_color
+    #                            MDRaisedButton:
+    #                                id: debug_button
+    #                                text: 'Debug'
+    #                                md_bg_color: app.theme_cls.accent_color
                             MDRaisedButton:
                                 id: load_button
                                 text: 'Load Selected File/Folder'

diff --git a/kv/context_menus.kv → kv/menus.kv b/kv/context_menus.kv → kv/menus.kv
@@ -22,7 +22,17 @@
     PhotoContextMenuItem:
         id: remove_ctx
         text: "Remove from selection"
-     # Just some ideas for future features
+    # Just some ideas for future features
+#    ContextMenuDivider:
+#        text: "Taxon"
+#    PhotoContextMenuItem:
+#        id: view_taxon_ctx
+#        text: "View taxon"
+#        disabled: True
+#    PhotoContextMenuItem:
+#        text: "View taxon on iNaturalist"
+#        disabled: True
+     # Or maybe nested menus:
 #    ContextMenuDivider:
 #        text: "More options"
 #    ContextMenuTextItem:

diff --git a/naturtag/app/app.py b/naturtag/app/app.py
@@ -69,13 +69,15 @@ def init_controllers(self, screens):
         self.select_taxon = self.taxon_view_controller.select_taxon
         self.select_taxon_from_photo = self.image_selection_controller.select_taxon_from_photo
         self.update_history = self.taxon_selection_controller.update_history
+        self.add_control_widget = self.settings_controller.add_control_widget
 
         # Proxy properties
         self.stored_taxa = self.settings_controller.stored_taxa
         self.locale = self.settings_controller.locale
         self.metadata = self.settings_controller.metadata
         self.preferred_place_id = self.settings_controller.preferred_place_id
 
+        self.image_selection_controller.post_init()
         self.taxon_selection_controller.post_init()
 
     def get_taxon_list_item(self, *args, **kwargs):

diff --git a/naturtag/app/screens.py b/naturtag/app/screens.py
@@ -15,7 +15,7 @@
     'widgets',
     'main',
     # 'autocomplete',
-    'context_menus',
+    'menus',
     'taxon_search',
     'taxon_selection',
 ]

diff --git a/naturtag/app/testapp.py b/naturtag/app/testapp.py
diff --git a/naturtag/constants.py b/naturtag/constants.py
@@ -1,6 +1,8 @@
 from collections import OrderedDict
 from os.path import dirname, join
 from appdirs import user_data_dir
+from naturtag import __version__
+from pyinaturalist import DEFAULT_USER_AGENT
 from pyinaturalist.constants import RANKS
 #RANKS + ['infraclass']
 
@@ -47,16 +49,14 @@
 # Config files
 CONFIG_PATH = join(DATA_DIR, 'settings.yml')
 DEFAULT_CONFIG_PATH = join(PKG_DIR, 'default_settings.yml')
-
 STORED_TAXA_PATH = join(DATA_DIR, 'stored_taxa.json')
-TAXON_HISTORY_PATH = join(DATA_DIR, 'taxon_history')
-TAXON_FREQUENCY_PATH = join(DATA_DIR, 'taxon_frequency.json')
-STARRED_TAXA_PATH = join(DATA_DIR, 'starred_taxa')
+MAX_DISPLAY_HISTORY = 25  # Max number of history items to display at a time
 
-# URLs
+# URLs / API settings
 TAXON_BASE_URL = 'https://www.inaturalist.org/taxa'
 OBSERVATION_BASE_URL = 'https://www.inaturalist.org/observations'
 PLACES_BASE_URL = 'https://www.inaturalist.org/places'
+USER_AGENT = f'naturtag/{__version__}; {DEFAULT_USER_AGENT}'.lower()
 
 # Theme/window settings
 INIT_WINDOW_POSITION = ('custom', 100, 100)