From 525e7fce49ef06e5151f526b02d965fe95fe2ae4 Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Thu, 2 Feb 2023 11:37:21 +0100 Subject: [PATCH] Made auto upgrade message more clear in GUI --- npbackup/gui/main.py | 23 ++++++++++++++++------- npbackup/translations/config_gui.en.yml | 3 ++- npbackup/translations/config_gui.fr.yml | 3 ++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/npbackup/gui/main.py b/npbackup/gui/main.py index c6d0134..3175c71 100644 --- a/npbackup/gui/main.py +++ b/npbackup/gui/main.py @@ -46,15 +46,24 @@ THREAD_SHARED_DICT = {} def _about_gui(version_string: str, config_dict: dict) -> None: license_content = LICENSE_TEXT - if check_new_version(config_dict): - new_version = [ - sg.Button( - _t("config_gui.auto_upgrade_launch"), key="autoupgrade", size=(12, 2) - ) - ] + try: + upgrade_server = config_dict['options']["server_url"] + except KeyError: + upgrade_server = None + if upgrade_server: + if check_new_version(config_dict): + new_version = [ + sg.Button( + _t("config_gui.auto_upgrade_launch"), key="autoupgrade", size=(12, 2) + ) + ] + else: + new_version = [ + sg.Text(_t("generic.is_uptodate")) + ] else: new_version = [ - sg.Text(_t("generic.is_uptodate")) + sg.Text(_t("config_gui.auto_upgrade_disabled")) ] try: with open(LICENSE_FILE, "r") as file_handle: diff --git a/npbackup/translations/config_gui.en.yml b/npbackup/translations/config_gui.en.yml index 1573918..d7ce33d 100644 --- a/npbackup/translations/config_gui.en.yml +++ b/npbackup/translations/config_gui.en.yml @@ -60,7 +60,8 @@ en: auto_upgrade_launch: Launch auto upgrade auto_ugprade_will_quit: Warning, launching an upgrade procedure will quit this program without notice. You will have to wait 5 minutes before launching it again for the upgrade to complete auto_upgrade_failed: Auto upgrade procedure failed, see logs for further details - + auto_upgrade_disabled: Auto upgrade is disabled + create_scheduled_task_every: Create scheduled task every scheduled_task_explanation: This is for Windows only. On Linux, please create a crontab entry with `npbackup --backup --config-file /etc/npbackup.conf` scheduled_task_creation_success: Scheduled task created successfuly diff --git a/npbackup/translations/config_gui.fr.yml b/npbackup/translations/config_gui.fr.yml index ebb3afa..eb0b4d6 100644 --- a/npbackup/translations/config_gui.fr.yml +++ b/npbackup/translations/config_gui.fr.yml @@ -60,7 +60,8 @@ fr: auto_upgrade_launch: Lancer une mise à niveau auto_ugprade_will_quit: Attnetion, la procédure de mise à niveau va quitter ce programme sans notification. Vous devrez attendre 5 minutes pour laisser la procédure se terminer avant de relancer le programme auto_upgrade_failed: Procédure de mise à niveau échouée, veuillez consulter les journaux pour plus de détails - + auto_upgrade_disabled: Mise à niveau automatique désactivée + create_scheduled_task_every: Créer une tâche planifiée toutes les scheduled_task_explanation: Uniquement sous Windows. Sous Linux, merci de créer une entrée crontab comme `npbackup --backup --config-file /etc/npbackup.conf` scheduled_task_creation_success: Tâche planifiée crée avec succès