diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 02aed27..9fc7b1e 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -615,7 +615,7 @@ msgid "Installer configuration has been finished" msgstr "" #: source/ubl-strings.h:163 -msgid "Choose a save option on the header bar" +msgid "You can now proceed to saving the settings" msgstr "" #: source/ubl-strings.h:165 diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 4316d6e..b6a01a6 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -634,8 +634,8 @@ msgid "Installer configuration has been finished" msgstr "Настройка конфигурации завершена" #: source/ubl-strings.h:163 -msgid "Choose a save option on the header bar" -msgstr "Выберите опцию сохранения на верхней панели" +msgid "You can now proceed to saving the settings" +msgstr "Можно приступить к сохранению настроек" #: source/ubl-strings.h:165 msgid "Configuration has been saved" diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index c810f37..cbacb4d 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -54,9 +54,10 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){ case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break; case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break; case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break; - case YON_PAGE_CONFIGURE_SAVE: - break; case YON_PAGE_CONFIGURE_END: + return YON_PAGE_CONFIGURE_SAVE; + break; + case YON_PAGE_CONFIGURE_SAVE: gtk_main_quit(); exit(0); break; @@ -152,7 +153,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ // yon_load_proceed(YON_CONFIG_LOCAL); gtk_widget_hide(widgets->BackButton); gtk_widget_set_sensitive(widgets->NextButton,1); - gtk_widget_set_sensitive(widgets->CancelInstallButton,0); + // gtk_widget_set_sensitive(widgets->CancelInstallButton,0); gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1); gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1); gtk_widget_hide(widgets->BackButton); @@ -186,7 +187,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){ gtk_widget_set_sensitive(widgets->CancelInstallButton,1); break; case YON_PAGE_CONFIGURE_END: - gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_AND_EXIT_LABEL); + gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); break; @@ -646,6 +647,8 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ gtk_main_quit(); break; case YON_PAGE_SECTIONS: + case YON_PAGE_WELCOME: + case YON_PAGE_LICENCE: on_yon_exit(NULL,NULL,widgets); break; default: { diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 0fdbf64..b69fba6 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -146,7 +146,7 @@ NULL) #define CONFIGURATION_TITLE_LABEL _("Configuration") #define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished") -#define CONFIGURATION_FINISH_LABEL _("Choose a save option on the header bar") +#define CONFIGURATION_FINISH_LABEL _("You can now proceed to saving the settings") #define CONFIGURATION_SAVE_HEAD_LABEL _("Configuration has been saved") #define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index e9e76ea..3fd7967 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -6538,41 +6538,6 @@ Select a different installation sources. 1 - - - True - False - 5 - - - True - True - - - False - True - 0 - - - - - True - False - Authentication in the bootloader menu - - - False - True - 1 - - - - - False - True - 2 - - True @@ -6590,62 +6555,40 @@ Select a different installation sources. True - False False + vertical 5 - + True - True - in - 128 - 256 + False + 5 - + True True - BootloadUsersList - - - - - - Administrator - - - - 0 - - - - - - - Username - - - - 1 - - - - - - - Password - - - - 3 - - - - + + False + True + 0 + + + + + True + False + Authentication in the bootloader menu + + + False + True + 1 + - True + False True 0 @@ -6653,36 +6596,124 @@ Select a different installation sources. True + False False - vertical 5 - + True True - True - image17 - + in + 128 + 256 + + + True + True + BootloadUsersList + 0 + + + + + + Administrator + + + + 0 + + + + + + + Username + + + + 1 + + + + + + + Password + + + + 3 + + + + + + - False + True True 0 - + True - False - True - True - Edit user - image43 - + False + vertical + 5 + + + True + True + True + image17 + + + + False + True + 0 + + + + + True + False + True + True + Edit user + image43 + + + + False + True + 1 + + + + + True + False + True + True + image18 + + + + False + True + 2 + + False @@ -6690,26 +6721,9 @@ Select a different installation sources. 1 - - - True - False - True - True - image18 - - - - False - True - 2 - - - False + True True 1 @@ -8092,7 +8106,7 @@ or continue working in the system Live environment. True False - Choose a save option on the header bar + You can now proceed to saving the settings center True 0 diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 1c89b56..0d956ab 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -613,7 +613,7 @@ msgstr "Загрузить" msgid "Installer configuration has been finished" msgstr "Настройка конфигурации завершена" -msgid "Choose a save option on the header bar" +msgid "You can now proceed to saving the settings" msgstr "Выберите опцию сохранения на верхней панели" #, fuzzy