From 5144a2ae2592e002b9a7f9721e5f3a22d49418d4 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 24 May 2023 14:27:47 +0600
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20css=20=D0=BE=D0=BA=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/menu_os.cc             |   7 ++
 source/menu_os.h              |   1 +
 ubl-settings-bootloader.css   |  11 ++-
 ubl-settings-bootloader.glade | 138 +++++++++++++++++++---------------
 4 files changed, 94 insertions(+), 63 deletions(-)

diff --git a/source/menu_os.cc b/source/menu_os.cc
index 46378a9..3d5c578 100644
--- a/source/menu_os.cc
+++ b/source/menu_os.cc
@@ -66,6 +66,13 @@ void Menu_os::init() {
             map_menu_level_1[key]->boxLevel3 = NULL;
         }
         size_t index_l3 = 0;
+        if (vec_value.size() == 0) {
+            builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
+            map_menu_level_1[key]->btnToL2AndLv3Image->hide();
+        }
+        else {
+            builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
+        }
         for (string& str_level_3: vec_value) {
             auto builder_level_3 = Gtk::Builder::create_from_file(path_glade);
             map_menu_level_1[key]->vec_menu_level_3.push_back(new struct_menu_level_3);
diff --git a/source/menu_os.h b/source/menu_os.h
index 01e3051..29e3508 100644
--- a/source/menu_os.h
+++ b/source/menu_os.h
@@ -36,6 +36,7 @@ private:
         struct struct_menu_level1 {
             Gtk::Label *lblRevL1;
             Gtk::Button *btnToL2AndLv3;
+            Gtk::MenuButton* btnToL2AndLv3Image;
             Gtk::Revealer *revealer;
             Gtk::Box *boxLevel3;
             Gtk::Box *boxMenuLevel1;
diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css
index 5c7c820..b9558d6 100644
--- a/ubl-settings-bootloader.css
+++ b/ubl-settings-bootloader.css
@@ -153,8 +153,11 @@ opacity:0.99;
   background-color: @theme_bg_color;
 }
 
+.addbg_revealer * {
+  background-color: @theme_base_color;
+}
 .offset_revealer{
-  background-color: green;
-  margin:0 2px 0 2px;
-  padding: 3px 10px 3px 5px;
-  }
\ No newline at end of file
+  border-width: 1px;
+  border-style: solid;
+  border-color: @theme_text_color;
+}
\ No newline at end of file
diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index b128898..2457e21 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -211,7 +211,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton">
+              <object class="GtkMenuButton" id="btnToL2AndLv3Image">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="focus-on-click">False</property>
@@ -1789,85 +1789,104 @@
     <property name="margin-bottom">10</property>
     <property name="transition-type">slide-right</property>
     <child>
-      <object class="GtkBox" id="popoverMenuOS">
+      <object class="GtkFrame">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">in</property>
         <child>
-          <object class="GtkRevealer" id="revealerL1">
-            <property name="width-request">0</property>
-            <property name="height-request">0</property>
+          <object class="GtkAlignment">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="transition-type">none</property>
             <child>
-              <object class="GtkBox" id="boxLevel1">
+              <object class="GtkBox" id="popoverMenuOS">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="revealerL2">
-            <property name="width-request">0</property>
-            <property name="height-request">0</property>
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="transition-type">none</property>
-            <property name="reveal-child">True</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkButton" id="btnToLev1">
-                    <property name="width-request">1</property>
-                    <property name="height-request">1</property>
+                  <object class="GtkRevealer" id="revealerL1">
+                    <property name="width-request">0</property>
+                    <property name="height-request">0</property>
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="transition-type">none</property>
                     <child>
-                      <object class="GtkMenuButton">
+                      <object class="GtkBox" id="boxLevel1">
                         <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="focus-on-click">False</property>
-                        <property name="receives-default">True</property>
-                        <property name="xalign">0</property>
-                        <property name="direction">left</property>
+                        <property name="can-focus">False</property>
+                        <property name="orientation">vertical</property>
                         <child>
                           <placeholder/>
                         </child>
-                        <style>
-                          <class name="thin"/>
-                          <class name="nobg"/>
-                          <class name="noborder"/>
-                        </style>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="boxALLL3">
+                  <object class="GtkRevealer" id="revealerL2">
+                    <property name="width-request">0</property>
+                    <property name="height-request">0</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="orientation">vertical</property>
+                    <property name="transition-type">none</property>
+                    <property name="reveal-child">True</property>
                     <child>
-                      <placeholder/>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkButton" id="btnToLev1">
+                            <property name="width-request">1</property>
+                            <property name="height-request">1</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">True</property>
+                            <child>
+                              <object class="GtkMenuButton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="focus-on-click">False</property>
+                                <property name="receives-default">True</property>
+                                <property name="xalign">0</property>
+                                <property name="direction">left</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <style>
+                                  <class name="thin"/>
+                                  <class name="nobg"/>
+                                  <class name="noborder"/>
+                                </style>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="boxALLL3">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
                     </child>
                   </object>
                   <packing>
@@ -1879,17 +1898,18 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+        <style>
+          <class name="offset_revealer"/>
+        </style>
       </object>
     </child>
     <style>
-      <class name="addbg"/>
       <class name="offset_revealer"/>
+      <class name="addbg_revealer"/>
     </style>
   </object>
   <object class="GtkWindow" id="wndAddEditData">