From 5aa0e86a1af7328b109fd7ba2058f9052157ef04 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 4 Mar 2026 14:21:00 +0600 Subject: [PATCH] Test fix for bootloader saving --- locale/ubinstall-gtk.pot | 3 +++ locale/ubinstall-gtk_ru.po | 4 ++++ source/ubinstall-gtk-components.c | 6 ++++-- source/ubinstall-gtk-saving.c | 1 - source/ubl-strings.h | 3 ++- ubinstall-gtk.glade | 10 ++++++++++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index bd4aeb5..1688abc 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -1931,6 +1931,9 @@ msgid "" "network or the Internet (even over slow connection channels)." msgstr "" +msgid "No modules were found.\nSelect a different installation source." +msgstr "" + msgid "File system label" msgstr "" diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 19dd992..509ef85 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -2069,6 +2069,10 @@ msgstr "" "Позволяет загрузку системы для бездисковых и обычных рабочих станций через " "локальную сеть или Интернет (даже используя \"слабые\" каналы связи)" +msgid "No modules were found.\nSelect a different installation source." +msgstr "Модули не найдены.\n" +Выберите другой источник установки." + msgid "About" msgstr "О программе" diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 2aa05d7..50184cc 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -109,9 +109,11 @@ int yon_os_components_save(main_window *widgets){ yon_config_register(modules_parameter,modules_parameter_command,final); } else { // yon_config_remove_by_key(modules_parameter); - yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + if(main_config.configure_mode) + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),MAIN_COMPONENTS_ALL_SELECTED_LABEL,5,BACKGROUND_IMAGE_INFO_TYPE); + else + yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_highlight_incorrect(widgets->OSSoftwareListBox); - return 0; } return 1; } diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index d581a6c..865eaca 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -359,7 +359,6 @@ int yon_config_save(main_window *widgets){ SERVICES_ENABLE_parameter, GRUB_DEFAULT_parameter, GRUB_TIMEOUT_parameter, - AUTOLOGINUSER_parameter, GRUB_SUPERUSERS_parameter, DOMAIN_parameter, DOMAIN_admanger_parameter, diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 37bc047..881f0f1 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -578,4 +578,5 @@ For more information, visit our website the \"Support Levels\" section.") #define slide_22_title _("Network Boot") #define slide_22_text _("Allows system booting for diskless and standard workstations over a local network or the Internet (even over slow connection channels).") -#define MAIN_COMPONENTS_NOT_FOUND_LABEL _("Main components does not found. Proceed back to installation type selection page and use \"Select sources\" button from below") \ No newline at end of file +#define MAIN_COMPONENTS_NOT_FOUND_LABEL _("No modules were found.\nSelect a different installation source") +#define MAIN_COMPONENTS_ALL_SELECTED_LABEL _("All local modules of the system are selected") \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index c248eae..ae9113c 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -2080,6 +2080,16 @@ agreement True False none + + + True + False + No modules were found. +Select a different installation source. + center + True + + True