enh: apply button in upload settings only affects cache location

Author: paulmueller

CHANGELOG

@@ -2,6 +2,7 @@
  - fix: correctly handle dataset IDs and names in `DBExtract`
  - fix: `get_datasets_user_shared` failed when many circles/collections exist
  - enh: allow to disable update check on startup via settings
+ - enh: apply button in upload settings only affects cache location
  - ref: decorate PyQtSlots
  - tests: restore previous users settings after testing
 0.17.3

dcoraid/gui/preferences/dlg_preferences.py

@@ -32,7 +32,8 @@ def __init__(self, *args, **kwargs):
 
         self.setWindowTitle("DCOR-Aid Preferences")
         # general
-        self.checkBox_check_updates.toggled.connect(self.on_check_for_updates)
+        self.checkBox_check_updates.toggled.connect(
+            self.on_general_check_for_updates)
         # server
         self.show_server.connect(self.on_show_server)
         self.show_user.connect(self.on_show_user)
@@ -46,7 +47,10 @@ def __init__(self, *args, **kwargs):
         # uploads
         self.toolButton_uploads_cache_browse.clicked.connect(
             self.on_uploads_browse)
-        self.toolButton_uploads_apply.clicked.connect(self.on_uploads_apply)
+        self.toolButton_uploads_path_apply.clicked.connect(
+            self.on_uploads_path_apply)
+        self.checkBox_upload_write_task_id.toggled.connect(
+            self.on_uploads_write_task_id)
         # downloads
         self.toolButton_downloads_browse.clicked.connect(
             self.on_downloads_browse)
@@ -114,7 +118,7 @@ def init_uploads(self):
         self.checkBox_upload_write_task_id.blockSignals(False)
 
     @QtCore.pyqtSlot(bool)
-    def on_check_for_updates(self, check_for_updates):
+    def on_general_check_for_updates(self, check_for_updates):
         self.settings.setValue("check for updates",
                                int(bool(check_for_updates)))
 
@@ -203,11 +207,17 @@ def on_downloads_browse(self):
         if path and pathlib.Path(path).exists():
             self.lineEdit_downloads_path.setText(path)
 
-    @QtCore.pyqtSlot()
-    def on_uploads_apply(self):
-        utwdid = int(self.checkBox_upload_write_task_id.isChecked())
-        self.settings.setValue("uploads/update task with dataset id", utwdid)
+    def on_uploads_browse(self):
+        default = self.settings.value("uploads/cache path", ".")
+        path = QtWidgets.QFileDialog.getExistingDirectory(
+            self,
+            "Choose upload cache location",
+            default,
+        )
+        self.lineEdit_uploads_cache.setText(path)
 
+    @QtCore.pyqtSlot()
+    def on_uploads_path_apply(self):
         current = self.settings.value("uploads/cache path", ".")
         path_cache = self.lineEdit_uploads_cache.text()
         self.settings.setValue("uploads/cache path", path_cache)
@@ -219,14 +229,10 @@ def on_uploads_apply(self):
             msg.setWindowTitle("Please restart DCOR-Aid")
             msg.exec()
 
-    def on_uploads_browse(self):
-        default = self.settings.value("uploads/cache path", ".")
-        path = QtWidgets.QFileDialog.getExistingDirectory(
-            self,
-            "Choose upload cache location",
-            default,
-        )
-        self.lineEdit_uploads_cache.setText(path)
+    @QtCore.pyqtSlot(bool)
+    def on_uploads_write_task_id(self, check_for_updates):
+        self.settings.setValue("uploads/update task with dataset id",
+                               int(bool(check_for_updates)))
 
     @QtCore.pyqtSlot()
     def on_show_server(self):

dcoraid/gui/preferences/dlg_preferences.ui

@@ -228,6 +228,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QToolButton" name="toolButton_uploads_path_apply">
+            <property name="text">
+             <string>Apply</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>
@@ -256,13 +263,6 @@ dataset identifier assigned to it by CKAN/DCOR.</string>
             </property>
            </spacer>
           </item>
-          <item>
-           <widget class="QToolButton" name="toolButton_uploads_apply">
-            <property name="text">
-             <string>Apply</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
         <item>