From 4269d16d31b98d3b2688494fc9fbba9f6aae634b Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Thu, 17 Dec 2020 14:00:14 +0300
Subject: [PATCH] added ftp client to main window

---
 app/ui/ftp.glade          |   1 -
 app/ui/main_app_window.py |  33 +++++++--
 app/ui/main_window.glade  | 142 +++++++++++++++++++++++++-------------
 3 files changed, 122 insertions(+), 54 deletions(-)

diff --git a/app/ui/ftp.glade b/app/ui/ftp.glade
index 66ff5f98..80edb785 100644
--- a/app/ui/ftp.glade
+++ b/app/ui/ftp.glade
@@ -46,7 +46,6 @@
     <property name="can_focus">False</property>
     <property name="margin_left">1</property>
     <property name="margin_right">1</property>
-    <property name="margin_top">1</property>
     <property name="margin_bottom">1</property>
     <property name="label_xalign">0</property>
     <property name="shadow_type">in</property>
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index d13af160..12dd5fdf 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -157,6 +157,7 @@ class Application(Gtk.Application):
                           "on_full_screen": self.on_full_screen,
                           "on_drawing_area_realize": self.on_drawing_area_realize,
                           "on_player_drawing_area_draw": self.on_player_drawing_area_draw,
+                          "on_ftp_realize": self.on_ftp_realize,
                           "on_record": self.on_record,
                           "on_remove_all_unavailable": self.on_remove_all_unavailable,
                           "on_new_bouquet": self.on_new_bouquet,
@@ -198,6 +199,7 @@ class Application(Gtk.Application):
         self._fav_click_mode = None
         self._links_transmitter = None
         self._control_box = None
+        self._ftp_client = None
         # Colors
         self._use_colors = False
         self._NEW_COLOR = None  # Color for new services in the main list
@@ -232,6 +234,7 @@ class Application(Gtk.Application):
         self._app_info_box.bind_property("visible", builder.get_object("toolbar_extra_box"), "visible", 4)
         self._app_info_box.bind_property("visible", builder.get_object("toolbar_tools_box"), "visible", 4)
         self._app_info_box.bind_property("visible", builder.get_object("save_tool_button"), "visible", 4)
+        self._app_info_box.bind_property("visible", builder.get_object("add_bouquet_tool_button"), "visible", 4)
         # Status bar
         self._profile_combo_box = builder.get_object("profile_combo_box")
         self._receiver_info_box = builder.get_object("receiver_info_box")
@@ -256,7 +259,12 @@ class Application(Gtk.Application):
         self._control_button = builder.get_object("control_button")
         self._receiver_info_box.bind_property("visible", self._control_button, "visible")
         self._control_revealer = builder.get_object("control_revealer")
-        # Force ctrl press event for view. Multiple selections in lists only with Space key(as in file managers)!!!
+        # FTP client
+        self._ftp_button = builder.get_object("ftp_button")
+        self._ftp_revealer = builder.get_object("ftp_revealer")
+        self._ftp_button.bind_property("active", self._ftp_revealer, "visible")
+        self._ftp_button.set_visible(self._settings.is_enable_experimental)
+        # Force Ctrl press event for view. Multiple selections in lists only with Space key(as in file managers)!!!
         self._services_view.connect("key-press-event", self.force_ctrl)
         self._fav_view.connect("key-press-event", self.force_ctrl)
         # Clipboard
@@ -309,9 +317,9 @@ class Application(Gtk.Application):
                       self._FAV_ENIGMA_ELEMENTS, self._FAV_IPTV_ELEMENTS, self._LOCK_HIDE_ELEMENTS)
         self._tool_elements = {k: builder.get_object(k) for k in set(chain.from_iterable(d_elements))}
         # Style
-        self._style_provider = Gtk.CssProvider()
-        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._status_bar_box.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
+        style_provider = Gtk.CssProvider()
+        style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
+        self._status_bar_box.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
                                                                          Gtk.STYLE_PROVIDER_PRIORITY_USER)
 
     def do_startup(self):
@@ -1857,11 +1865,15 @@ class Application(Gtk.Application):
         if active in self._settings.profiles:
             self.set_profile(active)
 
+        gen = self.init_http_api()
+        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
+
+        if self._ftp_button.get_active() and self._ftp_client:
+            self._ftp_client.init_ftp()
+
         if self._app_info_box.get_visible():
             return
 
-        gen = self.init_http_api()
-        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
         if changed:
             self.open_data()
 
@@ -2710,6 +2722,15 @@ class Application(Gtk.Application):
     def on_http_status_visible(self, img):
         self._control_button.set_active(False)
 
+    # ****************** FTP client ********************* #
+
+    def on_ftp_realize(self, revealer):
+        if not self._ftp_client:
+            from app.ui.ftp import FtpClientBox
+            revealer.set_visible(True)
+            self._ftp_client = FtpClientBox(self, self._settings)
+            revealer.add(self._ftp_client)
+
     # ***************** Filter and search ********************* #
 
     def on_filter_toggled(self, action, value):
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 800b7b29..f2c43fd8 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -33,13 +33,6 @@ Author: Dmitriy Yefremov
   <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
   <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="add_bouquet_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_left">5</property>
