From 1e4b596c89c8e3cbb24787b11f6d0188f08fd82d Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 23 Feb 2025 16:58:25 +0100 Subject: [PATCH] GUI: Improve object deletion UX when no object exists --- npbackup/gui/config.py | 5 ++++- npbackup/translations/config_gui.en.yml | 1 + npbackup/translations/config_gui.fr.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/npbackup/gui/config.py b/npbackup/gui/config.py index e3e6f5a..933ead9 100644 --- a/npbackup/gui/config.py +++ b/npbackup/gui/config.py @@ -199,7 +199,10 @@ def config_gui(full_config: dict, config_file: str): def delete_object(full_config: dict, full_object_name: str) -> dict: object_type, object_name = get_object_from_combo(full_object_name) - result = sg.PopupYesNo( + if not object_type and not object_name: + sg.popup_error(_t("config_gui.no_object_to_delete"), keep_on_top=True) + return full_config + result = sg.popup_yes_no( _t("config_gui.are_you_sure_to_delete") + f" {object_type} {object_name} ?" ) if result == "Yes": diff --git a/npbackup/translations/config_gui.en.yml b/npbackup/translations/config_gui.en.yml index 98a4f78..c171c80 100644 --- a/npbackup/translations/config_gui.en.yml +++ b/npbackup/translations/config_gui.en.yml @@ -136,6 +136,7 @@ en: 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 + no_object_to_delete: No object to delete repo_already_exists: Repo already exists group_already_exists: Group already exists cannot_remove_group_inherited_settings: Cannot remove group inherited settings. Please remove directly in group configuration diff --git a/npbackup/translations/config_gui.fr.yml b/npbackup/translations/config_gui.fr.yml index 9e6f9c4..f687cba 100644 --- a/npbackup/translations/config_gui.fr.yml +++ b/npbackup/translations/config_gui.fr.yml @@ -137,6 +137,7 @@ fr: add_object: Ajouter un autre 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 + no_object_to_delete: Aucun objet à supprimer repo_already_exists: Dépot déjà existant group_already_exists: Groupe déjà existant cannot_remove_group_inherited_settings: Impossible de supprimer une option héritée de groupe. Veuillez supprimer l'option directement dans la configuration de groupe