From b02eb37f1c798ecf575d246a9bcbf5ec4bd7024e Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Wed, 10 Jun 2020 18:01:23 +0300
Subject: [PATCH] corrections after merge

---
 app/ui/main_app_window.py    |  17 +-
 app/ui/main_window.glade     |  81 ++++++++-
 app/ui/picons_manager.glade  | 333 ++++++++++++++++++++---------------
 app/ui/picons_manager.py     |   6 +-
 app/ui/settings_dialog.glade | 118 +++++++++++--
 5 files changed, 373 insertions(+), 182 deletions(-)

diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index c3571853..632fdffb 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -149,7 +149,6 @@ 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_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,
@@ -960,7 +959,7 @@ class Application(Gtk.Application):
             top_iter = model.get_iter(path)
             parent_itr = model.iter_parent(top_iter)  # parent
             to_del = []
-            is_darwin = self._settings.is_darwin #
+            is_darwin = self._settings.is_darwin
 
             if parent_itr:
                 p_path = model.get_path(parent_itr)[0]
@@ -2056,21 +2055,9 @@ class Application(Gtk.Application):
 
     def on_full_screen(self, item=None):
         self._full_screen = not self._full_screen
-        if self._settings.is_darwin:
-            self.update_state_on_full_screen(not self._full_screen)
+        self.update_state_on_full_screen(not self._full_screen)
         self._main_window.fullscreen() if self._full_screen else self._main_window.unfullscreen()
 
-    def on_main_window_state(self, window, event):
-        if self._settings.is_darwin:
-            return
-
-        state = event.new_window_state
-        full = not state & Gdk.WindowState.FULLSCREEN
-        window.set_show_menubar(full)
-        self.update_state_on_full_screen(full)
-        if not state & Gdk.WindowState.ICONIFIED and self._links_transmitter:
-            self._links_transmitter.hide()
-
     @run_idle
     def update_state_on_full_screen(self, visible):
         self._main_data_box.set_visible(visible)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index ce1ee997..78eb201b 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -297,6 +297,15 @@ Author: Dmitriy Yefremov
         <signal name="activate" handler="on_insert_marker" object="fav_tree_view" swapped="no"/>
       </object>
     </child>
+    <child>
+      <object class="GtkMenuItem" id="fav_insert_space_popup_item">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Insert space</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_insert_space" object="fav_tree_view" swapped="no"/>
+      </object>
+    </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="fav_popup_separator_4">
         <property name="visible">True</property>
@@ -591,6 +600,68 @@ Author: Dmitriy Yefremov
     <property name="icon_name">document-save-symbolic</property>
     <property name="icon_size">1</property>
   </object>
+  <object class="GtkPopoverMenu" id="screenshots_menu">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="screenshots_menu_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_top">5</property>
+        <property name="margin_bottom">5</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkModelButton" id="screenshot_button_all">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">app.on_screenshot_all</property>
+            <property name="text" translatable="yes">All</property>
+            <property name="centered">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton" id="screenshot_button_video">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">app.on_screenshot_video</property>
+            <property name="text" translatable="yes">Video</property>
+            <property name="centered">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkModelButton" id="screenshot_button_osd">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="action_name">app.on_screenshot_osd</property>
+            <property name="text" translatable="yes">OSD</property>
+            <property name="centered">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="submenu">main</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
   <object class="GtkListStore" id="services_list_store">
     <columns>
       <!-- column-name cas -->
@@ -947,7 +1018,6 @@ Author: Dmitriy Yefremov
     <property name="startup_id">DemonEditor</property>
     <signal name="check-resize" handler="on_resize" swapped="no"/>
     <signal name="delete-event" handler="on_close_app" swapped="no"/>
-    <signal name="window-state-event" handler="on_main_window_state" swapped="no"/>
     <child>
       <placeholder/>
     </child>
@@ -1029,7 +1099,6 @@ Author: Dmitriy Yefremov
                 <child>
                   <object class="GtkButton" id="telnet_tool_button">
                     <property name="label" translatable="yes"> </property>
-                    <property name="visible">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Telnet</property>
@@ -2735,7 +2804,7 @@ Author: Dmitriy Yefremov
               <object class="GtkLabel" id="app_ver_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">0.4.9 Pre-alpha</property>
