From e3ff3ae14d42fcc1b2f3613c15b926c04d5c4a4f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 10:43:50 +0600 Subject: [PATCH] Added debug option --- libublsettingsui-gtk3.pot | 76 +++++++++++++++++++--------------- libublsettingsui-gtk3_ru.po | 76 +++++++++++++++++++--------------- source/libublsettingsui-gtk3.c | 3 ++ source/libublsettingsui-gtk3.h | 2 + 4 files changed, 89 insertions(+), 68 deletions(-) diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index d1d30bb..c2a6abc 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -107,146 +107,154 @@ msgstr "" msgid "Save" msgstr "" -#: source/libublsettingsui-gtk3.h:52 -msgid "Load from specific file" +#: source/libublsettingsui-gtk3.h:51 +msgid "Saving..." msgstr "" #: source/libublsettingsui-gtk3.h:53 -msgid "Load local configuration" +msgid "Load from specific file" msgstr "" #: source/libublsettingsui-gtk3.h:54 -msgid "Load global configuration" +msgid "Load local configuration" msgstr "" #: source/libublsettingsui-gtk3.h:55 +msgid "Load global configuration" +msgstr "" + +#: source/libublsettingsui-gtk3.h:56 msgid "Load" msgstr "" -#: source/libublsettingsui-gtk3.h:57 +#: source/libublsettingsui-gtk3.h:58 msgid "Cancel" msgstr "" -#: source/libublsettingsui-gtk3.h:58 +#: source/libublsettingsui-gtk3.h:59 msgid "Accept" msgstr "" -#: source/libublsettingsui-gtk3.h:59 +#: source/libublsettingsui-gtk3.h:60 msgid "Open" msgstr "" -#: source/libublsettingsui-gtk3.h:61 +#: source/libublsettingsui-gtk3.h:62 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/libublsettingsui-gtk3.h:62 +#: source/libublsettingsui-gtk3.h:63 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" -#: source/libublsettingsui-gtk3.h:63 +#: source/libublsettingsui-gtk3.h:64 msgid "Always redirect to online documentation" msgstr "" -#: source/libublsettingsui-gtk3.h:64 +#: source/libublsettingsui-gtk3.h:65 msgid "Open documentation" msgstr "" -#: source/libublsettingsui-gtk3.h:65 +#: source/libublsettingsui-gtk3.h:66 msgid "Project Home Page" msgstr "" -#: source/libublsettingsui-gtk3.h:66 +#: source/libublsettingsui-gtk3.h:67 msgid "Nothing were chosen" msgstr "" -#: source/libublsettingsui-gtk3.h:67 +#: source/libublsettingsui-gtk3.h:68 msgid "Copyright © 2022 - 2023, UBSoft LLC" msgstr "" -#: source/libublsettingsui-gtk3.h:70 +#: source/libublsettingsui-gtk3.h:71 msgid "Global configuration loading succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:71 +#: source/libublsettingsui-gtk3.h:72 msgid "Local configuration loading succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:72 +#: source/libublsettingsui-gtk3.h:73 msgid "Config loading failed" msgstr "" -#: source/libublsettingsui-gtk3.h:74 +#: source/libublsettingsui-gtk3.h:75 msgid "Local and global configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:75 +#: source/libublsettingsui-gtk3.h:76 msgid "Global configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:76 +#: source/libublsettingsui-gtk3.h:77 msgid "Local configuration saving succeeded." msgstr "" -#: source/libublsettingsui-gtk3.h:78 +#: source/libublsettingsui-gtk3.h:79 msgid "Parameter" msgstr "" -#: source/libublsettingsui-gtk3.h:79 +#: source/libublsettingsui-gtk3.h:80 msgid "Old value" msgstr "" -#: source/libublsettingsui-gtk3.h:80 +#: source/libublsettingsui-gtk3.h:81 msgid "New value" msgstr "" -#: source/libublsettingsui-gtk3.h:81 +#: source/libublsettingsui-gtk3.h:82 msgid "" "Value\n" "(Old/New)" msgstr "" -#: source/libublsettingsui-gtk3.h:83 +#: source/libublsettingsui-gtk3.h:84 msgid "Nothing to save" msgstr "" -#: source/libublsettingsui-gtk3.h:84 +#: source/libublsettingsui-gtk3.h:85 msgid "Saving into local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:85 +#: source/libublsettingsui-gtk3.h:86 msgid "Saving into global configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:86 +#: source/libublsettingsui-gtk3.h:87 msgid "Saving into global and local configuration" msgstr "" -#: source/libublsettingsui-gtk3.h:91 +#: source/libublsettingsui-gtk3.h:92 msgid "Full saving mode" msgstr "" -#: source/libublsettingsui-gtk3.h:92 +#: source/libublsettingsui-gtk3.h:93 msgid "Saving into module" msgstr "" -#: source/libublsettingsui-gtk3.h:93 +#: source/libublsettingsui-gtk3.h:94 msgid "Sandbox mode" msgstr "" -#: source/libublsettingsui-gtk3.h:94 +#: source/libublsettingsui-gtk3.h:95 msgid "Sandbox with profile saving" msgstr "" -#: source/libublsettingsui-gtk3.h:95 +#: source/libublsettingsui-gtk3.h:96 msgid "HDD sandbox" msgstr "" -#: source/libublsettingsui-gtk3.h:96 +#: source/libublsettingsui-gtk3.h:97 msgid "HDD sandbox with profile saving" msgstr "" #: source/libublsettingsui-gtk3.h:98 +msgid "New configuration file creation failed" +msgstr "" + +#: source/libublsettingsui-gtk3.h:99 msgid "Upgrade to root" msgstr "" diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 50ccefe..130a13d 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -109,39 +109,43 @@ msgstr "Сохранить конфигурацию" msgid "Save" msgstr "Сохранить" -#: source/libublsettingsui-gtk3.h:52 +#: source/libublsettingsui-gtk3.h:51 +msgid "Saving..." +msgstr "Сохранение..." + +#: source/libublsettingsui-gtk3.h:53 msgid "Load from specific file" msgstr "Загрузить из файла" -#: source/libublsettingsui-gtk3.h:53 +#: source/libublsettingsui-gtk3.h:54 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/libublsettingsui-gtk3.h:54 +#: source/libublsettingsui-gtk3.h:55 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/libublsettingsui-gtk3.h:55 +#: source/libublsettingsui-gtk3.h:56 msgid "Load" msgstr "Загрузить" -#: source/libublsettingsui-gtk3.h:57 +#: source/libublsettingsui-gtk3.h:58 msgid "Cancel" msgstr "Отмена" -#: source/libublsettingsui-gtk3.h:58 +#: source/libublsettingsui-gtk3.h:59 msgid "Accept" msgstr "Принять" -#: source/libublsettingsui-gtk3.h:59 +#: source/libublsettingsui-gtk3.h:60 msgid "Open" msgstr "Открыть" -#: source/libublsettingsui-gtk3.h:61 +#: source/libublsettingsui-gtk3.h:62 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" -#: source/libublsettingsui-gtk3.h:62 +#: source/libublsettingsui-gtk3.h:63 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." @@ -149,63 +153,63 @@ msgstr "" "Вы будете перенаправлены на сайт с документацией, где страницы помощи\n" "переводятся и поддерживаются сообществом." -#: source/libublsettingsui-gtk3.h:63 +#: source/libublsettingsui-gtk3.h:64 msgid "Always redirect to online documentation" msgstr "Всегда перенаправлять" -#: source/libublsettingsui-gtk3.h:64 +#: source/libublsettingsui-gtk3.h:65 msgid "Open documentation" msgstr "Прочитать справку" -#: source/libublsettingsui-gtk3.h:65 +#: source/libublsettingsui-gtk3.h:66 msgid "Project Home Page" msgstr "Домашняя страница проекта" -#: source/libublsettingsui-gtk3.h:66 +#: source/libublsettingsui-gtk3.h:67 msgid "Nothing were chosen" msgstr "Ничего не было выбрано" -#: source/libublsettingsui-gtk3.h:67 +#: source/libublsettingsui-gtk3.h:68 msgid "Copyright © 2022 - 2023, UBSoft LLC" msgstr "Copyright © 2022 - 2023, ООО «Юбисофт»" -#: source/libublsettingsui-gtk3.h:70 +#: source/libublsettingsui-gtk3.h:71 msgid "Global configuration loading succeeded." msgstr "Успешно загружена глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:71 +#: source/libublsettingsui-gtk3.h:72 msgid "Local configuration loading succeeded." msgstr "Успешно загружена локальная конфигурация" -#: source/libublsettingsui-gtk3.h:72 +#: source/libublsettingsui-gtk3.h:73 msgid "Config loading failed" msgstr "Ошибка загрузки конфига" -#: source/libublsettingsui-gtk3.h:74 +#: source/libublsettingsui-gtk3.h:75 msgid "Local and global configuration saving succeeded." msgstr "Успешно записаны локальная и глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:75 +#: source/libublsettingsui-gtk3.h:76 msgid "Global configuration saving succeeded." msgstr "Успешно записана глобальная конфигурация" -#: source/libublsettingsui-gtk3.h:76 +#: source/libublsettingsui-gtk3.h:77 msgid "Local configuration saving succeeded." msgstr "Успешно записана локальная конфигурация" -#: source/libublsettingsui-gtk3.h:78 +#: source/libublsettingsui-gtk3.h:79 msgid "Parameter" msgstr "Параметр" -#: source/libublsettingsui-gtk3.h:79 +#: source/libublsettingsui-gtk3.h:80 msgid "Old value" msgstr "Старое значение" -#: source/libublsettingsui-gtk3.h:80 +#: source/libublsettingsui-gtk3.h:81 msgid "New value" msgstr "Новое значение" -#: source/libublsettingsui-gtk3.h:81 +#: source/libublsettingsui-gtk3.h:82 msgid "" "Value\n" "(Old/New)" @@ -213,46 +217,50 @@ msgstr "" "Значение\n" "(Старое/Новое)" -#: source/libublsettingsui-gtk3.h:83 +#: source/libublsettingsui-gtk3.h:84 msgid "Nothing to save" msgstr "Нечего сохранять" -#: source/libublsettingsui-gtk3.h:84 +#: source/libublsettingsui-gtk3.h:85 msgid "Saving into local configuration" msgstr "Сохранение в локальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:85 +#: source/libublsettingsui-gtk3.h:86 msgid "Saving into global configuration" msgstr "Сохранение в глобальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:86 +#: source/libublsettingsui-gtk3.h:87 msgid "Saving into global and local configuration" msgstr "Сохранение в глобальный и локальный конфигурационный файл" -#: source/libublsettingsui-gtk3.h:91 +#: source/libublsettingsui-gtk3.h:92 msgid "Full saving mode" msgstr "Полное сохранение" -#: source/libublsettingsui-gtk3.h:92 +#: source/libublsettingsui-gtk3.h:93 msgid "Saving into module" msgstr "Сохранение в модуль" -#: source/libublsettingsui-gtk3.h:93 +#: source/libublsettingsui-gtk3.h:94 msgid "Sandbox mode" msgstr "Полная песочница в ОЗУ" -#: source/libublsettingsui-gtk3.h:94 +#: source/libublsettingsui-gtk3.h:95 msgid "Sandbox with profile saving" msgstr "Песочница с сохранением профиля пользователя" -#: source/libublsettingsui-gtk3.h:95 +#: source/libublsettingsui-gtk3.h:96 msgid "HDD sandbox" msgstr "Полная песочница на HDD" -#: source/libublsettingsui-gtk3.h:96 +#: source/libublsettingsui-gtk3.h:97 msgid "HDD sandbox with profile saving" msgstr "Полная песочница на HDD с сохранением профиля пользователя" #: source/libublsettingsui-gtk3.h:98 +msgid "New configuration file creation failed" +msgstr "Ошибка создания нового файла конфигурации" + +#: source/libublsettingsui-gtk3.h:99 msgid "Upgrade to root" msgstr "Повысить права до root" diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 06638cd..bcb211a 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -182,6 +182,7 @@ void _yon_saving_threaded(char *final_command){ } void on_save_parameters(GtkWidget *self, template_saving_window *window){ + yon_ubl_status_box_render(SAVE_PROCESS_LABEL,BACKGROUND_IMAGE_INFO_TYPE); GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(window->ParametersTree)); int valid = gtk_tree_model_get_iter_first(model,&iter); @@ -656,6 +657,8 @@ int yon_ubl_setup_arguments(int argc, char *argv[],config_str *unfound_arguments break; case 'c': if (system(remove_config_dir_command)){}; break; + case 'd': template_config->debug_mode=1; + break; case 1: template_config->lock_help=1; break; diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 3cb8b94..f4c7486 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -48,6 +48,7 @@ #define SAVE_GLOBAL_LABEL _("Save to global configuration") #define SAVE_CONFIGURATION_LABEL _("Save configuration") #define SAVE_LABEL _("Save") + #define SAVE_PROCESS_LABEL _("Saving...") #define LOAD_CUSTOM_LABEL _("Load from specific file") #define LOAD_LOCAL_LABEL _("Load local configuration") @@ -149,6 +150,7 @@ static template_app_info template_app_information; int load_mode;\ \ int always_open_documentation;\ + int debug_mode; typedef struct { template_config_fields