From 2cf900ff06ac0124c6765f2fdf29f9e6677e3192 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 16 Sep 2025 18:03:02 +0600
Subject: [PATCH] Fixes

---
 source/ubinstall-gtk-page-switch.c |   5 -
 source/ubinstall-gtk.c             |   1 -
 source/ubinstall-gtk.h             |   2 -
 ubinstall-gtk.glade                | 156 ++++++++++++-----------------
 4 files changed, 66 insertions(+), 98 deletions(-)

diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index 2579b4b..b13fbd6 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -290,11 +290,6 @@ void yon_configuration_mode_check(main_window *widgets){
     } else {
         gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,0);
     }
-    if (page == YON_PAGE_CONFIGURE_END){
-        gtk_widget_show(widgets->SaveButton);
-    } else {
-        gtk_widget_hide(widgets->SaveButton);
-    }
 }
 
 void yon_page_update(main_window *widgets){
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 8410e50..651b32e 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -403,7 +403,6 @@ main_window *yon_main_window_complete(){
     widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
     widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
 
-    widgets->SaveButton = yon_gtk_builder_get_widget(builder,"SaveButton");
 
     widgets->LoadGlobalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"LoadGlobalConfigurationMenuItem");
     widgets->LoadLocalConfigurationMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index b3b14a4..e8d153b 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -418,8 +418,6 @@ typedef struct {
 	GtkWidget *SaveLocalConfigurationMenuItem;
 	GtkWidget *SaveExternalConfigurationMenuItem;
 
-	GtkWidget *SaveButton;
-
 	GtkWidget *MainWindow;
 
 	GtkWidget *StartScenarioButton;
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 14103c6..1ed2597 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -273,11 +273,26 @@
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3.increase-symbolic</property>
   </object>
+  <object class="GtkImage" id="image25">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.fork-symbolic</property>
+  </object>
   <object class="GtkImage" id="image26">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
   </object>
+  <object class="GtkImage" id="image27">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.flag-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image28">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.flag-finish-symbolic</property>
+  </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -383,54 +398,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="menu3">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <child>
-      <object class="GtkMenuItem" id="SaveGlobalLocalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save configuration</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SaveGlobalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to global configuration</property>
-        <style>
-          <class name="menuitemmiddle"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SaveLocalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to local configuration</property>
-        <style>
-          <class name="menuitemmiddle"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SaveExternalConfigurationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to specific file</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-    <style>
-      <class name="thin"/>
-    </style>
-  </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="width-request">800</property>
     <property name="height-request">500</property>
@@ -10512,6 +10479,7 @@ separately into the selected partition.</property>
                         <property name="label" translatable="yes">Start installation scenario</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="image">image27</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10524,6 +10492,7 @@ separately into the selected partition.</property>
                         <property name="label" translatable="yes">Source</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="image">image25</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10536,6 +10505,7 @@ separately into the selected partition.</property>
                         <property name="label" translatable="yes">Skip installation</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
+                        <property name="image">image28</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -10651,49 +10621,55 @@ separately into the selected partition.</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkMenuButton" id="SaveButton">
-            <property name="can-focus">True</property>
-            <property name="focus-on-click">False</property>
-            <property name="receives-default">True</property>
-            <property name="popup">menu3</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="headerSaveConfigLabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">Save</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">pan-down-symbolic</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>
+  <object class="GtkMenu" id="menu3">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
+    <child>
+      <object class="GtkMenuItem" id="SaveGlobalLocalConfigurationMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save configuration</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="SaveGlobalConfigurationMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save to global configuration</property>
+        <style>
+          <class name="menuitemmiddle"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="SaveLocalConfigurationMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save to local configuration</property>
+        <style>
+          <class name="menuitemmiddle"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="SaveExternalConfigurationMenuItem">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save to specific file</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+    <style>
+      <class name="thin"/>
+    </style>
+  </object>
 </interface>