Fix a bug with setting up a periodic saving in the GUI

Author: vikdevelop

src/gui/more_options_dialog.py

@@ -155,7 +155,22 @@ def _get_generated_password(self, w):
     # Open the file chooser dialog for selecting  the periodic saving folder
     # by calling the MainWindow's method (self.parent)
     def _open_file_dialog(self, w):
-        self.parent.select_pb_folder(w="")
+        self.__select_pb_folder()
+
+    # Select folder for periodic saving
+    def __select_pb_folder(self):
+        def save_selected(source, res, data):
+            try:
+                folder = source.select_folder_finish(res)
+            except:
+                return
+            self.folder_pb = folder.get_path()
+            self.dirRow.set_subtitle(f"{self.folder_pb}")
+
+        self.pb_chooser = Gtk.FileDialog.new()
+        self.pb_chooser.set_modal(True)
+        self.pb_chooser.set_title(_("Choose custom folder for periodic saving"))
+        self.pb_chooser.select_folder(self.parent, None, save_selected, None)
 
     # Reset the file name format entry to the default value
     def _reset_fileformat(self, w):
@@ -185,9 +200,9 @@ def _expand_periodic_row(self):
     def msDialog_closed(self, w, response):
         if response == 'ok':
             settings["filename-format"] = self.filefrmtEntry.get_text() # save the file name format entry
-            settings["periodic-saving-folder"] = self.dirRow.get_subtitle() # save the selected periodic saving folder
             settings["enable-encryption"] = self.encryptSwitch.get_active() # save the archive encryption's switch state
             settings["save-without-archive"] = self.archSwitch.get_active() # save the switch state of the "Save a configuration without creating the configuration archive" option
+            settings["periodic-saving-folder"] = self.dirRow.get_subtitle()
             self._save_periodic_saving_values()
             self._save_password()
             self._call_set_dialog()

src/gui/synchronization_dialogs.py

@@ -83,7 +83,7 @@ def __init__(self, parent):
     def initsetupDialog_closed(self, w, response):
         if response == 'next' or response == 'ok-syncthing': # open the Gtk.FileDialog in the GNOME Online accounts case
             if self.get_button_type == 'set-button':
-                self.parent.select_pb_folder(w)
+                self._select_pb_folder()
             else:
                 self.cloud_dialog.select_folder_to_sync(w)
             self.almost_done()
@@ -102,6 +102,21 @@ def initsetupDialog_closed(self, w, response):
             settings["periodic-import"] = "Daily2"
             self.parent._open_CloudDialog()
 
+    # Select folder for periodic saving
+    def _select_pb_folder(self):
+        def save_selected(source, res, data):
+            try:
+                folder = source.select_folder_finish(res)
+            except:
+                return
+            self.folder_pb = folder.get_path()
+            settings["periodic-saving-folder"] = self.folder_pb
+
+        self.pb_chooser = Gtk.FileDialog.new()
+        self.pb_chooser.set_modal(True)
+        self.pb_chooser.set_title(_("Choose custom folder for periodic saving"))
+        self.pb_chooser.select_folder(self.parent, None, save_selected, None)
+
     # Set the Rclone setup command
     def _get_service(self, comborow, GParamObject):
         self.set_body("")
@@ -197,11 +212,11 @@ def __init__(self, parent):
         ## translate the periodic-saving key to the user language
         pb = next((key for key, value in {_("Never"): "Never", _("Daily"): "Daily", _("Weekly"): "Weekly", _("Monthly"): "Monthly"}.items() if settings["periodic-saving"] == value), None)
         self.ps_row = Adw.ActionRow.new()
-        self.ps_row.set_title(f'{_("Periodic saving")} ({_("Interval")})')
+        self.ps_row.set_title(f'{_("Periodic saving")}')
         self.ps_row.set_use_markup(True)
         self.ps_row.add_suffix(self.ps_button)
-        self.ps_row.set_subtitle(f'<span color="red">{_("Never")}</span>' if settings["periodic-saving"] == "Never"
-                                 else f'<span color="green">{pb}</span>')
+        self.ps_row.set_subtitle(f'❌ {_("Never")}' if settings["periodic-saving"] == "Never"
+                                 else f'✅ {pb}')
         self.ps_button.add_css_class('suggested-action') if settings["periodic-saving"] == "Never" else None
 
     # Create this file to set expanding the "Periodic saving" row in the More options dialog
@@ -227,7 +242,7 @@ def check_filesystem_fnc(self):
 
         # Check if periodic saving is set to "Never"
         if settings["periodic-saving"] == "Never":
-            folder = f'{_("Interval")}: {_("Never")}'
+            folder = ""
         # Check if the filesystem is not FUSE
         elif check_fs_result == "You didn't select the cloud drive folder!":
             err = _("You didn't select the cloud drive folder!")
@@ -246,7 +261,6 @@ def update_gui(self):
         self.file_row = Adw.ActionRow()
         self.file_row.set_title(_("Periodic saving file"))
         self.file_row.set_subtitle(folder)
-        self.file_row.add_suffix(Gtk.Image.new_from_icon_name("network-wired-symbolic")) if "red" not in folder else None
         self.file_row.set_subtitle_lines(8)
         self.file_row.set_use_markup(True)
         self.file_row.set_subtitle_selectable(True)

src/gui/window.py

@@ -349,22 +349,6 @@ def _open_CloudDialog(self):
         self.set_dialog.choose(self, None, None, None)
         self.set_dialog.present(self)
 
-    # Select folder for periodic saving
-    def select_pb_folder(self, w):
-        def save_selected(source, res, data):
-            try:
-                folder = source.select_folder_finish(res)
-            except:
-                return
-            self.folder_pb = folder.get_path()
-            settings["periodic-saving-folder"] = self.folder_pb if settings["first-synchronization-setup"] else settings["periodic-saving-folder"]
-            self.dirRow.set_subtitle(f"{self.folder_pb}") if hasattr(self, 'dirRow') else None
-
-        self.pb_chooser = Gtk.FileDialog.new()
-        self.pb_chooser.set_modal(True)
-        self.pb_chooser.set_title(_("Choose custom folder for periodic saving"))
-        self.pb_chooser.select_folder(self, None, save_selected, None)
-
     # Select folder for saving configuration
     def select_folder(self, w):
         def save_selected(source, res, data):