From b9360b7d6bd9a8104ce30f712d93633ffbf9347e Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 10:33:03 +0600 Subject: [PATCH 01/22] Log sensitivity buttons fixed --- source/ubinstall-gtk-log.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk-log.c b/source/ubinstall-gtk-log.c index fecb9a6..f0bd3a6 100644 --- a/source/ubinstall-gtk-log.c +++ b/source/ubinstall-gtk-log.c @@ -2,10 +2,9 @@ void on_log_closed(GtkWidget *, log_window *window){ - main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets"); - gtk_widget_set_sensitive(widgets->ReadFullLogButton,1); - gtk_widget_set_sensitive(widgets->ReadShortLogButton,1); + GtkWidget *button = g_object_get_data(G_OBJECT(window->Window),"button"); + gtk_widget_set_sensitive(button,1); free(window->command); window->Window=NULL; @@ -87,6 +86,7 @@ void yon_read_log(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,log_window * void on_process_log_view(GtkWidget *,main_window *widgets){ log_window *window = yon_log_window_new(); g_object_set_data(G_OBJECT(window->Window),"widgets",widgets); + g_object_set_data(G_OBJECT(window->Window),"button",widgets->ReadFullLogButton); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window); gtk_widget_set_sensitive(widgets->ReadFullLogButton,0); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer"); @@ -101,6 +101,7 @@ void on_process_log_view(GtkWidget *,main_window *widgets){ void on_summary_log_view(GtkWidget *,main_window *widgets){ log_window *window = yon_log_window_new(); g_object_set_data(G_OBJECT(window->Window),"widgets",widgets); + g_object_set_data(G_OBJECT(window->Window),"button",widgets->ReadShortLogButton); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window); gtk_widget_set_sensitive(widgets->ReadShortLogButton,0); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PROGRESS_LOG_LABEL,icon_path,"log_viewer"); From 0043b441e4c1ffa8465d479552d8578f912df73d Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 13:44:49 +0600 Subject: [PATCH 02/22] Changed RDP commands --- source/ubinstall-gtk.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index cf7d9d4..c8e6d68 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -150,8 +150,8 @@ layout && /description:/ {\ #define enable_vnc_command "ubconfig --target system set [desktop] X11VNC[password]=ublinux" #define disable_vnc_command "ubconfig --target system remove [desktop] X11VNC[password]" -#define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC[@users]='freerdp-server.service'" -#define disable_rdp_command "ubconfig --target system remove [desktop] AUTOEXEC[@users]" +#define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC++=freerdp-server.serv" +#define disable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC--=freerdp-server.serv" #define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"", layout, "\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u", NULL) // #define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7" @@ -267,6 +267,7 @@ layout && /description:/ {\ #define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" #define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ", parameters, "; nice ubinstall autoinstall --noautoconfig --noinstall_extra", NULL) +#define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall --config='",path,"' --noautoconfig --noinstall_extra", NULL) #define set_user_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, ";nice ubinstall autoconfig install_extra", NULL) #define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, NULL) @@ -459,7 +460,6 @@ typedef struct GList *slides; GList *chosen_slide; - gboolean force_scenario; char *os_name; config_str partitions; @@ -475,6 +475,8 @@ typedef struct config_str argv; int argc; + + int autoinstall; // if active, installation starts immidiately after app start } config; extern config main_config; From 717fac3501fde678ccc76a200afed7a440a23bcc Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 13:45:48 +0600 Subject: [PATCH 03/22] Changed scenario startup argument with autoinstall --- source/ubinstall-gtk.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index f61ce03..b9399bd 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -907,7 +907,7 @@ void yon_main_window_create(main_window *widgets){ gtk_builder_connect_signals(builder,NULL); if (!yon_char_is_empty(config(AUTOINSTALL_TYPE_INSTALL))){ gtk_widget_show(widgets->StartScenarioButton); - if (main_config.force_scenario){ + if (main_config.autoinstall){ gtk_button_clicked(GTK_BUTTON(widgets->StartScenarioButton)); } } else { @@ -944,6 +944,9 @@ void yon_main_window_create(main_window *widgets){ main_config.part_size_default = default_part_size[0]; } } + // if (main_config.autoinstall){ + + // } } gboolean yon_maximize_start(main_window *widgets){ @@ -996,6 +999,7 @@ int main(int argc, char *argv[]){ struct option long_options[] = { {"dry-run", 0, 0, 'D'}, {"scenario", 0, 0, 's'}, + {"autoinstall", 0, 0, 'A'}, {NULL, 0, NULL, 0} }; optind = 1; @@ -1005,8 +1009,8 @@ int main(int argc, char *argv[]){ case 'D': main_config.dry_run = 1; break; - case 's': - main_config.force_scenario = 1; + case 'A': + main_config.autoinstall = 1; break; default: break; From 64cd872e07c985c178fc6aebfe067428afd635c1 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 13:55:57 +0600 Subject: [PATCH 04/22] --help changes --- locale/ubinstall-gtk.pot | 2 +- locale/ubinstall-gtk_ru.po | 4 ++-- source/ubl-strings.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 02b2f0c..147cc43 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -41,7 +41,7 @@ msgid "Dry run; Installation will not start" msgstr "" #: source/ubl-strings.h:11 -msgid "Set ini file for configuration mode" +msgid "Automatically run installation according to script" msgstr "" #: source/ubl-strings.h:14 source/ubl-strings.h:253 diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index fed073e..2042adb 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -44,8 +44,8 @@ msgid "Dry run; Installation will not start" msgstr "Пробный запуск; установка не начинается." #: source/ubl-strings.h:11 -msgid "Set ini file for configuration mode" -msgstr "Выберите путь до файла конфигурации" +msgid "Automatically run installation according to script" +msgstr "Автоматически запустить установку по сценарию" #: source/ubl-strings.h:14 source/ubl-strings.h:253 msgid "Keyboard layout" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 0bd55e2..81240a6 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -6,7 +6,7 @@ #define ADDITIONAL_ARGS yon_char_unite(\ " --dry-run ",_("Dry run; Installation will not start"),"\n",\ - " --file ", _("Set ini file for configuration mode"),\ + " --autoinstall ", _("Automatically run installation according to script"),\ NULL) #define KEYBOARD_TITLE_LABEL _("Keyboard layout") From 32a472a5b9b5e53e5d381d4fd1509136a609cb19 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 15:08:51 +0600 Subject: [PATCH 05/22] Added Uncheck all toggle button to Module installation page --- locale/ubinstall-gtk.pot | 4 ++++ locale/ubinstall-gtk_ru.po | 6 +++++- source/ubinstall-gtk-components.c | 19 +++++++++++++++++++ source/ubinstall-gtk.c | 3 ++- source/ubinstall-gtk.h | 4 +++- source/ubl-strings.h | 1 + ubinstall-gtk.glade | 13 +++++++++++++ 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 147cc43..9f20241 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -5324,4 +5324,8 @@ msgstr "" #: source/libublsettingsui-gtk3.h:675 msgid "Grant root access" +msgstr "" + +#: source/libublsettingsui-gtk3.h:675 +msgid "Uncheck all" msgstr "" \ No newline at end of file diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 2042adb..03348b7 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -5519,4 +5519,8 @@ msgstr "Вьетнамский (Франция)" #: source/libublsettingsui-gtk3.h:675 msgid "Grant root access" -msgstr "Предоставить root-доступ" \ No newline at end of file +msgstr "Предоставить root-доступ" + +#: source/libublsettingsui-gtk3.h:675 +msgid "Uncheck all" +msgstr "Снять всё" \ No newline at end of file diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 0b1f27a..88d724c 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -308,6 +308,24 @@ void yon_os_components_init(main_window *widgets){ } } +void on_software_uncheck_all(GtkWidget *, main_window *widgets){ + int active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck)); + switch(active){ + case 1:{ + GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList)); + GList *iter; + for(iter = list;iter;iter=iter->next){ + os_row *row = g_object_get_data(iter->data,"kernel_row"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0); + } + } break; + } + gtk_widget_hide(widgets->AdditionalComponentsUncheckAllCheck); + g_signal_handlers_block_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_uncheck_all,widgets); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AdditionalComponentsUncheckAllCheck),0); + g_signal_handlers_unblock_by_func(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),on_software_uncheck_all,widgets); +} + int yon_software_save(main_window *widgets){ GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList)); GList *iter; @@ -355,6 +373,7 @@ int yon_software_check_packages_size(GtkWidget *, main_window *widgets){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ long cur_size = yon_packages_get_installed_size(YON_PACKAGES_ALL,row->name); pacman_size += cur_size; + gtk_widget_show(widgets->AdditionalComponentsUncheckAllCheck); } } } diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index b9399bd..a2c1fb9 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -517,6 +517,7 @@ void yon_main_window_create(main_window *widgets){ widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList"); widgets->AdditionalComponentsOverallSizeLabel = yon_gtk_builder_get_widget(builder,"AdditionalComponentsOverallSizeLabel"); + widgets->AdditionalComponentsUncheckAllCheck = yon_gtk_builder_get_widget(builder,"AdditionalComponentsUncheckAllCheck"); widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress"); widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel"); @@ -700,7 +701,7 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets); - + g_signal_connect(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"toggled",G_CALLBACK(on_software_uncheck_all),widgets); // g_signal_connect(G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->NextInstallationSizeSpin))),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->NextInstallationSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index c8e6d68..0998cbf 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -623,6 +623,7 @@ typedef struct GtkWidget *AdditionalComponentsList; GtkWidget *AdditionalComponentsOverallSizeLabel; + GtkWidget *AdditionalComponentsUncheckAllCheck; GtkWidget *GrubInstallRadio; GtkWidget *GrubUpdateRadio; @@ -1574,4 +1575,5 @@ void yon_user_admin_check(GtkWidget *self, main_window *widgets); void yon_gtk_widget_set_translation(GtkWidget *target); void on_bootloader_user_edit(GtkWidget *, main_window *widgets); void on_bootloader_admin_toggled(GtkWidget *, char *path, main_window *widgets); -void on_bootloader_user_remove(GtkWidget *, main_window *widgets); \ No newline at end of file +void on_bootloader_user_remove(GtkWidget *, main_window *widgets); +void on_software_uncheck_all(GtkWidget *, main_window *widgets); \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 81240a6..cfecdff 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -141,6 +141,7 @@ NULL) #define ERROR_LABEL _("Error has occured while installation process") #define LOG_VIEW_LABEL _("Log exploration") +#define UNCHECK_ALL_LABEL _("Uncheck all") #define CONFIGURATION_TITLE_LABEL _("Configuration") #define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index ca8bbe7..1dc74a9 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -3300,6 +3300,19 @@ Select a different installation source. True False 5 + + + Uncheck all + True + False + True + + + False + True + 0 + + True From f7d1f2bb433d3100682b9bce7c7c3eca248b982a Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 16:05:40 +0600 Subject: [PATCH 06/22] Default timezone getting changes --- source/ubinstall-gtk-region.c | 8 ++++++++ source/ubinstall-gtk.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index c63ffcb..57047a3 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -261,4 +261,12 @@ void yon_region_init(main_window *widgets){ gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0); gtk_switch_set_active(GTK_SWITCH(widgets->RegionSensitiveSwitch),0); } + if (!gtk_switch_get_active(GTK_SWITCH(widgets->RegionSensitiveSwitch))){ + config_str autotimezone = yon_config_load(internet_tomezone_check_command,(int*)&size); + if (size&&!yon_char_is_empty(autotimezone[0])){ + yon_char_remove_last_symbol(autotimezone[0],'\n'); + gtk_entry_set_text(GTK_ENTRY(widgets->RegionEntry),autotimezone[0]); + cc_timezone_map_set_timezone(CC_TIMEZONE_MAP(widgets->RegionMapTarget),autotimezone[0]); + } + } } \ No newline at end of file diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 0998cbf..1eed35a 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -142,6 +142,8 @@ layout && /description:/ {\ }\ \" | sort -u\ " + +#define internet_tomezone_check_command "curl -s ipinfo.io/timezone" #define ubinstall_dry_run_command "ubinstall --dry-run" #define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release" From 76c170fab3a1cbbe4cef225d57b40d9b9709402c Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 16:32:01 +0600 Subject: [PATCH 07/22] Fixed current system language parameter loading --- source/ubinstall-gtk-language.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/ubinstall-gtk-language.c b/source/ubinstall-gtk-language.c index 29b100f..bc8bcda 100644 --- a/source/ubinstall-gtk-language.c +++ b/source/ubinstall-gtk-language.c @@ -23,9 +23,7 @@ void yon_language_update(main_window *widgets){ if (!strcmp(config_languages,parsed[0])){ gtk_list_store_set(widgets->LanguageList,&iter,0,1,-1); } - } else if (yon_char_is_empty(config_languages)&&!i){ - gtk_list_store_set(widgets->LanguageList,&iter,0,1,-1); - } + } yon_char_parsed_free(parsed,parsed_size); } } From 37da818e42708ae072a5b320de5f2e37bf1c5c37 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 17:03:28 +0600 Subject: [PATCH 08/22] Test fix for numlock saving --- source/ubinstall-gtk-keyboard.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index a7e3538..e82afa0 100644 --- a/source/ubinstall-gtk-keyboard.c +++ b/source/ubinstall-gtk-keyboard.c @@ -42,7 +42,11 @@ int yon_keyboard_save(main_window *widgets){ case 2: numlock = "off"; break; } - yon_config_register(num_lock_boot_parameter,num_lock_boot_parameter_command,numlock); + if (!yon_char_is_empty(numlock)){ + yon_config_register(num_lock_boot_parameter,num_lock_boot_parameter_command,numlock); + } else { + yon_config_remove_by_key(num_lock_boot_parameter); + } if (!main_config.configure_mode){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,xkbmodel_parameter,xkbmodel_parameter,num_lock_boot_parameter,NULL); From bb4eee981b5b94a117d270969b828ba8238a9716 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 17:27:50 +0600 Subject: [PATCH 09/22] Fixed numlock parameter name --- source/ubinstall-gtk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 1eed35a..a498012 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -193,7 +193,7 @@ layout && /description:/ {\ #define lang_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG']" #define locale_parameter "AUTOINSTALL[ubconfig set [locale] LOCALE]" #define locale_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [locale] LOCALE']" -#define num_lock_boot_parameter "AUTOINSTALL['ubconfig set [keyboard] NUMLOCK']" +#define num_lock_boot_parameter "AUTOINSTALL[ubconfig set [keyboard] NUMLOCK]" #define num_lock_boot_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [keyboard] NUMLOCK']" /*------------------------------------------------------------*/ From 3ccfe6629b41c802afe56132e7085fcdd9fee6af Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 17:47:33 +0600 Subject: [PATCH 10/22] Fixed Autorun of services page title --- locale/ubinstall-gtk.pot | 4 ---- locale/ubinstall-gtk_ru.po | 4 ---- source/ubl-strings.h | 1 - ubinstall-gtk.glade | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 9f20241..d57bbe4 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -1515,10 +1515,6 @@ msgstr "" msgid "Setting up system users" msgstr "" -#: source/ubl-strings.h:421 -msgid "Startup" -msgstr "" - #: source/ubl-strings.h:422 msgid "Configuring startup services" msgstr "" diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 03348b7..cc0638e 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -1539,10 +1539,6 @@ msgstr "Введите свой часовой пояс" msgid "Setting up system users" msgstr "Настройка пользователей системы" -#: source/ubl-strings.h:421 -msgid "Startup" -msgstr "Автозагрузка" - #: source/ubl-strings.h:422 msgid "Configuring startup services" msgstr "Настройка служб автозагрузки" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index cfecdff..b1f8c75 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -428,7 +428,6 @@ NULL) // #define _LABEL _("System language") // #define _LABEL _("Specify your preferred system languages") // #define _LABEL _("Setting up system users") -// #define _LABEL _("Startup") // #define _LABEL _("Configuring startup services") // #define _LABEL _("Starting the system") // #define _LABEL _("Setting up system boot") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 1dc74a9..c5efbb9 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -5561,7 +5561,7 @@ Select a different installation source. True False - Startup + Autorun of services True 0 From 9a3cd9eb152792adf958514f92af6bb281ccd680 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 18:02:32 +0600 Subject: [PATCH 11/22] Moved all parameters output in debug mode --- source/ubinstall-gtk-config-hub.c | 1 + source/ubinstall-gtk-users.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubinstall-gtk-config-hub.c b/source/ubinstall-gtk-config-hub.c index f75f7b5..2f717c5 100644 --- a/source/ubinstall-gtk-config-hub.c +++ b/source/ubinstall-gtk-config-hub.c @@ -166,6 +166,7 @@ int yon_configuration_hub_save(main_window *widgets){ } if (users)yon_char_parsed_free(users,users_size); } + yon_debug_output("%s\n",yon_config_get_all_info()); return 1; } diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index 4d40bb7..5cb1ff5 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -48,7 +48,6 @@ int yon_users_save(main_window *widgets){ yon_char_parsed_free(parameters,size); } } - yon_debug_output("%s\n",yon_config_get_all_info()); return 1; } From 54eee56b60af29ccf9878d6d6bb7d95f7ed5475d Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 18:25:32 +0600 Subject: [PATCH 12/22] Added autorun services and apps sorting --- source/ubinstall-gtk-startup-apps.c | 9 ++++++--- source/ubinstall-gtk-startup-services.c | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/source/ubinstall-gtk-startup-apps.c b/source/ubinstall-gtk-startup-apps.c index d150db4..22d35d2 100644 --- a/source/ubinstall-gtk-startup-apps.c +++ b/source/ubinstall-gtk-startup-apps.c @@ -45,10 +45,13 @@ void yon_startup_apps_setup(main_window *widgets){ GtkTreeIter iter; gtk_list_store_clear(widgets->StartupAppsList); int size; - config_str apps = yon_resource_open_file(apps_list_path,&size); - for (int i=1;iStartupAppsList,&iter); gtk_list_store_set(widgets->StartupAppsList,&iter,0,0,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1); diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index fbc1bd7..df22c6b 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -54,7 +54,10 @@ void yon_startup_services_setup(main_window *widgets){ gtk_list_store_clear(widgets->StartupList); int size; config_str services = yon_resource_open_file(services_list_path,&size); - for (int i=1;i Date: Mon, 16 Mar 2026 18:33:06 +0600 Subject: [PATCH 13/22] Servcie window height changes --- ubinstall-gtk-service-window.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubinstall-gtk-service-window.glade b/ubinstall-gtk-service-window.glade index 001e566..f7019fd 100644 --- a/ubinstall-gtk-service-window.glade +++ b/ubinstall-gtk-service-window.glade @@ -15,7 +15,7 @@ 500 - 250 + 167 False True From 43a3645bbe86efb60c84d58d21089e6b32b690c0 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 16 Mar 2026 18:38:13 +0600 Subject: [PATCH 14/22] Services and applications autostart add/edit window labels places switched --- ubinstall-gtk-service-window.glade | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ubinstall-gtk-service-window.glade b/ubinstall-gtk-service-window.glade index f7019fd..0f7923d 100644 --- a/ubinstall-gtk-service-window.glade +++ b/ubinstall-gtk-service-window.glade @@ -3,6 +3,7 @@ + True False @@ -54,10 +55,10 @@ False 5 - + True False - Unit: + Service: 0 @@ -90,10 +91,10 @@ False 5 - + True False - Service: + Unit: 0 @@ -209,11 +210,4 @@ - - - - - - - From f7d5c282a587098f394fe51dfafd04b186cddb56 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 17 Mar 2026 11:11:05 +0600 Subject: [PATCH 15/22] Fixed autorun of applications custom loading --- source/ubinstall-gtk-startup-apps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubinstall-gtk-startup-apps.c b/source/ubinstall-gtk-startup-apps.c index 22d35d2..65a42c9 100644 --- a/source/ubinstall-gtk-startup-apps.c +++ b/source/ubinstall-gtk-startup-apps.c @@ -100,7 +100,7 @@ void yon_startup_apps_setup(main_window *widgets){ if (parsed_size&&parsed){ for (int i=0;iStartupAppsList,&iter); - gtk_list_store_set(widgets->StartupAppsList,&iter,0,0,2,parsed[i],-1); + gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,2,parsed[i],-1); } } yon_char_parsed_free(parsed,parsed_size); From 448f5d4ba5cc252e877d5afa293390bea9b7628c Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 17 Mar 2026 11:24:48 +0600 Subject: [PATCH 16/22] Removed 'Login without password request' button --- source/ubinstall-gtk-bootloader.c | 31 ++++++++++++++-------------- source/ubinstall-gtk-install-start.c | 8 +++++-- source/ubinstall-gtk.c | 2 +- source/ubinstall-gtk.h | 2 +- ubinstall-gtk.glade | 2 -- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index bedb05f..91e7178 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -7,12 +7,12 @@ int yon_bootloader_save(main_window *widgets){ } else { yon_config_remove_by_key(GRUB_TIMEOUT_parameter); } - if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ - yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no"); - } else { - yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); + // if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ + // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no"); + // } else { + // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); - } + // } { int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -439,7 +439,6 @@ char *yon_bootloader_get_os_name(char *parameter){ void yon_bootloader_interface_update(main_window *widgets){ char *timeout = config(GRUB_TIMEOUT_parameter); char *admins = config(GRUB_SUPERUSERS_parameter); - char *autologin = config(AUTOLOGINUSER_parameter); char *os = config(GRUB_DEFAULT_parameter); int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -452,9 +451,9 @@ void yon_bootloader_interface_update(main_window *widgets){ } else { gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_MENU_ITEM_LABEL); } - if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){ - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); - } else { + // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){ + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); + // } else { int admins_size; config_str admins_parsed = yon_char_parse(admins,&admins_size,","); for (int i=0;iBootloadUsersList,&iter); gtk_list_store_set(widgets->BootloadUsersList,&iter,0,yon_char_parsed_check_exist(admins_parsed,admins_size,key),1,key,2,value,-1); } - } + // } } @@ -474,7 +473,7 @@ void yon_bootloader_init(main_window *widgets){ gtk_list_store_clear(widgets->BootloadUsersList); char *timeout = config(GRUB_TIMEOUT_parameter); char *os = config(GRUB_DEFAULT_parameter); - char *autologin = config(AUTOLOGINUSER_parameter); + // char *autologin = config(AUTOLOGINUSER_parameter); char *admins = config(GRUB_SUPERUSERS_parameter); int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -495,13 +494,13 @@ void yon_bootloader_init(main_window *widgets){ } else { gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_BOOTLOAD_MENU_ITEM_LABEL); } - if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"no")||!strcmp(autologin,"disable"))){ - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); + // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"no")||!strcmp(autologin,"disable"))){ + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); - } else { - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); + // } else { + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); - } + // } { int admins_size; config_str admins_parsed = yon_char_parse(admins,&admins_size,","); diff --git a/source/ubinstall-gtk-install-start.c b/source/ubinstall-gtk-install-start.c index 05a970a..ee59796 100644 --- a/source/ubinstall-gtk-install-start.c +++ b/source/ubinstall-gtk-install-start.c @@ -9,9 +9,13 @@ void yon_quick_install(GtkWidget *self, main_window *widgets){ if (!yon_installation_check_packages_size(widgets)) return; main_config.save_configured=1; gtk_widget_hide(self); - gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); - pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); + gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); + // pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + if (!yon_char_is_empty(main_config.config_load_path)){ + char *command = quick_install_command(main_config.config_load_path); + yon_launch_app_with_arguments(command,NULL); + } yon_page_init(widgets,YON_PAGE_INSTALLATION); yon_page_update(widgets); } diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index a2c1fb9..c6bc354 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -583,7 +583,7 @@ void yon_main_window_create(main_window *widgets){ widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin"); widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry"); widgets->BootloadDefaulOSButton = yon_gtk_builder_get_widget(builder,"BootloadDefaulOSButton"); - widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch"); + // widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch"); widgets->BootloadUserTree = yon_gtk_builder_get_widget(builder,"BootloadUserTree"); widgets->BootloadUserAddButton = yon_gtk_builder_get_widget(builder,"BootloadUserAddButton"); widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton"); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index a498012..3347ac2 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -738,7 +738,7 @@ typedef struct GtkWidget *BootloadTimerSpin; GtkWidget *BootloadDefaultOSEntry; GtkWidget *BootloadDefaulOSButton; - GtkWidget *BootloadNoPasswordSwitch; + // GtkWidget *BootloadNoPasswordSwitch; GtkWidget *BootloadUserAddButton; GtkWidget *BootloadUserEditButton; GtkCellRenderer *BootloadAdminCheckCell; diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index c5efbb9..65e8b7a 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -6297,12 +6297,10 @@ Select a different installation source. - True False 5 - True True From 459df6deea29664602cac4a07d1648d559cae534 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 17 Mar 2026 11:30:52 +0600 Subject: [PATCH 17/22] Russian locale fix --- locale/ubinstall-gtk_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index cc0638e..0585ff5 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -1091,7 +1091,7 @@ msgstr "Имя пользователя:" #: source/ubl-strings.h:307 msgid "User password:" -msgstr "Паоль пользователя:" +msgstr "Пароль пользователя:" #: source/ubl-strings.h:308 msgid "Add user" From e7b7dfe5c8cf599440181f76cad588439792c12e Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 17 Mar 2026 11:39:34 +0600 Subject: [PATCH 18/22] Fixed bootload user edit window title --- locale/ubinstall-gtk.pot | 4 ++++ locale/ubinstall-gtk_ru.po | 4 ++++ source/ubinstall-gtk-bootloader.c | 2 +- source/ubl-strings.h | 1 + ubinstall-gtk.glade | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index d57bbe4..d2e39c6 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -1081,6 +1081,10 @@ msgstr "" msgid "Add user" msgstr "" +#: source/ubl-strings.h:308 +msgid "Edit user" +msgstr "" + #: source/ubl-strings.h:309 source/ubl-strings.h:329 msgid "Choose a path for configuration file" msgstr "" diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 0585ff5..226d786 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -1097,6 +1097,10 @@ msgstr "Пароль пользователя:" msgid "Add user" msgstr "Добавить пользователя" +#: source/ubl-strings.h:308 +msgid "Edit user" +msgstr "Редактировать пользователя" + #: source/ubl-strings.h:309 source/ubl-strings.h:329 msgid "Choose a path for configuration file" msgstr "Выберите путь до файла конфигурации" diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index 91e7178..97161c5 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -160,7 +160,7 @@ void on_bootloader_user_edit(GtkWidget *, main_window *widgets){ bootloader_user_window *window = yon_bootloader_user_window_new(); g_object_set_data(G_OBJECT(window->AcceptButton),"widgets",widgets); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_bootloader_user_accept),window); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),NULL,icon_path,"bootloader_window"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),EDIT_USER_LABEL,icon_path,"bootloader_window"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->AdminCheck),admin); gtk_entry_set_text(GTK_ENTRY(window->UsernameEntry),username); gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),password); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index b1f8c75..702fa7f 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -298,6 +298,7 @@ NULL) #define NOT_ENOUGH_SPACE_LABEL _("The size of the new disk partition is larger than the size of the selected partition") //Размер нового раздела диска превышает размер выбранного раздела #define MODULE_NOT_ENOUGH_SPACE_LABEL _("There is not enough space to install modules") #define PACKAGE_NOT_ENOUGH_SPACE_LABEL _("There is not enough space to install packages") +#define EDIT_USER_LABEL _("Edit user") // #define _LABEL _("Chosen size:") // #define _LABEL _("Overall size:") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 65e8b7a..75bacc4 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -6431,6 +6431,7 @@ Select a different installation source. True True True + Edit user image43