-    <property name="icon_name">bookmark-new-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkImage" id="backups_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -341,33 +334,33 @@ Author: Dmitriy Yefremov
               <object class="GtkMenuItem" id="fav_add_iptv_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_iptv</property>
                 <property name="label" translatable="yes">Add IPTV or stream service</property>
+                <signal name="activate" handler="on_iptv" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="fav_import_yt_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_import_yt_list</property>
                 <property name="label" translatable="yes">Import YouTube playlist</property>
+                <signal name="activate" handler="on_import_yt_list" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="fav_import_m3u_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_import_m3u</property>
                 <property name="label" translatable="yes">Import m3u</property>
                 <property name="use_underline">True</property>
+                <signal name="activate" handler="on_import_m3u" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="fav_export_m3u_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_export_to_m3u</property>
                 <property name="label" translatable="yes">Export to m3u</property>
+                <signal name="activate" handler="on_export_to_m3u" swapped="no"/>
               </object>
             </child>
             <child>
@@ -380,8 +373,8 @@ Author: Dmitriy Yefremov
               <object class="GtkMenuItem" id="fav_epg_configuration_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_epg_list_configuration</property>
                 <property name="label" translatable="yes">EPG configuration</property>
+                <signal name="activate" handler="on_epg_list_configuration" swapped="no"/>
               </object>
             </child>
             <child>
@@ -394,8 +387,8 @@ Author: Dmitriy Yefremov
               <object class="GtkMenuItem" id="fav_iptv_list_configuration_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_iptv_list_configuration</property>
                 <property name="label" translatable="yes">List configuration</property>
+                <signal name="activate" handler="on_iptv_list_configuration" swapped="no"/>
               </object>
             </child>
             <child>
@@ -408,8 +401,8 @@ Author: Dmitriy Yefremov
               <object class="GtkMenuItem" id="fav_remove_all_unavailable_popup_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="action_name">app.on_remove_all_unavailable</property>
                 <property name="label" translatable="yes">Remove all unavailable</property>
+                <signal name="activate" handler="on_remove_all_unavailable" swapped="no"/>
               </object>
             </child>
           </object>
@@ -968,14 +961,14 @@ Author: Dmitriy Yefremov
           <object class="GtkBox" id="top_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">10</property>
             <child type="center">
               <object class="GtkBox" id="top_toolbar">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">15</property>
-                <property name="margin_right">5</property>
+                <property name="margin_left">10</property>
                 <property name="margin_top">10</property>
                 <property name="margin_bottom">10</property>
                 <property name="spacing">10</property>
@@ -1273,26 +1266,6 @@ Author: Dmitriy Yefremov
                         <property name="position">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="add_bouquet_tool_button">
-                        <property name="label" translatable="yes"> </property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Create bouquet</property>
-                        <property name="halign">start</property>
-                        <property name="valign">start</property>
-                        <property name="image">add_bouquet_image</property>
-                        <property name="always_show_image">True</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>
-                        <property name="non_homogeneous">True</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1308,27 +1281,86 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton" id="control_button">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
+              <object class="GtkButtonBox" id="toolbar_extra_tools_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="margin_right">15</property>
-                <property name="action_name">app.on_remote</property>
+                <property name="margin_right">10</property>
+                <property name="homogeneous">True</property>
+                <property name="layout_style">expand</property>
                 <child>
-                  <object class="GtkImage" id="control_button_image">
-                    <property name="visible">True</property>
+                  <object class="GtkButton" id="add_bouquet_tool_button">
+                    <property name="width_request">32</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">input-gaming-symbolic</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Create bouquet</property>
+                    <property name="always_show_image">True</property>
+                    <signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
+                    <child>
+                      <object class="GtkImage" id="add_bouquet_image">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">bookmark-new-symbolic</property>
+                        <property name="icon_size">1</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="control_button">
+                    <property name="width_request">32</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="action_name">app.on_remote</property>
+                    <child>
+                      <object class="GtkImage" id="control_button_image">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">input-gaming-symbolic</property>
+                      </object>
+                    </child>
+                    <accelerator key="t" signal="clicked" modifiers="Primary"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleButton" id="ftp_button">
+                    <property name="width_request">32</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="always_show_image">True</property>
+                    <child>
+                      <object class="GtkImage" id="ftp_tool_image">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">FTP client</property>
+                        <property name="icon_name">network-server-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
-                <accelerator key="i" signal="clicked" modifiers="Primary"/>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="pack_type">end</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -3042,6 +3074,22 @@ Author: Dmitriy Yefremov
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkRevealer" id="ftp_revealer">
+                <property name="can_focus">False</property>
+                <property name="transition_type">crossfade</property>
+                <property name="reveal_child">True</property>
+                <signal name="realize" handler="on_ftp_realize" swapped="no"/>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>