From 2c5f8eb0ed37ca9cae535f38b6b8d83eacdb23ec Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Wed, 11 Mar 2020 16:47:10 +0300
Subject: [PATCH] toolbar elements changes

---
 app/ui/main_app_window.py |  5 +--
 app/ui/main_window.glade  | 73 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 011db147..0276db64 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -54,7 +54,8 @@ class Application(Gtk.Application):
                      "fav_picon_popup_item", "fav_copy_popup_item", "fav_epg_configuration_popup_item")
 
     _BOUQUET_ELEMENTS = ("bouquets_new_popup_item", "bouquets_edit_popup_item", "bouquets_cut_popup_item",
-                         "bouquets_copy_popup_item", "bouquets_paste_popup_item", "bouquet_import_popup_item")
+                         "bouquets_copy_popup_item", "bouquets_paste_popup_item", "bouquet_import_popup_item",
+                         "add_bouquet_tool_button")
 
     _COMMONS_ELEMENTS = ("bouquets_remove_popup_item", "fav_remove_popup_item")
 
@@ -142,6 +143,7 @@ class Application(Gtk.Application):
                           "on_drawing_area_realize": self.on_drawing_area_realize,
                           "on_player_drawing_area_draw": self.on_player_drawing_area_draw,
                           "on_main_window_state": self.on_main_window_state,
+                          "on_record": self.on_record,
                           "on_remove_all_unavailable": self.on_remove_all_unavailable,
                           "on_new_bouquet": self.on_new_bouquet,
                           "on_create_bouquet_for_current_satellite": self.on_create_bouquet_for_current_satellite,
@@ -229,7 +231,6 @@ class Application(Gtk.Application):
         self._tv_count_label = builder.get_object("tv_count_label")
         self._radio_count_label = builder.get_object("radio_count_label")
         self._data_count_label = builder.get_object("data_count_label")
-        self._app_info_box.bind_property("visible", self._save_header_button, "visible", 4)
         self._signal_level_bar.bind_property("visible", builder.get_object("play_current_service_button"), "visible")
         self._signal_level_bar.bind_property("visible", builder.get_object("record_button"), "visible")
         self._receiver_info_box.bind_property("visible", self._http_status_image, "visible", 4)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 0651ddee..14f3e820 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -791,6 +791,25 @@ Author: Dmitriy Yefremov
                 <property name="homogeneous">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolItem">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkAlignment" id="left_alignment_toolbarl_item">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkToolItem" id="toolbar_extra_item">
                 <property name="can_focus">False</property>
@@ -875,6 +894,25 @@ Author: Dmitriy Yefremov
                 <property name="homogeneous">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolItem">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkAlignment" id="right_alignment_toolbarl_item">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkToolItem" id="toolbar_tools_item">
                 <property name="can_focus">False</property>
@@ -893,7 +931,7 @@ Author: Dmitriy Yefremov
                         <property name="action_name">app.on_satellite_editor_show</property>
                         <property name="label" translatable="yes">Satellites</property>
                         <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-select-all</property>
+                        <property name="stock_id">gtk-edit</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -967,6 +1005,22 @@ Author: Dmitriy Yefremov
                         <property name="position">4</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkToolButton" id="add_bouquet_tool_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Create bouquet</property>
+                        <property name="label" translatable="yes">Create bouquet</property>
+                        <property name="use_underline">True</property>
+                        <property name="stock_id">gtk-new</property>
+                        <signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -1173,6 +1227,17 @@ Author: Dmitriy Yefremov
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkSeparator" id="top_separator">
+                    <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">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkSearchBar" id="search_bar">
                     <property name="can_focus">False</property>
@@ -1249,7 +1314,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -1338,7 +1403,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -2369,7 +2434,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child type="center">