From d4a2e78a09f92102025737b62ef968b77adebeee Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Wed, 22 Jun 2022 22:38:36 +0300
Subject: [PATCH] minor ui corrections

---
 app/ui/control.glade    |  9 +++++++--
 app/ui/ftp.glade        | 14 ++++++--------
 app/ui/main.glade       | 12 +++++-------
 app/ui/picons.glade     | 31 ++++---------------------------
 app/ui/recordings.glade |  2 +-
 app/ui/xml/editor.glade | 12 ++++++------
 6 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/app/ui/control.glade b/app/ui/control.glade
index 2af2d00b..38eee72a 100644
--- a/app/ui/control.glade
+++ b/app/ui/control.glade
@@ -34,6 +34,11 @@ Author: Dmitriy Yefremov
   <!-- interface-description Enigma2 channel and satellites list editor. -->
   <!-- interface-copyright 2018-2022 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
+  <object class="GtkImage" id="network_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">network-transmit-receive-symbolic</property>
+  </object>
   <object class="GtkListStore" id="network_model">
     <columns>
       <!-- column-name name -->
@@ -70,13 +75,13 @@ Author: Dmitriy Yefremov
         <property name="spacing">15</property>
         <child>
           <object class="GtkToggleButton" id="control_network_button">
-            <property name="label">gtk-network</property>
+            <property name="label">Network</property>
             <property name="width_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="receives_default">True</property>
             <property name="valign">center</property>
-            <property name="use_stock">True</property>
+            <property name="image">network_image</property>
             <property name="always_show_image">True</property>
             <signal name="toggled" handler="on_network_toggled" swapped="no"/>
           </object>
diff --git a/app/ui/ftp.glade b/app/ui/ftp.glade
index 5be10ab4..c1149165 100644
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -416,15 +416,14 @@ Author: Dmitriy Yefremov
                 <property name="margin_right">5</property>
                 <property name="margin_top">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
                 <child>
                   <object class="GtkBox" id="ftp_button_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">10</property>
                     <property name="margin_right">10</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">10</property>
                     <property name="spacing">10</property>
                     <child>
                       <object class="GtkButton" id="connect_button">
@@ -803,7 +802,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkBox" id="ftp_status_bar_box">
-                    <property name="height_request">24</property>
+                    <property name="height_request">26</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">10</property>
@@ -876,15 +875,14 @@ Author: Dmitriy Yefremov
                 <property name="margin_right">5</property>
                 <property name="margin_top">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
                 <child>
                   <object class="GtkBox" id="pc_header_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">10</property>
                     <property name="margin_right">10</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">10</property>
                     <property name="spacing">5</property>
                     <child>
                       <object class="GtkButton" id="pc_add_folder_button">
@@ -1057,7 +1055,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkBox" id="file_status_bar_box">
-                    <property name="height_request">24</property>
+                    <property name="height_request">26</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">10</property>
diff --git a/app/ui/main.glade b/app/ui/main.glade
index 763c689d..3e24313f 100644
--- a/app/ui/main.glade
+++ b/app/ui/main.glade
@@ -2956,7 +2956,7 @@ Author: Dmitriy Yefremov
                                             <property name="can_focus">False</property>
                                             <property name="margin_left">5</property>
                                             <property name="margin_right">5</property>
-                                            <property name="spacing">2</property>
+                                            <property name="spacing">5</property>
                                             <child>
                                               <object class="GtkImage" id="iptv_services_count_image">
                                                 <property name="visible">True</property>
@@ -3396,7 +3396,6 @@ Author: Dmitriy Yefremov
                                   <object class="GtkBox" id="fav_box">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="margin_bottom">2</property>
                                     <property name="orientation">vertical</property>
                                     <property name="spacing">2</property>
                                     <child>
@@ -3781,12 +3780,12 @@ Author: Dmitriy Yefremov
                                 </child>
                                 <child>
                                   <object class="GtkBox" id="fav_bar_box">
-                                    <property name="height_request">24</property>
+                                    <property name="height_request">26</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">5</property>
                                     <property name="margin_right">5</property>
-                                    <property name="spacing">2</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkImage" id="image2">
                                         <property name="visible">True</property>
@@ -4002,7 +4001,6 @@ Author: Dmitriy Yefremov
                                   <object class="GtkScrolledWindow" id="bouquets_scrolled_window">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="margin_bottom">2</property>
                                     <property name="shadow_type">in</property>
                                     <child>
                                       <object class="GtkTreeView" id="bouquets_tree_view">
@@ -4089,12 +4087,12 @@ Author: Dmitriy Yefremov
                                 </child>
                                 <child>
                                   <object class="GtkBox" id="bouquet_bar_box">
-                                    <property name="height_request">24</property>
+                                    <property name="height_request">26</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="margin_left">5</property>
                                     <property name="margin_right">5</property>
-                                    <property name="spacing">2</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkImage" id="bq_count_image">
                                         <property name="visible">True</property>
diff --git a/app/ui/picons.glade b/app/ui/picons.glade
index 4c7df605..cff4131c 100644
--- a/app/ui/picons.glade
+++ b/app/ui/picons.glade
@@ -384,22 +384,14 @@ Author: Dmitriy Yefremov
                 <property name="layout_style">expand</property>
                 <child>
                   <object class="GtkRadioButton" id="manager_button">
-                    <property name="width_request">50</property>
+                    <property name="label" translatable="yes">Explorer</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Explorer</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">False</property>
                     <property name="group">converter_button</property>
                     <signal name="toggled" handler="on_tool_switched" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">folder-open-symbolic</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -410,7 +402,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="downloader_button">
-                    <property name="width_request">50</property>
+                    <property name="label" translatable="yes">Downloader</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -419,13 +411,6 @@ Author: Dmitriy Yefremov
                     <property name="draw_indicator">False</property>
                     <property name="group">manager_button</property>
                     <signal name="toggled" handler="on_tool_switched" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">insert-image-symbolic</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -436,7 +421,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="converter_button">
-                    <property name="width_request">50</property>
+                    <property name="label" translatable="yes">Converter</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -445,13 +430,6 @@ Author: Dmitriy Yefremov
                     <property name="draw_indicator">False</property>
                     <property name="group">manager_button</property>
                     <signal name="toggled" handler="on_tool_switched" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">object-rotate-right-symbolic</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -1692,12 +1670,11 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkBox" id="bottom_bar_box">
-            <property name="height_request">24</property>
+            <property name="height_request">26</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">5</property>
             <property name="margin_right">5</property>
-            <property name="margin_top">2</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkImage" id="count_image">
diff --git a/app/ui/recordings.glade b/app/ui/recordings.glade
index b5f8a323..3c9986d5 100644
--- a/app/ui/recordings.glade
+++ b/app/ui/recordings.glade
@@ -384,7 +384,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkBox" id="recordings_status_box">
-                    <property name="height_request">24</property>
+                    <property name="height_request">26</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">10</property>
diff --git a/app/ui/xml/editor.glade b/app/ui/xml/editor.glade
index 66dceda9..4e7e9dd0 100644
--- a/app/ui/xml/editor.glade
+++ b/app/ui/xml/editor.glade
@@ -402,7 +402,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="sat_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -500,7 +500,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="ter_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -599,7 +599,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="cable_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -918,7 +918,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="sat_tr_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -1151,7 +1151,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="ter_tr_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>
@@ -1300,7 +1300,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="cable_tr_status_box">
-                        <property name="height_request">24</property>
+                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">5</property>