+                <property name="label" translatable="yes">0.4.8 Pre-alpha</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -2770,8 +2839,6 @@ Author: Dmitriy Yefremov
                   <object class="GtkImage" id="info_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
                     <property name="stock">gtk-info</property>
                   </object>
                   <packing>
@@ -2845,8 +2912,6 @@ Author: Dmitriy Yefremov
               <object class="GtkImage" id="http_status_image">
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">No connection to the receiver!</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
                 <property name="margin_left">10</property>
                 <property name="margin_right">10</property>
                 <property name="icon_name">network-offline</property>
@@ -2887,8 +2952,6 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">False</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Record</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
                     <signal name="clicked" handler="on_record" swapped="no"/>
                     <child>
                       <object class="GtkImage" id="record_button_image">
diff --git a/app/ui/picons_manager.glade b/app/ui/picons_manager.glade
index 95798ed2..b60058b4 100644
--- a/app/ui/picons_manager.glade
+++ b/app/ui/picons_manager.glade
@@ -32,6 +32,29 @@ Author: Dmitriy Yefremov
   <!-- interface-name DemonEditor -->
   <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
+  <object class="GtkImage" id="cancel_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close-symbolic</property>
+  </object>
+  <object class="GtkImage" id="convert_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">edit-redo-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="filter_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">edit-find-replace-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
+  <object class="GtkImage" id="load_providers">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">network-server-symbolic</property>
+    <property name="icon_size">1</property>
+  </object>
   <object class="GtkListStore" id="picons_dest_list_store">
     <columns>
       <!-- column-name picon -->
@@ -271,59 +294,25 @@ Author: Dmitriy Yefremov
                 <property name="margin_top">10</property>
                 <signal name="notify::visible-child" handler="on_visible_page" swapped="no"/>
                 <child>
-                  <object class="GtkFrame" id="explorer_frame">
+                  <object class="GtkBox" id="explorer_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label_xalign">0.5</property>
-                    <property name="shadow_type">in</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkBox" id="explorer_box">
-                        <property name="visible">True</property>
+                      <object class="GtkBox" id="filter_service_box">
                         <property name="can_focus">False</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">5</property>
-                        <property name="margin_top">5</property>
-                        <property name="margin_bottom">5</property>
-                        <property name="orientation">vertical</property>
+                        <property name="tooltip_text" translatable="yes">Filter services in the main list.</property>
+                        <property name="halign">end</property>
+                        <property name="valign">end</property>
                         <property name="spacing">5</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="picons_view_sw">
+                          <object class="GtkLabel" id="filter_services_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <object class="GtkIconView" id="picons_view">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="margin">5</property>
-                                <property name="model">picons_sort_model</property>
-                                <property name="row_spacing">5</property>
-                                <property name="column_spacing">5</property>
-                                <property name="tooltip_column">1</property>
-                                <property name="item_padding">5</property>
-                                <property name="activate_on_single_click">True</property>
-                                <signal name="drag-data-get" handler="on_picons_view_drag_data_get" swapped="no"/>
-                                <signal name="drag-data-received" handler="on_picons_view_drag_data_received" swapped="no"/>
-                                <signal name="drag-drop" handler="on_picons_view_drag_drop" swapped="no"/>
-                                <signal name="realize" handler="on_picons_view_realize" swapped="no"/>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="picon_renderer">
-                                    <property name="width">128</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="pixbuf">0</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererText" id="picon_title_renderer">
-                                    <property name="alignment">center</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <property name="label" translatable="yes">Filter services</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -332,48 +321,76 @@ Author: Dmitriy Yefremov
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSearchBar" id="search_bar">
+                          <object class="GtkSwitch" id="filter_services_switch">
+                            <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_top">1</property>
-                            <property name="margin_bottom">1</property>
-                            <child>
-                              <object class="GtkSearchEntry" id="picons_search_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="primary_icon_name">edit-find-symbolic</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="primary_icon_sensitive">False</property>
-                              </object>
-                            </child>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <signal name="state-set" handler="on_filter_services_switch" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="pack_type">end</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSearchBar" id="search_bar">
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">1</property>
+                        <property name="margin_bottom">1</property>
                         <child>
