From 643cbb2de635f7380611d64994a5edc84e3c2fc0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 4 Jun 2025 03:50:58 +0000 Subject: [PATCH 1/3] Confirmation dialog changes --- source/ubl-strings.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 324a472..c258ece 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -65,12 +65,12 @@ #define ERROR_LABEL _("Error has occured") #define SWITCH_OFF_ERROR_LABEL _("Service were not stopped") -#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit?"),"\n\n- ",target,"\n\n",_("The system may become unstable."),NULL) -#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit?"),"\n\n- ",target,"",NULL) -#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit?"),"\n\n- ",target,"\n\n",_("The system may become unstable."),NULL) -#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit?"),"\n\n- ",target,"\n\n",_("The system may become unstable."),NULL) -#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit?"),"\n\n- ",target,"",NULL) -#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit?"),"\n\n- ",target,"\n\n",_("The system may become unstable."),NULL) +#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) +#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit?"),"\n\n ",target,"",NULL) +#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) +#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) +#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit?"),"\n\n ",target,"",NULL) +#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) #define RELOAD_SYSTEM_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload system units settings?"),"\n\n",_("The system may become unstable."),NULL) #define RELOAD_USER_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload user units settings?"),"\n\n",_("The system may become unstable."),NULL) #define SESSION_ACTIVATE_TOOLTIP_LABEL(target) yon_char_unite(_("Are you sure you want to switch on session")," ID-",target,"?",NULL) From 24996fc9f0c6c5735bf69c53412b09ac99dc17df Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 4 Jun 2025 09:56:04 +0000 Subject: [PATCH 2/3] Dialog window change --- locale/ubl-settings-services_ru.po | 24 ++++++++++++------------ source/ubl-settings-services.c | 1 - source/ubl-strings.h | 12 ++++++------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/locale/ubl-settings-services_ru.po b/locale/ubl-settings-services_ru.po index d9df924..71bcadf 100644 --- a/locale/ubl-settings-services_ru.po +++ b/locale/ubl-settings-services_ru.po @@ -216,8 +216,8 @@ msgid "Service were not stopped" msgstr "Сервис не был остановлен" #: source/ubl-strings.h:68 -msgid "Are you sure want to stop unit?" -msgstr "Вы уверены, что хотите выключить юнит?" +msgid "Are you sure want to stop unit" +msgstr "Вы уверены, что хотите выключить юнит" #: source/ubl-strings.h:68 source/ubl-strings.h:69 source/ubl-strings.h:70 #: source/ubl-strings.h:71 source/ubl-strings.h:72 source/ubl-strings.h:73 @@ -226,24 +226,24 @@ msgid "The system may become unstable." msgstr "Возможна нестабильная работа системы." #: source/ubl-strings.h:69 -msgid "Are you sure want to start unit?" -msgstr "Вы уверены, что хотите запустить юнит?" +msgid "Are you sure want to start unit" +msgstr "Вы уверены, что хотите запустить юнит" #: source/ubl-strings.h:70 -msgid "Are you sure want to restart unit?" -msgstr "Вы уверены, что хотите перезапустить юнит?" +msgid "Are you sure want to restart unit" +msgstr "Вы уверены, что хотите перезапустить юнит" #: source/ubl-strings.h:71 -msgid "Are you sure want to reload unit?" -msgstr "Вы уверены, что хотите перезагрузить юнит?" +msgid "Are you sure want to reload unit" +msgstr "Вы уверены, что хотите перезагрузить юнит" #: source/ubl-strings.h:72 -msgid "Are you sure want to enable unit?" -msgstr "Вы уверены, что хотите включить автозапуск для юнита?" +msgid "Are you sure want to enable unit" +msgstr "Вы уверены, что хотите включить автозапуск для юнита" #: source/ubl-strings.h:73 -msgid "Are you sure want to disable unit?" -msgstr "Вы уверены, что хотите отключить автозапуск для юнита?" +msgid "Are you sure want to disable unit" +msgstr "Вы уверены, что хотите отключить автозапуск для юнита" #: source/ubl-strings.h:74 msgid "Are you sure want to reload system units settings?" diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index c0e100a..1bc19e9 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -398,7 +398,6 @@ void on_system_autostart_clicked(GtkCellRenderer *, char *path, main_window *wid gtk_list_store_set(GTK_LIST_STORE(model),&iter,3,!status,-1); } } - } gboolean sort_bool(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,gpointer col){ diff --git a/source/ubl-strings.h b/source/ubl-strings.h index c258ece..131f94d 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -65,12 +65,12 @@ #define ERROR_LABEL _("Error has occured") #define SWITCH_OFF_ERROR_LABEL _("Service were not stopped") -#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) -#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit?"),"\n\n ",target,"",NULL) -#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) -#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) -#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit?"),"\n\n ",target,"",NULL) -#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit?"),"\n\n ",target,"\n\n",_("The system may become unstable."),NULL) +#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) +#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit"),"\n\n ",target,"?",NULL) +#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) +#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) +#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit"),"\n\n ",target,"",NULL) +#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) #define RELOAD_SYSTEM_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload system units settings?"),"\n\n",_("The system may become unstable."),NULL) #define RELOAD_USER_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload user units settings?"),"\n\n",_("The system may become unstable."),NULL) #define SESSION_ACTIVATE_TOOLTIP_LABEL(target) yon_char_unite(_("Are you sure you want to switch on session")," ID-",target,"?",NULL) From f6e65f45d024442c21930ff5542eba4a0fb99fcc Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 5 Jun 2025 05:12:11 +0000 Subject: [PATCH 3/3] Dialog windows changes --- source/ubl-strings.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 131f94d..f600945 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -65,12 +65,12 @@ #define ERROR_LABEL _("Error has occured") #define SWITCH_OFF_ERROR_LABEL _("Service were not stopped") -#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) -#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit"),"\n\n ",target,"?",NULL) -#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) -#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) -#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit"),"\n\n ",target,"",NULL) -#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit"),"\n\n ",target,"?\n\n",_("The system may become unstable."),NULL) +#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to stop unit"),"?\n\n",_("The system may become unstable."),NULL) +#define SERVICE_START_WARNING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to start unit"),"?\n\n",NULL) +#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to restart unit"),"?\n\n",_("The system may become unstable."),NULL) +#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to reload unit"),"?\n\n",_("The system may become unstable."),NULL) +#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to enable unit"),"?\n\n",NULL) +#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite("",target,"\n\n",_("Are you sure want to disable unit"),"?\n\n",_("The system may become unstable."),NULL) #define RELOAD_SYSTEM_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload system units settings?"),"\n\n",_("The system may become unstable."),NULL) #define RELOAD_USER_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload user units settings?"),"\n\n",_("The system may become unstable."),NULL) #define SESSION_ACTIVATE_TOOLTIP_LABEL(target) yon_char_unite(_("Are you sure you want to switch on session")," ID-",target,"?",NULL)