diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 2eac892..36b0968 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -373,7 +373,7 @@ msgstr "Установка GRUB" #: source/ubl-strings.h:81 msgid "Installing the GRUB bootloader into the MBR or EFI partition" -msgstr "Установка загрузчика GRUB в MBR или EFI-партицию" +msgstr "Установка загрузчика GRUB в MBR или EFI-раздел" #: source/ubl-strings.h:82 msgid "GRUB update" diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 577c03d..31b59da 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -299,7 +299,7 @@ gboolean yon_os_components_load(main_window *widgets){ for(iter = list;iter;iter=iter->next){ os_row *row = g_object_get_data(iter->data,"kernel_row"); char *target = row->source; - if (yon_char_parsed_check_exist(parsed,parsed_size,target)>-1){ + if (!parsed_size||!strcmp(parsed[0],"auto")||yon_char_parsed_check_exist(parsed,parsed_size,target)>-1){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); } else { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0); @@ -326,7 +326,8 @@ void yon_os_components_init(main_window *widgets){ free(row); gtk_widget_destroy(GTK_WIDGET(iter->data)); } - gtk_overlay_add_overlay(GTK_OVERLAY(widgets->OSOverlay),widgets->OSSpinner); + if (!gtk_widget_get_parent(widgets->OSSpinner)) + gtk_overlay_add_overlay(GTK_OVERLAY(widgets->OSOverlay),widgets->OSSpinner); gtk_spinner_start(GTK_SPINNER(widgets->OSSpinner)); gtk_widget_show(widgets->OSSpinner); g_thread_new("geag",(GThreadFunc)yon_modules_list_load,widgets); diff --git a/source/ubinstall-gtk-log.c b/source/ubinstall-gtk-log.c index f0bd3a6..a9fee30 100644 --- a/source/ubinstall-gtk-log.c +++ b/source/ubinstall-gtk-log.c @@ -25,7 +25,7 @@ log_window *yon_log_window_new(){ window->Window = yon_gtk_builder_get_widget(builder,"MainWindow"); window->ScrollWindow = yon_gtk_builder_get_widget(builder,"ScrollWindow"); window->HeadLabel = yon_gtk_builder_get_widget(builder,"headerTopic"); - window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel"); + window->LogTextView = yon_gtk_builder_get_widget(builder,"LogTextView"); window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); window->ScrollToEndCheck = yon_gtk_builder_get_widget(builder,"ScrollToEndCheck"); window->monitor = NULL; @@ -53,7 +53,11 @@ void yon_read_log(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,log_window * g_mutex_unlock(&main_config.progress_mutex); if (size){ char *final = yon_char_parsed_to_string(parsed,size,""); - gtk_label_set_text(GTK_LABEL(window->LogLabel),final); + GtkTextIter start_iter, end_iter; + gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&start_iter); + gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&end_iter); + gtk_text_buffer_delete(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),&start_iter,&end_iter); + gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->LogTextView)),final,strlen(final)); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ScrollToEndCheck))){ if (!window->timer_id){ window->timer_id = g_idle_add((GSourceFunc)yon_log_scroll,window); diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 1f01c48..27a6221 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -191,6 +191,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ gtk_widget_set_sensitive(widgets->BackButton,1); gtk_widget_set_sensitive(widgets->NextButton,1); gtk_widget_set_sensitive(widgets->CancelInstallButton,1); + gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),CANCEL_LABEL); break; } diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index ed67324..89c4232 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -13,16 +13,24 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ switch (type){ case YON_CONFIG_GLOBAL: yon_config_load_config(type,config_get_command("global"),NULL); + main_config.config_load_path = yon_char_new("global"); break; case YON_CONFIG_LOCAL: yon_config_load_config(type,config_get_command("system"),NULL); + main_config.config_load_path = yon_char_new("system"); break; case YON_CONFIG_CUSTOM: - char *path = NULL; - path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN); - if (!yon_char_is_empty(path)){ + if (yon_char_is_empty(main_config.config_load_path)){ + char *path = NULL; + path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN); + if (!yon_char_is_empty(path)){ + main_config.config_load_path = yon_char_new(path); + yon_config_clean(); + yon_config_load_config(type,config_get_command(path),NULL); + } + } else { yon_config_clean(); - yon_config_load_config(type,config_get_command(path),NULL); + yon_config_load_config(type,config_get_command(main_config.config_load_path),NULL); } break; default: @@ -44,6 +52,10 @@ void on_config_local_load(GtkWidget *,main_window *widgets){ } void on_config_custom_load(GtkWidget *,main_window *){ + if (!yon_char_is_empty(main_config.config_load_path)){ + free(main_config.config_load_path); + main_config.config_load_path = NULL; + } yon_load_proceed(YON_CONFIG_CUSTOM); main_config.load_mode=YON_CONFIG_CUSTOM; } @@ -414,8 +426,8 @@ int yon_config_save(main_window *widgets){ } void yon_config_restore(main_window *){ - yon_load_proceed(main_config.load_mode); - yon_launch("ubconfig --source system remove [autoinstall]"); + yon_load_proceed(main_config.load_mode); + yon_launch(yon_debug_output("%s\n","ubconfig --source system remove [autoinstall]")); yon_config_to_default(); int size; config_str parameters = yon_config_get_save_parameters(&size); diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index e20f7b7..df8239c 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -137,9 +137,21 @@ void yon_user_init(main_window *widgets){ if (!main_config.configure_mode){ int size = 0; config_str users = yon_config_get_all_by_key(USERADD_parameter_search,&size); + for(int i=0;iUserRootPasswordCombo)); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->UserRootPasswordCombo),NULL,DEFAULT_LABEL); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index a4b7e56..d50b76c 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -905,7 +905,7 @@ typedef struct GtkWidget *ScrollWindow; GtkWidget *StatusBox; GtkWidget *HeadLabel; - GtkWidget *LogLabel; + GtkWidget *LogTextView; GtkWidget *ScrollToEndCheck; GFileMonitor *monitor; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 07bed9d..3d93fd7 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -151,7 +151,8 @@ NULL) #define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.") #define SCROLL_TO_END_LABEL _("Scroll to the end") -#define ADMINISTRATOR_LABEL _("Administrator") +#define ADMINISTRATOR_LABEL _("Empty default user") +// #define ADMINISTRATOR_LABEL _("Administrator") #define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia") #define READ_INSTALL_LOG_LABEL _("Read installation log") diff --git a/ubinstall-gtk-log-view.glade b/ubinstall-gtk-log-view.glade index 3c9904e..cc26655 100644 --- a/ubinstall-gtk-log-view.glade +++ b/ubinstall-gtk-log-view.glade @@ -1,8 +1,15 @@ - + + + True + False + True + 0 + 0 + 200 400 @@ -66,12 +73,9 @@ True False - + True - False - True - 0 - 0 + True diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index f8a9ff0..402dced 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -8569,22 +8569,73 @@ or continue working in the system Live environment. vertical 5 - + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + Start GParted + image36 + + + + False + True + end + 1 + + + + + True + True + True + image35 + + + + False + True + end + 2 + + False @@ -8593,303 +8644,258 @@ or continue working in the system Live environment. - + True True - True - Start GParted - image36 - + in + 50 + + + True + True + DevicesList + 0 + + + Device + + + + 0 + + + + + + + Description + + + + 1 + + + + + + + Label + + + + 2 + + + + + + + Size + + + + 3 + + + + + + + Serial + + + + 4 + + + + + + - False + True True - end 1 + + + False + False + + + + + True + False + vertical - + True - True - True - image35 - + False + Select partiton: + 0 False True - end - 2 + 0 - - - False - True - 0 - - - - - True - True - in - 105 - 350 - + True True - DevicesList - 0 - - - + in + 50 - - Device + + True + True + PartitionsList + 0 - - + + Section + + + 0 - + + + - - - - - Description - - + + File system + + + + 3 + + + + + + + Label + + + + 4 + + + + + + + File system label + + + + 10 + + + + + + + Size + + + 1 - + + + - - - - - Label - - + + Free (%) + + + 2 - + + + - - - - - Size - - - 3 - + + Flags + + + + 11 + + + - - - - - Serial - - - 4 - + + Mount point + + + + 9 + + + + + True + True + 1 + - False - True - 1 + True + True False True - 0 + 2 + + + False + True + 2 + + + + + True + False + vertical True False + 5 + 5 + 5 + 5 + 5 + 5 vertical + 5 - + True False - Select partiton: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - 350 + 5 - - True - True - PartitionsList - 0 - - - - - - Section - - - - 0 - - - - - - - File system - - - - 3 - - - - - - - Label - - - - 4 - - - - - - - File system label - - - - 10 - - - - - - - Size - - - - 1 - - - - - - - Free (%) - - - - 2 - - - - - - - Flags - - - - 11 - - - - - - - Mount point - - - - 9 - - - - - - - - - False - True - 1 - - - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - 5 - - - True - False - 5 - - + True False New partition: @@ -9315,22 +9321,79 @@ or continue working in the system Live environment. vertical 5 - + + + + + + + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + Start GParted + image1 + + + + False + True + end + 1 + + + + + True + True + True + image37 + + + + False + True + end + 2 + + False @@ -9339,268 +9402,225 @@ or continue working in the system Live environment. - + True True - True - Start GParted - image1 - + in + 50 + + + True + True + DevicesList + 0 + + + Device + + + + 0 + + + + + + + Description + + + + 1 + + + + + + + Label + + + + 2 + + + + + + + Size + + + + 3 + + + + + + + Serial + + + + 4 + + + + + + - False + True True - end 1 - - - True - True - True - image37 - - - - False - True - end - 2 - - - False - True - 0 + True + True - + True - True - in - 105 + False + vertical - + True - True - DevicesList - 0 - - - - - - Device - - - - 0 - - - - - - - Description - - - - 1 - - - - - - - Label - - - - 2 - - - - - - - Size - - - - 3 - - - - - - - Serial - - - - 4 - - - - + False + Select partiton: + 0 + + False + True + 0 + - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - False - Select partiton: - 0 - - - False - True - 0 - - - - - True - True - in - 128 - + True True - PartitionsList - 0 - - - + in + 50 - - Section + + True + True + PartitionsList + 0 - - + + Section + + + 0 - + + + - - - - - File system - - + + File system + + + 3 - + + + - - - - - Label - - + + Label + + + 4 - + + + - - - - - File system label - - + + File system label + + + 10 - + + + - - - - - Size - - + + Size + + + 1 - + + + - - - - - Free (%) - - + + Free (%) + + + 2 - + + + - - - - - Flags - - + + Flags + + + 11 - + + + - - - - - Mount point - - + + Mount point + + + 9 - + + + + + True + True + 1 + - True - True - 1 + True + True - True + False True - 1 + 2 @@ -10065,104 +10085,227 @@ separately into the selected partition. - + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image20 - - - - False - True - end - 1 - - - - - True - True - True - image38 - + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image20 + + + + False + True + end + 1 + + + + + True + True + True + image38 + + + + False + True + end + 2 + + False True - end - 2 + 0 + + + + + True + False + 0 + in + + + True + False + + + 125 + True + True + DevicesList + 0 + + + + + + 6 + 5 + + + + + + + Device + + + + 0 + + + + + + + Description + + + + 1 + + + + + + + Label + + + + 2 + + + + + + + Size + + + + 3 + + + + + + + Serial + + + + 4 + + + + + + + + + + + + + + True + True + 1 - False - True - 0 + True + False - + True False - 0 - in + vertical + 5 - + True False + Select partiton: + 0 + + + False + True + 0 + + + + + True + True + in + 128 - + 125 True True - DevicesList + PartitionsList 0 - - - - + - 6 - 5 + 7 - Device + Section @@ -10173,11 +10316,11 @@ separately into the selected partition. - Description + File system - 1 + 3 @@ -10188,7 +10331,18 @@ separately into the selected partition. - 2 + 4 + + + + + + + File system label + + + + 10 @@ -10199,18 +10353,40 @@ separately into the selected partition. - 3 + 1 - Serial + Free (%) - 4 + 2 + + + + + + + Flags + + + + 11 + + + + + + + Mount point + + + + 9 @@ -10218,22 +10394,23 @@ separately into the selected partition. - - - + + True + True + 1 + - False - True - 1 + True + True False True - 2 + 3 @@ -10243,11 +10420,17 @@ separately into the selected partition. vertical 5 - + True False - Select partiton: - 0 + vertical + 5 + + + + + + False @@ -10256,197 +10439,42 @@ separately into the selected partition. - + + + True True - in - 128 + True + + + + False + True + 2 + + + + + False + True + 5 + + + + + True + False + 5 + + + True + False + start + 0 + none - - 125 - True - True - PartitionsList - 0 - - - - - - - - - 7 - - - - - - - Section - - - - 0 - - - - - - - File system - - - - 3 - - - - - - - Label - - - - 4 - - - - - - - File system label - - - - 10 - - - - - - - Size - - - - 1 - - - - - - - Free (%) - - - - 2 - - - - - - - Flags - - - - 11 - - - - - - - Mount point - - - - 9 - - - - - - - - - False - True - 1 - - - - - False - True - 3 - - - - - True - False - vertical - 5 - - - True - False - vertical - 5 - - - - - - - - - False - True - 0 - - - - - + - True - True - True - - - - False - True - 2 - - - - - False - True - 4 - - - - - True - False - 5 - - - True - False - start - 0 - none - - + True False 5 @@ -10946,7 +10974,7 @@ separately into the selected partition. False True - 5 + 6 @@ -11567,291 +11595,299 @@ separately into the selected partition. vertical 5 - + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image2 - + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image2 + + + + False + True + end + 1 + + + + + True + True + True + image39 + + + + False + True + end + 2 + + False True - end 1 - + True True - True - image39 - - - - False - True - end - 2 - - - - - False - True - 1 - - - - - True - True - in - 128 - - - True - True - DevicesList - 0 - - - + in + 50 - - Device + + True + True + DevicesList + 0 - - + + Device + + + 0 - + + + - - - - - Description - - + + Description + + + 1 - + + + - - - - - Label - - + + Label + + + 2 - + + + - - - - - Size - - + + Size + + + 3 - + + + - - - - - Serial - - + + Serial + + + 4 - + + + + + True + True + 2 + - False - True - 2 + True + False - - - False - True - 0 - - - - - True - False - vertical - + True False - Select partiton: - 0 - - - False - True - 0 - - - - - True - True - in - 128 + vertical + + + True + False + Select partiton: + 0 + + + False + True + 0 + + - + True True - PartitionsList - 0 - - - + in + 50 - - Section + + True + True + PartitionsList + 0 - - + + Section + + + 0 - + + + - - - - - File system - - + + File system + + + 3 - + + + - - - - - Label - - + + Label + + + 4 - + + + - - - - - File system label - - + + File system label + + + 10 - + + + - - - - - Size - - + + Size + + + 1 - + + + - - - - - Free (%) - - + + Free (%) + + + 2 - + + + - - - - - Flags - - + + Flags + + + 11 - + + + - - - - - Mount point - - + + Mount point + + + 9 - + + + + + True + True + 1 + - False - True - 1 + True + True - False + True True - 1 + 2 @@ -12013,291 +12049,299 @@ separately into the selected partition. vertical 5 - + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image3 - - - - False - True - end - 1 - - - - - True - True - True - image41 - + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image3 + + + + False + True + end + 1 + + + + + True + True + True + image41 + + + + False + True + end + 2 + + False True - end - 2 + 1 - - - False - True - 1 - - - - - True - True - in - 128 - + True True - DevicesList - 0 - - - + in + 50 - - Device + + True + True + DevicesList + 0 - - - 0 - + + Device + + + + 0 + + + - - - - - Description - - - 1 - + + Description + + + + 1 + + + - - - - - Label - - - 2 - + + Label + + + + 2 + + + - - - - - Size - - - 3 - + + Size + + + + 3 + + + - - - - - Serial - - - 4 - + + Serial + + + + 4 + + + + + True + True + 2 + - False - True - 2 + True + False - - - False - True - 0 - - - - - True - False - vertical - + True False - Select partiton: - 0 - - - False - True - 0 - - - - - True - True - in - 128 + vertical + + + True + False + Select partiton: + 0 + + + False + True + 0 + + - + True True - PartitionsList - 0 - - - + in + 50 - - Section + + True + True + PartitionsList + 0 - - - 0 - + + Section + + + + 0 + + + - - - - - File system - - - 3 - + + File system + + + + 3 + + + - - - - - Label - - - 4 - + + Label + + + + 4 + + + - - - - - File system label - - - 10 - + + File system label + + + + 10 + + + - - - - - Size - - - 1 - + + Size + + + + 1 + + + - - - - - Free (%) - - - 2 - + + Free (%) + + + + 2 + + + - - - - - Flags - - - 11 - + + Flags + + + + 11 + + + - - - - - Mount point - - - 9 - + + Mount point + + + + 9 + + + + + False + True + 1 + - False - True - 1 + True + True False True - 1 + 2 @@ -12452,284 +12496,295 @@ separately into the selected partition. vertical 5 - + + 309 True - False + True vertical - 5 + 165 + True + True True False + vertical 5 - + True False - Select device: - 0 - - - False - True - 0 - - - - - True - True - True - image11 - + 5 + + + True + False + Select device: + 0 + + + False + True + 0 + + + + + True + True + True + image11 + + + + False + True + end + 1 + + + + + True + True + True + image40 + + + + False + True + end + 2 + + False True - end 1 - - True - True - True - image40 - - - - False - True - end - 2 - - - - - False - True - 1 - - - - - True - True - in - 128 - - + True True - DevicesList - 0 - - - + in + 50 - - Device + + True + True + DevicesList + 0 - - - 0 - + + Device + + + + 0 + + + - - - - - Description - - - 1 - + + Description + + + + 1 + + + - - - - - Label - - - 2 - + + Label + + + + 2 + + + - - - - - Size - - - 3 - + + Size + + + + 3 + + + - - - - - Serial - - - 4 - + + Serial + + + + 4 + + + + + True + True + 2 + - False - True - 2 + True + False - - - False - True - 0 - - - - - True - False - vertical - + True False - Select partiton: - 0 - - - False - True - 0 - - - - - True - True - in - 128 + vertical + + + True + False + Select partiton: + 0 + + + False + True + 0 + + - + True True - PartitionsList - 0 - - - + in + 50 - - Section + + True + True + PartitionsList + 0 + + + - - - 0 - + + Section + + + + 0 + + + - - - - - File system - - - 3 - + + File system + + + + 3 + + + - - - - - Label - - - 4 - + + Label + + + + 4 + + + - - - - - File system label - - - 10 - + + File system label + + + + 10 + + + - - - - - Size - - - 1 - + + Size + + + + 1 + + + - - - - - Free (%) - - - 2 - + + Free (%) + + + + 2 + + + - - - - - Flags - - - 11 - + + Flags + + + + 11 + + + - - - - - Mount point - - - 9 - + + Mount point + + + + 9 + + + + + True + True + 1 + - False - True - 1 + True + True @@ -13139,7 +13194,7 @@ separately into the selected partition. False True - 2 + 3