Fixed configuration saving menu; Fixed Exit buitton exiting

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

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"
+msgid "You can now proceed to saving the settings"
-msgstr "Выберите опцию сохранения на верхней панели"
+msgstr "Можно приступить к сохранению настроек"
 
 #: source/ubl-strings.h:165
 msgid "Configuration has been saved"

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: {

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.")

ubinstall-gtk.glade

@@ -6538,6 +6538,26 @@ Select a different installation sources.</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkFrame">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0.019999999552965164</property>
+                                <property name="shadow-type">in</property>
+                                <child>
+                                  <object class="GtkAlignment">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="top-padding">5</property>
+                                    <property name="bottom-padding">5</property>
+                                    <property name="left-padding">5</property>
+                                    <property name="right-padding">5</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
@@ -6570,23 +6590,9 @@ Select a different installation sources.</property>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                <property name="position">2</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
-                            <child>
-                              <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0.019999999552965164</property>
-                                <property name="shadow-type">in</property>
-                                <child>
-                                  <object class="GtkAlignment">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="top-padding">5</property>
-                                    <property name="bottom-padding">5</property>
-                                    <property name="left-padding">5</property>
-                                    <property name="right-padding">5</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property name="visible">True</property>
@@ -6605,6 +6611,7 @@ Select a different installation sources.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
                                                     <property name="model">BootloadUsersList</property>
+                                                    <property name="search-column">0</property>
                                                     <child internal-child="selection">
                                                       <object class="GtkTreeSelection"/>
                                                     </child>
@@ -6715,6 +6722,13 @@ Select a different installation sources.</property>
                                               </packing>
                                             </child>
                                           </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
                                     </child>
                                   </object>
                                 </child>
@@ -8092,7 +8106,7 @@ or continue working in the system Live environment.</property>
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="label" translatable="yes">Choose a save option on the header bar</property>
+                                <property name="label" translatable="yes">You can now proceed to saving the settings</property>
                                 <property name="justify">center</property>
                                 <property name="wrap">True</property>
                                 <property name="yalign">0</property>

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