-                          <object class="GtkSearchBar" id="filter_bar">
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">1</property>
-                            <property name="margin_bottom">1</property>
-                            <child>
-                              <object class="GtkSearchEntry" id="picons_filter_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="primary_icon_name">edit-find-replace-symbolic</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="primary_icon_sensitive">False</property>
-                                <signal name="search-changed" handler="on_picons_filter_changed" swapped="no"/>
-                              </object>
-                            </child>
+                          <object class="GtkSearchEntry" id="picons_search_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="primary_icon_name">edit-find-symbolic</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">False</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSearchBar" id="filter_bar">
+                        <property name="can_focus">False</property>
+                        <property name="margin_top">1</property>
+                        <property name="margin_bottom">1</property>
+                        <child>
+                          <object class="GtkSearchEntry" id="picons_filter_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="primary_icon_stock">gtk-spell-check</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">False</property>
+                            <signal name="search-changed" handler="on_picons_filter_changed" swapped="no"/>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="explorer_paths_frame">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0.5</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkPaned" id="explorer_paned">
                             <property name="visible">True</property>
@@ -703,60 +720,70 @@ Author: Dmitriy Yefremov
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInfoBar" id="explorer_info_bar">
+                      <object class="GtkFrame" id="explorer_info_bar_frame">
                         <property name="can_focus">False</property>
-                        <property name="message_type">other</property>
-                        <child internal-child="action_area">
-                          <object class="GtkButtonBox">
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkInfoBar" id="explorer_info_bar">
                             <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <property name="layout_style">end</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child internal-child="content_area">
-                          <object class="GtkBox" id="explorer_info_bar_box">
-                            <property name="can_focus">False</property>
-                            <property name="spacing">10</property>
-                            <child>
-                              <object class="GtkImage" id="picon_info_image">
-                                <property name="width_request">128</property>
-                                <property name="height_request">72</property>
-                                <property name="visible">True</property>
+                            <property name="message_type">other</property>
+                            <child internal-child="action_area">
+                              <object class="GtkButtonBox">
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
-                                <property name="icon_size">6</property>
-                                <signal name="drag-data-received" handler="on_picon_info_image_drag_data_received" swapped="no"/>
+                                <property name="spacing">6</property>
+                                <property name="layout_style">end</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child internal-child="content_area">
+                              <object class="GtkBox" id="explorer_info_bar_box">
+                                <property name="can_focus">False</property>
+                                <property name="spacing">10</property>
+                                <child>
+                                  <object class="GtkImage" id="picon_info_image">
+                                    <property name="width_request">128</property>
+                                    <property name="height_request">72</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-missing-image</property>
+                                    <property name="icon_size">6</property>
+                                    <signal name="drag-data-received" handler="on_picon_info_image_drag_data_received" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="picon_info_label">
+                                    <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">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="picon_info_label">
-                                <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">1</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
-                        <child>
+                        <child type="label_item">
                           <placeholder/>
                         </child>
                       </object>
@@ -1493,7 +1520,7 @@ Author: Dmitriy Yefremov
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="action_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
@@ -1517,6 +1544,7 @@ Author: Dmitriy Yefremov
                     <property name="image">send_image</property>
                     <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_send" swapped="no"/>
+                    <signal name="drag-data-received" handler="on_send_button_drag_data_received" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1534,6 +1562,7 @@ Author: Dmitriy Yefremov
                     <property name="image">receive_image</property>
                     <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_download" swapped="no"/>
+                    <signal name="drag-data-received" handler="on_download_button_drag_data_received" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1541,6 +1570,48 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkButton" id="remove_button">
+                    <property name="label" translatable="yes">Remove</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Remove all picons from the receiver</property>
+                    <property name="image">remove_image</property>
+                    <property name="always_show_image">True</property>
+                    <signal name="clicked" handler="on_remove" swapped="no"/>
+                    <signal name="drag-data-received" handler="on_remove_button_drag_data_received" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="info_check_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Details</property>
+                    <property name="draw_indicator">False</property>
+                    <child>
+                      <object class="GtkImage" id="info_check_button_image">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">emblem-important-symbolic</property>
+                      </object>
+                    </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">5</property>
+                    <property name="secondary">True</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkToggleButton" id="filter_button">
                     <property name="label" translatable="yes">Filter</property>
@@ -1556,24 +1627,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="remove_button">
-                    <property name="label" translatable="yes">Remove</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Remove all picons from the receiver</property>
-                    <property name="image">remove_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_remove" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">6</property>
                   </packing>
                 </child>
               </object>
