From 66425ce863ee88d86d3338beaca07e241a67faba Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 25 Jul 2024 14:12:37 +0600
Subject: [PATCH] Fixed separate installation page

---
 source/ubinstall-gtk.c |   2 +-
 ubinstall-gtk.glade    | 104 ++++++++++++++++++++---------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 7d488fc..5afdd0c 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -55,7 +55,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
 		GtkWidget *dialog = gtk_file_chooser_dialog_new(TITLE_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL);
         yon_gtk_window_setup(GTK_WINDOW(dialog),NULL,TITLE_LABEL,icon_path,"FileChooserWindow");
         textdomain(LocaleName);
-        gtk_window_set_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubl-settings-video");
+        gtk_window_set_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubinstall");
         gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL);
         GtkFileFilter *filter = gtk_file_filter_new();
 		gtk_file_filter_add_pattern(filter,"*.ini");
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 216cb86..7cec106 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -3446,12 +3446,42 @@ installed.</property>
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
                                             <property name="orientation">vertical</property>
+                                            <property name="spacing">5</property>
                                             <child>
-                                              <object class="GtkLabel">
+                                              <object class="GtkBox">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                                <property name="label" translatable="yes">Choose a section:</property>
-                                                <property name="xalign">0</property>
+                                                <property name="spacing">5</property>
+                                                <child>
+                                                  <object class="GtkLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can-focus">False</property>
+                                                    <property name="label" translatable="yes">Select device:</property>
+                                                    <property name="xalign">0</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkButton" id="GpartedNearButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can-focus">True</property>
+                                                    <property name="receives-default">True</property>
+                                                    <property name="image">image36</property>
+                                                    <style>
+                                                      <class name="thin"/>
+                                                    </style>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="pack-type">end</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -3466,17 +3496,17 @@ installed.</property>
                                                 <property name="shadow-type">in</property>
                                                 <property name="min-content-height">128</property>
                                                 <child>
-                                                  <object class="GtkTreeView" id="InstallationNearSysSectionTree">
+                                                  <object class="GtkTreeView" id="InstallationNearSysDevicesTree">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
-                                                    <property name="model">PartitionsList</property>
+                                                    <property name="model">DevicesList</property>
                                                     <property name="search-column">0</property>
                                                     <child internal-child="selection">
                                                       <object class="GtkTreeSelection"/>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Section</property>
+                                                        <property name="title" translatable="yes">Device</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3487,7 +3517,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Capacity</property>
+                                                        <property name="title" translatable="yes">Description</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3498,7 +3528,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Free space</property>
+                                                        <property name="title" translatable="yes">Mark</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3509,7 +3539,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">File system</property>
+                                                        <property name="title" translatable="yes">Size</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3520,7 +3550,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Mark</property>
+                                                        <property name="title" translatable="yes">Serial</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3542,7 +3572,7 @@ installed.</property>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">1</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -3550,42 +3580,12 @@ installed.</property>
                                             <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">
+                                              <object class="GtkLabel">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                                <property name="spacing">5</property>
-                                                <child>
-                                                  <object class="GtkLabel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Select device:</property>
-                                                    <property name="xalign">0</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkButton" id="GpartedNearButton">
-                                                    <property name="visible">True</property>
-                                                    <property name="can-focus">True</property>
-                                                    <property name="receives-default">True</property>
-                                                    <property name="image">image36</property>
-                                                    <style>
-                                                      <class name="thin"/>
-                                                    </style>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">False</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="pack-type">end</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
+                                                <property name="label" translatable="yes">Choose a section:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -3600,17 +3600,17 @@ installed.</property>
                                                 <property name="shadow-type">in</property>
                                                 <property name="min-content-height">128</property>
                                                 <child>
-                                                  <object class="GtkTreeView" id="InstallationNearSysDevicesTree">
+                                                  <object class="GtkTreeView" id="InstallationNearSysSectionTree">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">True</property>
-                                                    <property name="model">DevicesList</property>
+                                                    <property name="model">PartitionsList</property>
                                                     <property name="search-column">0</property>
                                                     <child internal-child="selection">
                                                       <object class="GtkTreeSelection"/>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Device</property>
+                                                        <property name="title" translatable="yes">Section</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3621,7 +3621,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Description</property>
+                                                        <property name="title" translatable="yes">Capacity</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3632,7 +3632,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Mark</property>
+                                                        <property name="title" translatable="yes">Free space</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3643,7 +3643,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Size</property>
+                                                        <property name="title" translatable="yes">File system</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3654,7 +3654,7 @@ installed.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkTreeViewColumn">
-                                                        <property name="title" translatable="yes">Serial</property>
+                                                        <property name="title" translatable="yes">Mark</property>
                                                         <child>
                                                           <object class="GtkCellRendererText"/>
                                                           <attributes>
@@ -3676,7 +3676,7 @@ installed.</property>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
-                                            <property name="position">2</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>