Add an option to select what items will be imported

Author: vikdevelop

data/io.github.vikdevelop.SaveDesktop.gschema.xml

@@ -35,7 +35,7 @@
 		</key>
 	  <key name="save-gtk-settings" type="b">
 	    <default>true</default>
-	    <summary>Save the GTK application settings (appearance, tabs, styles)</summary>
+	    <summary>Save the GTK application settings</summary>
 	  </key>
 		<key name="save-installed-flatpaks" type="b">
 			<default>true</default>

po/savedesktop.pot

@@ -32,11 +32,11 @@ msgstr ""
 #: src/gui/templates/shortcuts_window.ui:57
 #: src/gui/window.py
 #: src/gui/items_dialog.py
-msgid "Items to include in the configuration archive"
+msgid "Select configuration items"
 msgstr ""
 
 #: src/gui/items_dialog.py
-msgid "These settings also apply to periodic saving"
+msgid "These settings are used for manual and periodic saves, imports, and synchronization."
 msgstr ""
 
 #: src/gui/items_dialog.py
@@ -63,6 +63,14 @@ msgstr ""
 msgid "Desktop"
 msgstr ""
 
+#: src/gui/items_dialog.py
+msgid "GTK application settings"
+msgstr ""
+
+#: src/gui/items_dialog.py
+msgid "Bookmarks, styles, etc."
+msgstr ""
+
 #: src/gui/items_dialog.py
 msgid "Flatpak apps"
 msgstr ""

src/gui/items_dialog.py

@@ -110,8 +110,8 @@ def __init__(self, parent):
         super().__init__()
         self.parent = parent
 
-        self.set_heading(_("Items to include in the configuration archive"))
-        self.set_body(_("These settings also apply to periodic saving"))
+        self.set_heading(_("Select configuration items"))
+        self.set_body(_("These settings are used for manual and periodic saves, imports, and synchronization."))
 
         # Box for loading widgets in this dialog
         self.itemsBox = Gtk.ListBox.new()
@@ -192,6 +192,7 @@ def __init__(self, parent):
 
         self.desktop_row = Adw.ActionRow.new()
         self.desktop_row.set_title(title=_("Desktop"))
+        self.desktop_row.set_subtitle(subtitle=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP))
         self.desktop_row.set_subtitle_selectable(True)
         self.desktop_row.set_use_markup(True)
         self.desktop_row.set_title_lines(2)
@@ -200,14 +201,15 @@ def __init__(self, parent):
         self.desktop_row.set_activatable_widget(self.switch_de)
         self.itemsBox.append(child=self.desktop_row)
 
-        # Swithc and row of option 'GTK application settings (appearance, tabs, styles)'
+        # Switch and row of the option: GTK Settings
         self.switch_gtk = Gtk.Switch.new()
         if settings["save-gtk-settings"]:
             self.switch_gtk.set_active(True)
         self.switch_gtk.set_valign(align=Gtk.Align.CENTER)
 
         self.gtk_row = Adw.ActionRow.new()
-        self.gtk_row.set_title(title=_("GTK application settings (appearance, tabs, styles)"))
+        self.gtk_row.set_title(title=_("GTK application settings"))
+        self.gtk_row.set_subtitle(subtitle=_("Bookmarks, styles, etc."))
         self.gtk_row.set_subtitle_selectable(True)
         self.gtk_row.set_use_markup(True)
         self.gtk_row.set_title_lines(2)

src/gui/templates/shortcuts_window.ui

@@ -54,7 +54,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Items to include in the configuration archive</property>
+                <property name="title" translatable="yes">Select configuration items</property>
                 <property name="action-name">app.items-dialog</property>
                 <property name="accelerator">&lt;primary&gt;&lt;shift&gt;i</property>
               </object>

src/gui/window.py

@@ -7,7 +7,6 @@
 from pathlib import Path
 from threading import Thread
 from savedesktop.globals import *
-from savedesktop.gui.items_dialog import FolderSwitchRow, FlatpakAppsDialog, itemsDialog
 from savedesktop.gui.more_options_dialog import MoreOptionsDialog
 from savedesktop.gui.synchronization_dialogs import InitSetupDialog, SetDialog, CloudDialog
 
@@ -38,6 +37,7 @@ def __init__(self, *args, **kwargs):
         # primary menu section
         self.general_menu = Gio.Menu()
         self.general_menu.append(_("Keyboard shortcuts"), 'app.shortcuts')
+        self.general_menu.append(_("Select configuration items"), 'app.items-dialog')
         self.general_menu.append(_("About app"), 'app.about')
         self.main_menu.append_section(None, self.general_menu)
 
@@ -187,21 +187,6 @@ def save_desktop(self):
         self.saveEntry.set_text(settings["filename"])
         self.lbox_e.append(self.saveEntry)
 
-        # Button for opening dialog for selecting items that will be included to the config archive
-        self.itemsButton = Gtk.Button.new_from_icon_name("go-next-symbolic")
-        self.itemsButton.set_valign(Gtk.Align.CENTER)
-        self.itemsButton.add_css_class("flat")
-        self.itemsButton.connect("clicked", self._open_items_dialog)
-
-        # Action row for opening dialog for selecting items that will be included to the config archive
-        self.items_row = Adw.ActionRow.new()
-        self.items_row.set_title(title=_("Items to include in the configuration archive"))
-        self.items_row.set_use_markup(True)
-        self.items_row.set_title_lines(5)
-        self.items_row.add_suffix(self.itemsButton)
-        self.items_row.set_activatable_widget(self.itemsButton)
-        self.lbox_e.append(child=self.items_row)
-
         self.lbox_e.set_show_separators(True)
 
         # section for showing dialog with more options
@@ -234,12 +219,6 @@ def _open_more_options_dialog(self, w):
         self.more_options_dialog.choose(self, None, None, None)
         self.more_options_dialog.present(self)
 
-    # open a dialog for selecting the items to include in the configuration archive
-    def _open_items_dialog(self, w):
-        self.items_dialog = itemsDialog(self)
-        self.items_dialog.choose(self, None, None, None)
-        self.items_dialog.present(self)
-
     # Import configuration page
     def import_desktop(self):
         self.importBox.set_valign(Gtk.Align.CENTER)

src/main.py

@@ -3,6 +3,7 @@
 gi.require_version('Adw', '1')
 from gi.repository import Gtk, Adw, Gio, GLib
 from savedesktop.gui.window import MainWindow
+from savedesktop.gui.items_dialog import FolderSwitchRow, FlatpakAppsDialog, itemsDialog
 from savedesktop.globals import *
 
 @Gtk.Template(resource_path="/io/github/vikdevelop/SaveDesktop/gui/templates/shortcuts_window.ui")
@@ -44,7 +45,9 @@ def call_ms_dialog(self, action, param):
 
     # Open the "Items to include in the configuration archive" dialog using Ctrl+Shift+I keyboard shortcut
     def call_items_dialog(self, action, param):
-        self.win._open_items_dialog(w="")
+        self.items_dialog = itemsDialog(self.win)
+        self.items_dialog.choose(self.win, None, None, None)
+        self.items_dialog.present(self.win)
 
     # Open the "Set up the sync file" dialog using Ctrl+Shift+S keyboard shortcut
     def call_setDialog(self, action, param):