diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 6787caf..c7730fe 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -260,10 +260,12 @@ void *on_config_save(char *command){ return NULL; } -void *yon_installation_start(); -void *yon_installation_start(){ - if (system(start_fast_install_command)){}; +void *yon_installation_start(main_window *widgets); +void *yon_installation_start(main_window *widgets){ + int code = system(start_fast_install_command); main_config.install_thread=NULL; + if (!code) + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); g_thread_exit(NULL); return NULL; @@ -320,7 +322,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ gtk_widget_set_sensitive(widgets->BackButton,0); g_thread_join(main_config.config_save_thread); if (!main_config.install_thread) - main_config.install_thread = g_thread_new("InstallThread",(GThreadFunc)yon_installation_start,NULL); + main_config.install_thread = g_thread_new("InstallThread",(GThreadFunc)yon_installation_start,widgets); if (!main_config.install_thread) main_config.progress_thread = g_thread_new("ProgressThread",(GThreadFunc)yon_installation_progress_update,widgets); @@ -472,10 +474,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ yon_config_register(device_label_parameter,device_label_parameter_command,device_name); yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type); - int size=0; - config_str parameters = yon_config_get_all(&size); - main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," "))); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN); }break; case YON_PAGE_INSTALL_SEPARATE: { @@ -511,10 +510,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck))) yon_config_register(device_format_parameter,device_format_parameter_command,"no"); - int size=0; - config_str parameters = yon_config_get_all(&size); - main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," "))); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN); } break; case YON_PAGE_INSTALL_SAME_PARTITION: @@ -551,10 +547,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck))) yon_config_register(device_format_parameter,device_format_parameter_command,"no"); - int size=0; - config_str parameters = yon_config_get_all(&size); - main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," "))); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN); }break; case YON_PAGE_USERS:{ //users if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->UserNameEntry)))){ @@ -595,8 +588,17 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ yon_config_register(autologin_parameter,autologin_parameter_command,autologin); yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,hostname); yon_config_register(hostname_parameter,hostname_parameter_command,root_password); - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + gtk_widget_set_sensitive(widgets->CancelInstallButton,0); + gtk_widget_set_sensitive(widgets->NextButton,0); + gtk_widget_set_sensitive(widgets->BackButton,0); }break; + case YON_PAGE_INSTALLATION_BEGIN:{ + int size=0; + config_str parameters = yon_config_get_all(&size); + main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," "))); + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + } break; case YON_PAGE_COMPLETION: if (!system("reboot")) return; diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 818a980..39f28b0 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -133,6 +133,7 @@ enum YON_PAGES { YON_PAGE_SECTIONS, YON_PAGE_OS_COMPONENTS, YON_PAGE_SOFTWARE, + YON_PAGE_INSTALLATION_BEGIN, YON_PAGE_INSTALLATION, YON_PAGE_REGION, YON_PAGE_KEYBOARD, diff --git a/source/ubl-strings.h b/source/ubl-strings.h index f6e1f2c..1cd26d8 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -101,4 +101,7 @@ #define FREE_SPACE_LABEL _("Free space") #define FS_LABEL _("File system") #define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)") -#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)") \ No newline at end of file +#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)") + +#define INSTALL_BEGIN_HEADER_LABEL _("Installation configuration has ended") +#define INSTALL_BEGIN_LABEL _("UBLinux OS installation is about to begin") \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 1e97473..43171d1 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1212,6 +1212,61 @@ and help you install UBLinux on your computer False + + + True + False + vertical + 5 + + + True + False + end + Installation configuration has ended + + + + + + + True + True + 1 + + + + + True + False + start + UBLinux OS installation is about to begin + + + + + + True + True + 2 + + + + + 5 + + + + + True + False + page 6 + + + 5 + False + + True @@ -1231,7 +1286,7 @@ and help you install UBLinux on your computer - 5 + 6 @@ -1241,7 +1296,7 @@ and help you install UBLinux on your computer Installation - 5 + 6 False @@ -1494,7 +1549,7 @@ and help you install UBLinux on your computer - 6 + 7 @@ -1504,7 +1559,7 @@ and help you install UBLinux on your computer Region - 6 + 7 False @@ -1812,7 +1867,7 @@ and help you install UBLinux on your computer - 7 + 8 @@ -1822,7 +1877,7 @@ and help you install UBLinux on your computer Keyboard - 7 + 8 False @@ -2136,7 +2191,7 @@ and help you install UBLinux on your computer - 8 + 9 @@ -2146,7 +2201,7 @@ and help you install UBLinux on your computer Users - 8 + 9 False @@ -2223,7 +2278,7 @@ or continue working in the UBLinux Live environment. - 9 + 10 @@ -2233,7 +2288,7 @@ or continue working in the UBLinux Live environment. Completion - 9 + 10 False @@ -2273,7 +2328,7 @@ or continue working in the UBLinux Live environment. - 10 + 11 @@ -2283,7 +2338,7 @@ or continue working in the UBLinux Live environment. Completed - 10 + 11 False @@ -2565,7 +2620,7 @@ or continue working in the UBLinux Live environment. - 11 + 12 @@ -2575,7 +2630,7 @@ or continue working in the UBLinux Live environment. Common Installation - 11 + 12 False @@ -3099,7 +3154,7 @@ installed. - 12 + 13 @@ -3109,7 +3164,7 @@ installed. Installation next to system - 12 + 13 False @@ -3621,7 +3676,7 @@ installed. - 13 + 14 @@ -3631,7 +3686,7 @@ installed. Installation with Linux - 13 + 14 False @@ -4011,7 +4066,7 @@ installed. - 14 + 15 @@ -4021,7 +4076,7 @@ installed. Installation with Windows - 14 + 15 False @@ -4536,7 +4591,7 @@ separately into the selected partition. - 15 + 16 @@ -4546,7 +4601,7 @@ separately into the selected partition. Install with more options - 15 + 16 False @@ -4726,7 +4781,7 @@ separately into the selected partition. - 16 + 17 @@ -4736,7 +4791,7 @@ separately into the selected partition. GRUB install - 16 + 17 False @@ -4916,7 +4971,7 @@ separately into the selected partition. - 17 + 18 @@ -4926,7 +4981,7 @@ separately into the selected partition. GRUB update - 17 + 18 False @@ -5256,7 +5311,7 @@ separately into the selected partition. - 18 + 19 @@ -5266,7 +5321,7 @@ separately into the selected partition. Separate installation - 18 + 19 False @@ -5596,7 +5651,7 @@ separately into the selected partition. - 19 + 20 @@ -5606,7 +5661,7 @@ separately into the selected partition. OS only - 19 + 20 False diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index f4ba670..193c2b3 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -426,6 +426,14 @@ msgstr "" msgid "Default (Regular 105-key)" msgstr "" +#: source/ubl-strings.h:102 +msgid "Installation configuration has ended" +msgstr "" + +#: source/ubl-strings.h:102 +msgid "UBLinux OS installation is about to begin" +msgstr "" + msgid "Afrikaans" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 6fcedb5..14be45e 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -443,6 +443,14 @@ msgstr "По умолчанию ((L_Alt + L_Shift))" msgid "Default (Regular 105-key)" msgstr "По умолчанию ((Regular 105-key))" +#: source/ubl-strings.h:102 +msgid "Installation configuration has ended" +msgstr "Настройка установщика завершена" + +#: source/ubl-strings.h:102 +msgid "UBLinux OS installation is about to begin" +msgstr "Начало установки ОС UBLinux" + msgid "Afrikaans" msgstr "Африканский"