GUI: Minor UX tweaks

2025-09-07 21:44:47 +08:00 · 2024-11-07 21:46:42 +01:00 · 2024-11-07 21:46:42 +01:00 · 40cf1583c4
commit 40cf1583c4
parent 7f862d8fa0
6 changed files with 93 additions and 58 deletions
--- a/npbackup/gui/main.py
+++ b/npbackup/gui/main.py
@ -540,7 +540,7 @@ def _main_gui(viewer_mode: bool):
                sg.Push(),
                sg.Button(_t("generic.cancel"), key="--CANCEL--"),
                sg.Button(_t("main_gui.new_config"), key="--NEW-CONFIG--"),
-                sg.Button(_t("generic.load"), key="--LOAD--"),
+                sg.Button(_t("main_gui.load_existing_file"), key="--LOAD--"),
            ],
        ]
        window = sg.Window("Configuration File", layout=layout, keep_on_top=True)
--- a/npbackup/gui/config.py
+++ b/npbackup/gui/config.py
@ -245,6 +245,44 @@ def config_gui(full_config: dict, config_file: str):

        return object_type, object_name

+    def update_source_layout(source_type: str):
+        if source_type == "stdin_from_command":
+            window["backup_opts.paths"].update(visible=False)
+            window["--ADD-PATHS-FILE-BUTTON--"].update(visible=False)
+            window["--ADD-PATHS-FOLDER-BUTTON--"].update(visible=False)
+            window["--ADD-PATHS-MANUALLY--"].update(visible=False)
+            window["--REMOVE-PATHS--"].update(visible=False)
+            window["backup_opts.stdin_from_command"].update(visible=True)
+            window["inherited.backup_opts.stdin_from_command"].update(visible=True)
+            window["text_stdin_from_command"].update(visible=True)
+            window["backup_opts.stdin_filename"].update(visible=True)
+            window["inherited.backup_opts.stdin_filename"].update(visible=True)
+            window["text_stdin_filename"].update(visible=True)
+        elif source_type == "folder_list":
+            window["backup_opts.paths"].update(visible=True)
+            window["--ADD-PATHS-FILE-BUTTON--"].update(visible=True)
+            window["--ADD-PATHS-FOLDER-BUTTON--"].update(visible=True)
+            window["--ADD-PATHS-MANUALLY--"].update(visible=True)
+            window["--REMOVE-PATHS--"].update(visible=True)
+            window["backup_opts.stdin_from_command"].update(visible=False)
+            window["inherited.backup_opts.stdin_from_command"].update(visible=False)
+            window["text_stdin_from_command"].update(visible=False)
+            window["backup_opts.stdin_filename"].update(visible=False)
+            window["inherited.backup_opts.stdin_filename"].update(visible=False)
+            window["text_stdin_filename"].update(visible=False)
+        elif source_type in ("files_from", "files_from_verbatim", "files_from_raw"):
+            window["backup_opts.paths"].update(visible=True)
+            window["--ADD-PATHS-FILE-BUTTON--"].update(visible=True)
+            window["--ADD-PATHS-FOLDER-BUTTON--"].update(visible=False)
+            window["--ADD-PATHS-MANUALLY--"].update(visible=True)
+            window["--REMOVE-PATHS--"].update(visible=True)
+            window["backup_opts.stdin_from_command"].update(visible=False)
+            window["inherited.backup_opts.stdin_from_command"].update(visible=False)
+            window["text_stdin_from_command"].update(visible=False)
+            window["backup_opts.stdin_filename"].update(visible=False)
+            window["inherited.backup_opts.stdin_filename"].update(visible=False)
+            window["text_stdin_filename"].update(visible=False)
+
    def update_gui_values(key, value, inherited, object_type, unencrypted):
        """
        Update gui values depending on their type
@ -566,6 +604,17 @@ def config_gui(full_config: dict, config_file: str):
            object_config, config_inheritance, object_type, unencrypted, None
        )

+        # Special case when no source type is set
+        if window["backup_opts.source_type"].Get() == "":
+            window["backup_opts.source_type"].Update(
+                value=combo_boxes["backup_opts.source_type"]["folder_list"]
+            )
+        source_type = get_key_from_value(
+            combo_boxes["backup_opts.source_type"],
+            window["backup_opts.source_type"].Get(),
+        )
+        update_source_layout(source_type)
+
    def update_global_gui(full_config, unencrypted: bool = False):
        nonlocal global_prometheus_labels_tree

@ -864,36 +913,6 @@ def config_gui(full_config: dict, config_file: str):
                    enable_events=True,
                ),
            ],
-            [
-                sg.Tree(
-                    sg.TreeData(),
-                    key="backup_opts.paths",
-                    headings=[],
-                    col0_heading=_t("generic.paths"),
-                    expand_x=True,
-                    expand_y=True,
-                )
-            ],
-            [sg.Text(_t("config_gui.stdin_from_command"))],
-            [
-                sg.Image(
-                    NON_INHERITED_ICON,
-                    key="inherited.backup_opts.stdin_from_command",
-                    tooltip=_t("config_gui.group_inherited"),
-                    pad=1,
-                ),
-                sg.Input(key="backup_opts.stdin_from_command", size=(100, 1)),
-            ],
-            [sg.Text(_t("config_gui.stdin_filename"))],
-            [
-                sg.Image(
-                    NON_INHERITED_ICON,
-                    key="inherited.backup_opts.stdin_filename",
-                    tooltip=_t("config_gui.group_inherited"),
-                    pad=1,
-                ),
-                sg.Input(key="backup_opts.stdin_filename", size=(100, 1)),
-            ],
            [
                sg.Input(visible=False, key="--ADD-PATHS-FILE--", enable_events=True),
                sg.FilesBrowse(
@ -910,6 +929,40 @@ def config_gui(full_config: dict, config_file: str):
                sg.Button(_t("generic.add_manually"), key="--ADD-PATHS-MANUALLY--"),
                sg.Button(_t("generic.remove_selected"), key="--REMOVE-PATHS--"),
            ],
+            [
+                sg.Tree(
+                    sg.TreeData(),
+                    key="backup_opts.paths",
+                    headings=[],
+                    col0_heading=_t("generic.paths"),
+                    expand_x=True,
+                    expand_y=True,
+                )
+            ],
+            [
+                sg.Text(
+                    _t("config_gui.stdin_from_command"), key="text_stdin_from_command"
+                )
+            ],
+            [
+                sg.Image(
+                    NON_INHERITED_ICON,
+                    key="inherited.backup_opts.stdin_from_command",
+                    tooltip=_t("config_gui.group_inherited"),
+                    pad=1,
+                ),
+                sg.Input(key="backup_opts.stdin_from_command", size=(100, 1)),
+            ],
+            [sg.Text(_t("config_gui.stdin_filename"), key="text_stdin_filename")],
+            [
+                sg.Image(
+                    NON_INHERITED_ICON,
+                    key="inherited.backup_opts.stdin_filename",
+                    tooltip=_t("config_gui.group_inherited"),
+                    pad=1,
+                ),
+                sg.Input(key="backup_opts.stdin_filename", size=(100, 1)),
+            ],
            [
                sg.Column(
                    [
@ -1942,7 +1995,7 @@ Google Cloud storage: GOOGLE_PROJECT_ID  GOOGLE_APPLICATION_CREDENTIALS\n\
            [
                sg.Push(),
                sg.Button(
-                    _t("config_gui.create_object"), key="-OBJECT-CREATE-", size=(28, 1)
+                    _t("config_gui.add_object"), key="-OBJECT-CREATE-", size=(28, 1)
                ),
                sg.Button(
                    _t("config_gui.delete_object"), key="-OBJECT-DELETE-", size=(28, 1)
@ -2153,31 +2206,11 @@ Google Cloud storage: GOOGLE_PROJECT_ID  GOOGLE_APPLICATION_CREDENTIALS\n\
                update_global_gui(full_config, unencrypted=False)
            continue
        if event == "backup_opts.source_type":
-            value = get_key_from_value(
+            source_type = get_key_from_value(
                combo_boxes["backup_opts.source_type"],
                values["backup_opts.source_type"],
            )
-            if value == "stdin_from_command":
-                window["backup_opts.paths"].update(visible=False)
-                window["--ADD-PATHS-FILE-BUTTON--"].update(disabled=True)
-                window["--ADD-PATHS-FOLDER-BUTTON--"].update(disabled=True)
-                window["--ADD-PATHS-MANUALLY--"].update(disabled=True)
-                window["--REMOVE-PATHS--"].update(disabled=True)
-                window["backup_opts.stdin_from_command"].update(disabled=False)
-            elif value == "folder_list":
-                window["backup_opts.paths"].update(visible=True)
-                window["--ADD-PATHS-FILE-BUTTON--"].update(disabled=False)
-                window["--ADD-PATHS-FOLDER-BUTTON--"].update(disabled=False)
-                window["--ADD-PATHS-MANUALLY--"].update(disabled=False)
-                window["--REMOVE-PATHS--"].update(disabled=False)
-                window["backup_opts.stdin_from_command"].update(disabled=True)
-            elif value in ("files_from", "files_from_verbatim", "files_from_raw"):
-                window["backup_opts.paths"].update(visible=True)
-                window["--ADD-PATHS-FILE-BUTTON--"].update(disabled=False)
-                window["--ADD-PATHS-FOLDER-BUTTON--"].update(disabled=True)
-                window["--ADD-PATHS-MANUALLY--"].update(disabled=False)
-                window["--REMOVE-PATHS--"].update(disabled=False)
-                window["backup_opts.stdin_from_command"].update(disabled=True)
+            update_source_layout(source_type)
            continue
        if event in (
            "--ADD-PATHS-FILE--",
--- a/npbackup/translations/config_gui.en.yml
+++ b/npbackup/translations/config_gui.en.yml
@ -130,7 +130,7 @@ en:
  repo_group_config: Repo group configuration
  global_config: Global config
  select_object: Select configuration object
-  create_object: Create new repo or group
+  add_object: Add another repo or group
  delete_object: Delete selected repo or group
  are_you_sure_to_delete: Are you sure you want to delete
  repo_already_exists: Repo already exists
--- a/npbackup/translations/config_gui.fr.yml
+++ b/npbackup/translations/config_gui.fr.yml
@ -131,7 +131,7 @@ fr:
  repo_group_config: Configuration de groupe de dépots
  global_config: Configuration globale
  select_object: Selectionner l'objet à configurer
-  create_object: Créer un nouveau dépot ou groupe
+  add_object: Ajouter un auutre dépot ou groupe
  delete_object: Supprimer le dépot ou groupe actuel
  are_you_sure_to_delete: Êtes-vous sûr de vouloir supprimer le
  repo_already_exists: Dépot déjà existant
--- a/npbackup/translations/main_gui.en.yml
+++ b/npbackup/translations/main_gui.en.yml
@ -45,7 +45,8 @@ en:
  cannot_load_config_keep_current: Cannot load configuration. Keep current configuration
  snapshot_is_empty: Snapshot is empty
  cancel_operation: Are you sure you want to cancel the operation? Try to avoid interrupting write operations
-
+  load_existing_file: Load existing config file
+  
  # logs
  last_messages: Last messages
  error_messages: Error messages
--- a/npbackup/translations/main_gui.fr.yml
+++ b/npbackup/translations/main_gui.fr.yml
@ -45,7 +45,8 @@ fr:
  cannot_load_config_keep_current: Impossible de charger la configuration. Configuration actuelle conservée
  snapshot_is_empty: L'instantané est vide
  cancel_operation: Etes-vous sûr de vouloir annuler l'opération? Essayez d'éviter d'interrompre les opérations d'écriture
- 
+  load_existing_file: Charger fichier de configuration existant
+
  # logs
  last_messages: Last messages
  error_messages: Error messages