From 14bf79dbf945584c5bf9dd59f748c618d1b178c7 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Wed, 12 Feb 2020 17:35:44 +0300
Subject: [PATCH] toolbar changes

---
 app/ui/main_app_window.py | 29 +++++++++----
 app/ui/main_window.glade  | 90 +++++++++++++++++++++++----------------
 2 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 02a671ec..b822532d 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -211,6 +211,7 @@ class Application(Gtk.Application):
         self._profile_combo_box = builder.get_object("profile_combo_box")
         self._receiver_info_box = builder.get_object("receiver_info_box")
         self._receiver_info_label = builder.get_object("receiver_info_label")
+        self._current_ip_label = builder.get_object("current_ip_label")
         self._signal_box = builder.get_object("signal_box")
         self._service_name_label = builder.get_object("service_name_label")
         self._service_epg_label = builder.get_object("service_epg_label")
@@ -388,7 +389,7 @@ class Application(Gtk.Application):
 
     def init_profiles(self, profile=None):
         self.update_profiles()
-        self._profile_combo_box.set_active_id(profile if profile else self._settings.default_profile)
+        self._profile_combo_box.set_active_id(profile if profile else self._settings.current_profile)
         if profile:
             self.set_profile(profile)
 
@@ -1292,21 +1293,26 @@ class Application(Gtk.Application):
         yield from gen
 
     def on_profile_changed(self, entry):
-        if self._app_info_box.get_visible():
-            self.update_profile_label()
+        active = self._profile_combo_box.get_active_text()
+        if not active:
             return
 
-        active = self._profile_combo_box.get_active_text()
+        changed = self._settings.current_profile != active
+
         if active in self._settings.profiles:
             self.set_profile(active)
+
+        if self._app_info_box.get_visible():
+            return
+
         gen = self.init_http_api()
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
-        self.open_data()
+        if changed:
+            self.open_data()
 
     def set_profile(self, active):
         self._settings.current_profile = active
         self._s_type = self._settings.setting_type
-        self._profile_combo_box.set_tooltip_text(self._profile_combo_box.get_tooltip_text() + self._settings.host)
         self.update_profile_label()
 
     def update_profiles(self):
@@ -1958,6 +1964,9 @@ class Application(Gtk.Application):
     # ***************** Filter and search *********************#
 
     def on_filter_toggled(self, action, value):
+        if self._app_info_box.get_visible():
+            return True
+
         action.set_state(value)
         if value:
             self.update_filter_sat_positions()
@@ -2045,6 +2054,9 @@ class Application(Gtk.Application):
             return txt and free
 
     def on_search_toggled(self, action, value):
+        if self._app_info_box.get_visible():
+            return True
+
         action.set_state(value)
         self._search_bar.set_search_mode(value)
         if value:
@@ -2267,9 +2279,10 @@ class Application(Gtk.Application):
 
     @run_idle
     def update_profile_label(self):
-        label, sep, ip = self._profile_combo_box.get_tooltip_text().partition(":")
+        label, sep, ip = self._current_ip_label.get_text().partition(":")
+        self._current_ip_label.set_text("{}: {}".format(label, self._settings.host))
+
         profile_name = self._profile_combo_box.get_active_text()
-        self._profile_combo_box.set_tooltip_text("{}: {}".format(label, self._settings.host))
         msg = get_message("Profile:")
         if self._s_type is SettingsType.ENIGMA_2:
             title = "DemonEditor [{} {} - Enigma2 v.{}]".format(msg, profile_name, self.get_format_version())
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index b4c19dab..823c64df 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -697,6 +697,7 @@ Author: Dmitriy Yefremov
               <object class="GtkToolItem">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_right">10</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
@@ -707,7 +708,6 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Open</property>
-                        <property name="margin_right">5</property>
                         <property name="action_name">app.on_data_open</property>
                         <property name="label" translatable="yes">Open</property>
                         <property name="use_underline">True</property>
@@ -729,12 +729,58 @@ Author: Dmitriy Yefremov
                         <property name="use_underline">True</property>
                         <property name="stock_id">gtk-connect</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="profile_combo_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="tooltip_text" translatable="yes">Profile</property>
+                        <property name="active">0</property>
+                        <signal name="changed" handler="on_profile_changed" swapped="no"/>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkToolButton" id="save_tool_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">Save</property>
+                        <property name="action_name">app.on_data_save</property>
+                        <property name="label" translatable="yes">Save</property>
+                        <property name="use_underline">True</property>
+                        <property name="stock_id">gtk-save</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="backup_tool_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="action_name">app.on_backup_tool_show</property>
+                        <property name="label" translatable="yes">Backup</property>
+                        <property name="use_underline">True</property>
+                        <property name="stock_id">gtk-revert-to-saved</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -751,23 +797,6 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">2</property>
-                    <child>
-                      <object class="GtkToolButton" id="save_tool_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Save</property>
-                        <property name="margin_right">5</property>
-                        <property name="action_name">app.on_data_save</property>
-                        <property name="label" translatable="yes">Save</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-save</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkToggleToolButton" id="search_tool_button">
                         <property name="visible">True</property>
@@ -806,6 +835,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Parent lock On/Off     Ctrl + L</property>
+                        <property name="margin_left">5</property>
                         <property name="action_name">app.on_locked</property>
                         <property name="label" translatable="yes">Parent lock</property>
                         <property name="use_underline">True</property>
@@ -2286,6 +2316,7 @@ Author: Dmitriy Yefremov
         </child>
         <child>
           <object class="GtkBox" id="status_bar_box">
+            <property name="height_request">28</property>
             <property name="can_focus">False</property>
             <property name="margin_top">1</property>
             <property name="margin_bottom">1</property>
@@ -2331,26 +2362,13 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child type="center">
-              <object class="GtkComboBoxText" id="profile_combo_box">
+              <object class="GtkLabel" id="current_ip_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="focus_on_click">False</property>
-                <property name="tooltip_text" translatable="yes">Current IP:</property>
-                <property name="active">0</property>
-                <property name="has_entry">True</property>
-                <child internal-child="entry">
-                  <object class="GtkEntry" id="profile_entry">
-                    <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="editable">False</property>
-                    <property name="has_frame">False</property>
-                    <property name="max_width_chars">9</property>
-                    <property name="overwrite_mode">True</property>
-                    <property name="caps_lock_warning">False</property>
-                    <property name="primary_icon_stock">gtk-connect</property>
-                    <signal name="changed" handler="on_profile_changed" swapped="no"/>
-                  </object>
-                </child>
+                <property name="label" translatable="yes">Current IP:</property>
+                <attributes>
+                  <attribute name="size" value="8000"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>