From 2fde35ed32795afcb6b07bb4f738b7bedc335117 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 24 Dec 2025 18:04:15 +0000 Subject: [PATCH] WIP language save fixes --- locale/ubinstall-gtk.pot | 26 +++++++++++++++++++++++++- locale/ubinstall-gtk_ru.po | 20 +++++++++++++++++++- source/ubinstall-gtk-language.c | 12 +++++++++++- source/ubinstall-gtk-page-switch.c | 2 ++ 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 1d9d178..61922f8 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -1753,4 +1753,28 @@ msgid "" msgstr "" msgid "Selecting software modules to install from the repository. Internet access is required" -msgstr "" \ No newline at end of file +msgstr "" + +msgid "Autorun of application" +msgstr "" + +msgid "Configuring autorun application" +msgstr "" + +msgid "Application:" +msgstr "" + +msgid "Group:" +msgstr "" + +msgid "Application" +msgstr "" + +msgid "Group" +msgstr "" + + + + + + diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index c446d31..753f195 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -3649,4 +3649,22 @@ msgstr "" msgid "Selecting software modules to install from the repository. Internet access is required" -msgstr "Выбор модулей программного обеспечения для установки из репозитория. Требуется доступ в Интернет" \ No newline at end of file +msgstr "Выбор модулей программного обеспечения для установки из репозитория. Требуется доступ в Интернет" + +msgid "Autorun of application" +msgstr "Автозапуск приложений" + +msgid "Configuring autorun application" +msgstr "Настройка автозапуска приложений" + +msgid "Application:" +msgstr "Приложение:" + +msgid "Group:" +msgstr "Группа:" + +msgid "Application" +msgstr "Приложение" + +msgid "Group" +msgstr "Группа" \ No newline at end of file diff --git a/source/ubinstall-gtk-language.c b/source/ubinstall-gtk-language.c index b4132bd..3f9ef34 100644 --- a/source/ubinstall-gtk-language.c +++ b/source/ubinstall-gtk-language.c @@ -67,10 +67,20 @@ void on_locale_accept(GtkWidget *self, language_window *window){ return; } char *locale_str = config(locale_parameter); - GtkTreeIter iter; + GtkTreeIter iter,itar; int size; config_str parsed = yon_char_parse(final,&size,","); for (int i=0;iLanguageList),&itar){ + char *checktarget; + gtk_tree_model_get(GTK_TREE_MODEL(widgets->LanguageList),&itar,3,&checktarget,-1); + if (!strcmp(checktarget,parsed[i])){ + found = 1; + break; + } + } + if (found) continue; char *locale_str = g_hash_table_lookup(main_config.languages,parsed[i]); if (yon_char_is_empty(locale_str)) continue; int parameter_size; diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index a6421fb..3119746 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -134,6 +134,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ case YON_PAGE_COMPLETION: gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL); gtk_widget_set_sensitive(widgets->BackButton,0); + gtk_widget_set_sensitive(widgets->CancelInstallButton,0); gtk_widget_set_sensitive(widgets->NextButton,1); break; case YON_PAGE_SECTIONS: @@ -155,6 +156,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ case YON_PAGE_KEYBOARD: case YON_PAGE_USERS: case YON_PAGE_STARTUP: + case YON_PAGE_APP_STARTUP: case YON_PAGE_LANGUAGE: case YON_PAGE_BOOTLOADER: case YON_PAGE_PACKAGES: