From 79603a3653220474fe990739981aff2dbfc4aac8 Mon Sep 17 00:00:00 2001
From: Ivan Dmitrievich Yartsev <yarcev.id@ublinux.ru>
Date: Tue, 13 Jan 2026 16:33:11 +0000
Subject: [PATCH] OS Menu visual changes and localisation fixes

---
 source/ubinstall-gtk-bootloader.c |  6 +++-
 ubinstall-gtk-menu-item.glade     |  1 +
 ubinstall-gtk-menu.glade          | 53 +++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c
index ff47380..ac3e045 100644
--- a/source/ubinstall-gtk-bootloader.c
+++ b/source/ubinstall-gtk-bootloader.c
@@ -239,7 +239,6 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
             gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemRow,-1);
             gtk_widget_hide(item->ArrowImage);
         }
-
     int size;
     config_str options = yon_config_load(get_menus_entry_command,&size);
     GHashTable *created = g_hash_table_new(g_str_hash,g_str_equal);
@@ -248,6 +247,11 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
         yon_char_remove_last_symbol(options[i],'\n');
         int parsed_size;
         config_str parsed = yon_char_parse(options[i],&parsed_size,";");
+        {
+            char *temp = _(parsed[1]);
+            free(parsed[1]);
+            parsed[1] = yon_char_new(temp);
+        }
         int have_children=0;
         char *children_id;
         if ((children_id=strstr(parsed[0],">"))){
diff --git a/ubinstall-gtk-menu-item.glade b/ubinstall-gtk-menu-item.glade
index 8e9e6fd..ccd75bf 100644
--- a/ubinstall-gtk-menu-item.glade
+++ b/ubinstall-gtk-menu-item.glade
@@ -4,6 +4,7 @@
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-bootloader.css -->
   <object class="GtkListBoxRow" id="MenuItemRow">
+    <property name="height-request">25</property>
     <property name="visible">True</property>
     <property name="can-focus">True</property>
     <child>
diff --git a/ubinstall-gtk-menu.glade b/ubinstall-gtk-menu.glade
index ba2ded6..0aaed23 100644
--- a/ubinstall-gtk-menu.glade
+++ b/ubinstall-gtk-menu.glade
@@ -3,11 +3,6 @@
 <interface domain="ubl-settings-bootloader">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubinstall-gtk.css -->
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.pan-left-symbolic</property>
-  </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="width-request">450</property>
     <property name="height-request">250</property>
@@ -54,7 +49,6 @@
                           <object class="GtkListBox" id="ItemsListBox">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="selection-mode">none</property>
                             <child type="placeholder">
                               <object class="GtkLabel">
                                 <property name="visible">True</property>
@@ -94,11 +88,40 @@
                     <property name="spacing">5</property>
                     <child>
                       <object class="GtkButton" id="BackButton">
-                        <property name="label" translatable="yes">Back</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
-                        <property name="image">image1</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="icon-name">com.ublinux.libublsettingsui-gtk3.pan-left-symbolic</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">Back</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
                         <style>
                           <class name="noborder"/>
                           <class name="menunoborder"/>
@@ -110,6 +133,17 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkScrolledWindow">
                         <property name="visible">True</property>
@@ -125,7 +159,6 @@
                               <object class="GtkListBox" id="ChildrenListBox">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="selection-mode">none</property>
                                 <child type="placeholder">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
@@ -141,7 +174,7 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>