@@ -1597,7 +1651,7 @@ Author: Dmitriy Yefremov
                     <property name="image">cancel_image</property>
                     <property name="always_show_image">True</property>
                     <signal name="clicked" handler="on_cancel" swapped="no"/>
-                    <accelerator key="z" signal="clicked"/>
+                    <accelerator key="z" signal="clicked" modifiers="Primary"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1667,6 +1721,9 @@ Author: Dmitriy Yefremov
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/app/ui/picons_manager.py b/app/ui/picons_manager.py
index f0cd6dcf..00e2c67f 100644
--- a/app/ui/picons_manager.py
+++ b/app/ui/picons_manager.py
@@ -102,8 +102,6 @@ class PiconsDialog:
         self._picons_entry = builder.get_object("picons_entry")
         self._url_entry = builder.get_object("url_entry")
         self._picons_dir_entry = builder.get_object("picons_dir_entry")
-        self._info_bar = builder.get_object("info_bar")
-        self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("info_bar_message_label")
         self._info_check_button = builder.get_object("info_check_button")
         self._picon_info_image = builder.get_object("picon_info_image")
@@ -138,7 +136,9 @@ class PiconsDialog:
         self._filter_button.bind_property("active", builder.get_object("src_title_grid"), "visible")
         self._filter_button.bind_property("active", builder.get_object("dst_title_grid"), "visible")
         self._filter_button.bind_property("visible", self._info_check_button, "visible")
-        self._info_check_button.bind_property("active", builder.get_object("explorer_info_bar"), "visible")
+        explorer_info_bar = builder.get_object("explorer_info_bar")
+        explorer_info_bar.bind_property("visible", builder.get_object("explorer_info_bar_frame"), "visible")
+        self._info_check_button.bind_property("active", explorer_info_bar, "visible")
         # Init drag-and-drop
         self.init_drag_and_drop()
         # Style
diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade
index 60a74bcd..46b0705b 100644
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
@@ -28,7 +28,6 @@ Author: Dmitriy Yefremov
 -->
 <interface domain="demon-editor">
   <requires lib="gtk+" version="3.16"/>
-  <!-- interface-css-provider-path style.css -->
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
   <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
@@ -88,7 +87,7 @@ Author: Dmitriy Yefremov
         <property name="image">set_default_image</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_profile_set_default" swapped="no"/>
-        <accelerator key="d" signal="activate" modifiers="Primary"/>
+        <accelerator key="d" signal="activate"/>
       </object>
     </child>
     <child>
@@ -2931,44 +2930,129 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkFrame" id="yt_dl_frame">
-                    <property name="sensitive">False</property>
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_top">5</property>
                     <property name="margin_bottom">5</property>
                     <property name="label_xalign">0.019999999552965164</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkGrid" id="yt_dl_grid">
+                      <object class="GtkBox" id="yt_dl_box">
                         <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">5</property>
                         <property name="margin_bottom">5</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
                         <child>
-                          <object class="GtkLabel" id="enable_yt_dl_label">
+                          <object class="GtkBox" id="enable_yt_dl_box">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Enables parsing links using youtube-dl to get direct links to media</property>
-                            <property name="halign">start</property>
-                            <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Enable support for youtube-dl (experimental)</property>
+                            <property name="tooltip_text" translatable="yes">Enables parsing links using youtube-dl to get direct media links.</property>
+                            <child>
+                              <object class="GtkLabel" id="enable_yt_dl_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Enable support for</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLinkButton" id="yt_dl_link_button">
+                                <property name="label">youtube-dl</property>
+                                <property name="name">status-bar-button</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="halign">start</property>
+                                <property name="valign">center</property>
+                                <property name="relief">none</property>
+                                <property name="uri">https://youtube-dl.org/</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child type="center">
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">center</property>
+                                <property name="label" translatable="yes">EXPERIMENTAL!</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="enable_yt_dl_switch">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">Enables parsing links using youtube-dl to get direct links to media</property>
+                                <property name="halign">end</property>
+                                <property name="valign">center</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="enable_y_dl_switch">
+                          <object class="GtkBox" id="yt_dl_update_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Enables parsing links using youtube-dl to get direct links to media</property>
-                            <property name="halign">end</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="auto_update_yt_dl_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Auto-check for updates</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSwitch" id="enable_update_yt_dl_switch">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="halign">end</property>
+                                <property name="valign">center</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>