updated it *.mo file

added missing polish translations

DemonEditor.desktop

@@ -5,6 +5,7 @@ Comment=Channel and satellite list editor for Enigma2
 Comment[ru]=Редактор списка каналов и спутников для Enigma2
 Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
 Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
+Comment[it]=Editor di liste canali e satelliti per Enigma2
 Comment[tr]=Enigma2 için kanal ve uydu listesi editörü
 Comment[es]=Editor de listas de canales y satélites para Enigma2
 Icon=demon-editor

README.md

@@ -36,7 +36,8 @@ Clipboard is **"rubber"**. There is an accumulation before the insertion!
   beginning or inserts (creates) a new bouquet.  
 * **Ctrl + BackSpace** - copies the selected channels from the main list to the bouquet end.
 * **Ctrl + E** - edit.                                                                                                                                                                                                                                                                                                                    
-* **Ctrl + R, F2** - rename.                                                                                                                                                                                                                                                                                                                     
+* **Ctrl + R, F2** - rename.  
+* **Ctrl + Alt + R** - rename for bouquet.    
 * **Ctrl + S, T** in Satellites edit tool for create satellite or transponder.                                                                 
 * **Ctrl + L** - parental lock.                                                                                                          
 * **Ctrl + H** - hide/skip.                                                                                                                                                                                                 
@@ -85,7 +86,8 @@ Recommended copy the package to the **Application** directory.
 Perhaps in the security settings it will be necessary to allow the launch of this application!  
 
 * ### MS Windows  
-**Windows users can also run this program.** One way is to use the [MSYS2](https://www.msys2.org/) platform.  
+**Windows users can also run this program.**  
+One way is to use the [MSYS2](https://www.msys2.org/) platform. You can use [this](https://github.com/DYefremov/DemonEditor/blob/master/build/BUILD_WIN.md) quick guide.   
 In addition, you can download a ready-made build (**64-bit**) from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.  
 
 **All builds may contain components distributed under the GPL [v3](http://www.gnu.org/licenses/gpl-3.0.html) or lower license.  

app/eparser/ecommons.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -61,8 +61,8 @@ BouquetService = namedtuple("BouquetService", ["name", "type", "data", "num"])
 
 Satellite = namedtuple("Satellite", ["name", "flags", "position", "transponders"])
 
-Transponder = namedtuple("Transponder", ["frequency", "symbol_rate", "polarization", "fec_inner",
-                                         "system", "modulation", "pls_mode", "pls_code", "is_id"])
+Transponder = namedtuple("Transponder", ["frequency", "symbol_rate", "polarization", "fec_inner", "system",
+                                         "modulation", "pls_mode", "pls_code", "is_id", "t2mi_plp_id"])
 
 
 class TrType(Enum):
@@ -247,6 +247,7 @@ def is_transponder_valid(tr: Transponder):
         tr.pls_mode is None or int(tr.pls_mode)
         tr.pls_code is None or int(tr.pls_code)
         tr.is_id is None or int(tr.is_id)
+        tr.t2mi_plp_id is None or int(tr.t2mi_plp_id)
     except (TypeError, ValueError) as e:
         log(f"Transponder validation error: {e}\n{tr}")
         return False

app/eparser/enigma/bouquets.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -98,7 +98,7 @@ class BouquetsWriter:
                         self.write_bouquet(f"{self._path}userbouquet.{bq_name}.{bqs.type}", bq.name, bq.services)
                     line.append(self._SERVICE.format(2 if bqs.type == BqType.RADIO.value else 1, bq_name, bqs.type))
 
-            with open(f"{self._path}bouquets.{bqs.type}", "w", encoding="utf-8") as file:
+            with open(f"{self._path}bouquets.{bqs.type}", "w", encoding="utf-8", newline="\n") as file:
                 file.writelines(line)
 
     def write_bouquet(self, path, name, services):
@@ -136,7 +136,7 @@ class BouquetsWriter:
                 else:
                     bouquet.append(f"#SERVICE {data}\n")
 
-        with open(path, "w", encoding="utf-8") as file:
+        with open(path, "w", encoding="utf-8", newline="\n") as file:
             file.writelines(bouquet)
 
     def write_sub_bouquet(self, path, file_name, bq, bq_type):
@@ -148,7 +148,7 @@ class BouquetsWriter:
             self.write_bouquet(f"{path}{bq_name}", sb.name, sb.services)
             bouquet.append(f"#SERVICE 1:7:{sb_type}:0:0:0:0:0:0:0:FROM BOUQUET \"{bq_name}\" ORDER BY bouquet\n")
 
-        with open(f"{self._path}userbouquet.{file_name}.{bq_type}", "w", encoding="utf-8") as file:
+        with open(f"{self._path}userbouquet.{file_name}.{bq_type}", "w", encoding="utf-8", newline="\n") as file:
             file.writelines(bouquet)
 
 

app/eparser/enigma/lamedb.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -310,7 +310,7 @@ class LameDbWriter:
     def write(self):
         if self._fmt == 4:
             # Writing lamedb file ver.4
-            with open(self._path + _FILE_NAME, "w", encoding="utf-8") as file:
+            with open(self._path + _FILE_NAME, "w", encoding="utf-8", newline="\n") as file:
                 file.writelines(LameDbReader.get_services_lines(self._services))
         elif self._fmt == 5:
             self.write_to_lamedb5()
@@ -335,7 +335,7 @@ class LameDbWriter:
         lines.extend(services_lines)
         lines.append(_END_LINE)
 
-        with open(self._path + "lamedb5", "w", encoding="utf-8") as file:
+        with open(self._path + "lamedb5", "w", encoding="utf-8", newline="\n") as file:
             file.writelines(lines)
 
 

app/eparser/satxml.py

@@ -1,4 +1,32 @@
-""" Module foe parsing Satellites.xml
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2022 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
+""" Module for parsing satellites.xml file.
 
     For more info see __COMMENT
 """
@@ -62,6 +90,8 @@ def write_satellites(satellites, data_path):
                 transponder_child.setAttribute("pls_code", tr.pls_code)
             if tr.is_id:
                 transponder_child.setAttribute("is_id", tr.is_id)
+            if tr.t2mi_plp_id:
+                transponder_child.setAttribute("t2mi_plp_id", tr.t2mi_plp_id)
             sat_child.appendChild(transponder_child)
         root.appendChild(sat_child)
     doc.writexml(open(data_path, "w"),
@@ -87,9 +117,10 @@ def parse_transponders(elem, sat_name):
                                  MODULATION[atr["modulation"].value],
                                  atr["pls_mode"].value if "pls_mode" in atr else None,
                                  atr["pls_code"].value if "pls_code" in atr else None,
-                                 atr["is_id"].value if "is_id" in atr else None)
+                                 atr["is_id"].value if "is_id" in atr else None,
+                                 atr["t2mi_plp_id"].value if "t2mi_plp_id" in atr else None)
             except Exception as e:
-                message = "Error: can't parse transponder for '{}' satellite! {}".format(sat_name, repr(e))
+                message = f"Error: can't parse transponder for '{sat_name}' satellite! {repr(e)}"
                 log(message)
             else:
                 transponders.append(tr)
@@ -97,7 +128,7 @@ def parse_transponders(elem, sat_name):
 
 
 def parse_sat(elem):
-    """ Parsing satellite """
+    """ Parsing satellite. """
     sat_name = elem.attributes["name"].value
     return Satellite(sat_name,
                      elem.attributes["flags"].value,
@@ -106,7 +137,7 @@ def parse_sat(elem):
 
 
 def parse_satellites(path):
-    """ Parsing satellites from xml"""
+    """ Parsing satellites from xml. """
     dom = parse(path)
     satellites = []
 

app/settings.py

@@ -92,6 +92,7 @@ class Defaults(Enum):
     FAV_CLICK_MODE = 0
     PLAY_STREAMS_MODE = 1 if IS_DARWIN else 0
     STREAM_LIB = "mpv" if IS_WIN else "vlc"
+    MAIN_LIST_PLAYBACK = False
     PROFILE_FOLDER_DEFAULT = False
     RECORDS_PATH = DATA_PATH + "records{}".format(SEP)
     ACTIVATE_TRANSCODING = False
@@ -416,7 +417,7 @@ class Settings:
 
     @property
     def profile_data_path(self):
-        return "{}data{}{}{}".format(self.default_data_path, SEP, self._current_profile, SEP)
+        return f"{self.default_data_path}data{SEP}{self._current_profile}{SEP}"
 
     @profile_data_path.setter
     def profile_data_path(self, value):
@@ -425,8 +426,8 @@ class Settings:
     @property
     def profile_picons_path(self):
         if self.profile_folder_is_default:
-            return "{}picons{}".format(self.profile_data_path, SEP)
-        return "{}{}{}".format(self.default_picon_path, self._current_profile, SEP)
+            return f"{self.profile_data_path}picons{SEP}"
+        return f"{self.default_picon_path}{self._current_profile}{SEP}"
 
     @profile_picons_path.setter
     def profile_picons_path(self, value):
@@ -435,8 +436,8 @@ class Settings:
     @property
     def profile_backup_path(self):
         if self.profile_folder_is_default:
-            return "{}backup{}".format(self.profile_data_path, SEP)
-        return "{}{}{}".format(self.default_backup_path, self._current_profile, SEP)
+            return f"{self.profile_data_path}backup{SEP}"
+        return f"{self.default_backup_path}{self._current_profile}{SEP}"
 
     @profile_backup_path.setter
     def profile_backup_path(self, value):
@@ -492,6 +493,22 @@ class Settings:
     def stream_lib(self, value):
         self._settings["stream_lib"] = value
 
+    @property
+    def fav_click_mode(self):
+        return self._settings.get("fav_click_mode", Defaults.FAV_CLICK_MODE.value)
+
+    @fav_click_mode.setter
+    def fav_click_mode(self, value):
+        self._settings["fav_click_mode"] = value
+
+    @property
+    def main_list_playback(self):
+        return self._settings.get("main_list_playback", Defaults.MAIN_LIST_PLAYBACK.value)
+
+    @main_list_playback.setter
+    def main_list_playback(self, value):
+        self._settings["main_list_playback"] = value
+
     # *********** EPG ************ #
 
     @property
@@ -579,14 +596,6 @@ class Settings:
     def enable_send_to(self, value):
         self._settings["enable_send_to"] = value
 
-    @property
-    def fav_click_mode(self):
-        return self._settings.get("fav_click_mode", Defaults.FAV_CLICK_MODE.value)
-
-    @fav_click_mode.setter
-    def fav_click_mode(self, value):
-        self._settings["fav_click_mode"] = value
-
     @property
     def language(self):
         return self._settings.get("language", locale.getlocale()[0] or "en_US")
@@ -795,7 +804,10 @@ class Settings:
             Settings.write_settings(Settings.get_default_settings())
 
         with open(CONFIG_FILE, "r", encoding="utf-8") as config_file:
-            return json.load(config_file)
+            try:
+                return json.load(config_file)
+            except ValueError as e:
+                raise SettingsReadException(e)
 
     @staticmethod
     def get_default_settings(profile_name="default"):

app/tools/picons.py

@@ -57,7 +57,7 @@ class PiconsCzDownloader:
     _PERM_URL = "https://picon.cz/download/7337"
     _BASE_URL = "https://picon.cz/download/"
     _BASE_LOGO_URL = "https://picon.cz/picon/0/"
-    _HEADER = {"User-Agent": "DemonEditor/2.2.0", "Referer": ""}
+    _HEADER = {"User-Agent": "DemonEditor/2.2.4", "Referer": ""}
     _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$")
     _FILE_PATTERN = re.compile(b"\\s+(1_.*\\.png).*")
 
@@ -136,7 +136,7 @@ class PiconsCzDownloader:
             raise PiconsError("7-zip [7z] archiver not found!")
 
         if IS_WIN:
-            exe = f"C:{os.sep}Program Files{os.sep}7-Zip{os.sep}{exe}.exe"
+            exe = f"{exe}.exe" if GTK_PATH else f"C:{os.sep}Program Files{os.sep}7-Zip{os.sep}{exe}.exe"
             if not os.path.isfile(exe):
                 raise PiconsError("7-Zip executable not found!")
 

app/tools/satellites.py

@@ -164,16 +164,15 @@ class SatellitesParser(HTMLParser):
 
         for src in SatelliteSource.get_sources(self._source):
             try:
-                request = requests.get(url=src, headers=_HEADERS, timeout=_TIMEOUT)
+                resp = requests.get(url=src, headers=_HEADERS, timeout=_TIMEOUT)
             except requests.exceptions.RequestException as e:
                 log(f"Getting satellite list error: {repr(e)}")
-                return []
             else:
-                reason = request.reason
+                reason = resp.reason
                 if reason == "OK":
-                    self.feed(request.text)
+                    self.feed(resp.text)
                 else:
-                    log(reason)
+                    log(f"Getting satellite list error: {reason} -> {resp.url}")
 
         if self._rows:
             if self._source is SatelliteSource.FLYSAT:
@@ -183,6 +182,8 @@ class SatellitesParser(HTMLParser):
             elif source is SatelliteSource.KINGOFSAT:
                 return self.get_satellites_for_king_of_sat()
 
+        return []
+
     def get_satellite(self, sat):
         pos = sat[1]
         return Satellite(name=f"{pos} {sat[0]}", flags="0",
@@ -327,7 +328,7 @@ class SatellitesParser(HTMLParser):
                         if is_transponder_valid(tr):
                             n_trs.append(tr)
 
-                tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, None)
+                tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, None, None)
                 if is_transponder_valid(tr):
                     trs.append(tr)
 
@@ -363,7 +364,7 @@ class SatellitesParser(HTMLParser):
             if plp is not None:
                 log(f"Detected T2-MI transponder! [{freq} {sr} {pol}] ")
 
-            tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, is_id)
+            tr = Transponder(f"{freq}000", f"{sr}000", pol, fec, sys, mod, pls_mode, pls_code, is_id, None)
             if is_transponder_valid(tr):
                 trs.append(tr)
 
@@ -400,7 +401,7 @@ class SatellitesParser(HTMLParser):
             if t2_mi:
                 log(f"Detected T2-MI transponder! [{freq} {sr} {pol}] ")
 
-            tr = Transponder(freq, f"{sr}000", pol, fec, sys, mod, pls_id, pls_code, is_id)
+            tr = Transponder(freq, f"{sr}000", pol, fec, sys, mod, pls_id, pls_code, is_id, None)
             if is_transponder_valid(tr):
                 trs.append(tr)
 
@@ -478,9 +479,11 @@ class ServicesParser(HTMLParser):
                         if a[0] != "title":
                             continue
                         txt = a[1]
-                        if txt and txt.startswith("Id: "):
+                        sep = "Id: "
+                        if txt and txt.startswith(sep):
                             # Saving the 'short' name.
-                            self._current_cell.text = txt.lstrip("Id: ")
+                            _, sep, name = txt.partition(sep)
+                            self._current_cell.text = name
         elif tag == "img":
             img_link = attrs[0][1]
             if self._source is SatelliteSource.LYNGSAT:

app/ui/control.glade

@@ -1131,6 +1131,18 @@ Author: Dmitriy Yefremov
       <placeholder/>
     </child>
   </object>
+  <object class="GtkListStore" id="network_model">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name ip -->
+      <column type="gchararray"/>
+      <!-- column-name status -->
+      <column type="gchararray"/>
+      <!-- column-name data -->
+      <column type="PyObject"/>
+    </columns>
+  </object>
   <object class="GtkListStore" id="rec_paths_model">
     <columns>
       <!-- column-name icon -->
@@ -1161,6 +1173,12 @@ Author: Dmitriy Yefremov
     <signal name="row-deleted" handler="on_recordings_model_changed" swapped="no"/>
     <signal name="row-inserted" handler="on_recordings_model_changed" swapped="no"/>
   </object>
+  <object class="GtkTreeModelFilter" id="recordings_filter_model">
+    <property name="child_model">recordings_model</property>
+  </object>
+  <object class="GtkTreeModelSort" id="recordings_sort_model">
+    <property name="model">recordings_filter_model</property>
+  </object>
   <object class="GtkBox" id="recordings_box">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1182,7 +1200,7 @@ Author: Dmitriy Yefremov
                 <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_top">2</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="recordings_header_box">
@@ -1193,6 +1211,28 @@ Author: Dmitriy Yefremov
                     <property name="margin_top">5</property>
                     <property name="margin_bottom">5</property>
                     <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkToggleButton" id="recordings_filter_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Filter</property>
+                        <signal name="toggled" handler="on_recordings_filter_toggled" swapped="no"/>
+                        <child>
+                          <object class="GtkImage" id="recordings_filter_button_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">edit-find-replace-symbolic</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="GtkButton" id="recordings_remove_button">
                         <property name="visible">True</property>
@@ -1208,6 +1248,37 @@ Author: Dmitriy Yefremov
                             <property name="icon_name">user-trash-symbolic</property>
                           </object>
                         </child>
+                        <accelerator key="Delete" signal="clicked"/>
+                      </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">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="recordings_fs_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_bottom">5</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="recordings_filter_entry">
+                        <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>
+                        <property name="visible" bind-source="recordings_filter_button" bind-property="active"/>
+                        <signal name="search-changed" handler="on_recordings_filter_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1216,13 +1287,78 @@ Author: Dmitriy Yefremov
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <object class="GtkBox" id="recordings_search_box">
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <child>
+                          <object class="GtkSearchEntry" id="recordings_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">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="recordings_search_down_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <child>
+                              <object class="GtkArrow" id="recordings_down_arrow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="arrow_type">down</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="recordings_search_up_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <child>
+                              <object class="GtkArrow" id="recordings_up_arrow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="arrow_type">up</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="group"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -1234,7 +1370,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkTreeView" id="recordings_view">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="model">recordings_model</property>
+                        <property name="model">recordings_sort_model</property>
                         <property name="enable_grid_lines">both</property>
                         <property name="tooltip_column">5</property>
                         <signal name="row-activated" handler="on_recordings_activated" swapped="no"/>
@@ -1245,9 +1381,11 @@ Author: Dmitriy Yefremov
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="rec_service_column">
+                            <property name="resizable">True</property>
                             <property name="min_width">100</property>
                             <property name="title" translatable="yes">Service</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">0</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_service_renderer">
                                 <property name="xalign">0.49000000953674316</property>
@@ -1260,10 +1398,12 @@ Author: Dmitriy Yefremov
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="rec_title_column">
-                            <property name="sizing">autosize</property>
+                            <property name="resizable">True</property>
                             <property name="min_width">150</property>
                             <property name="title" translatable="yes">Title</property>
+                            <property name="expand">True</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">1</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_title_renderer">
                                 <property name="xpad">5</property>
@@ -1280,6 +1420,7 @@ Author: Dmitriy Yefremov
                             <property name="min_width">100</property>
                             <property name="title" translatable="yes">Time</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">2</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_time_renderer">
                                 <property name="xpad">5</property>
@@ -1295,6 +1436,7 @@ Author: Dmitriy Yefremov
                             <property name="min_width">100</property>
                             <property name="title" translatable="yes">Length</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">3</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_len_renderer">
                                 <property name="xalign">0.49000000953674316</property>
@@ -1312,6 +1454,7 @@ Author: Dmitriy Yefremov
                             <property name="title" translatable="yes">File</property>
                             <property name="expand">True</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">4</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_file_renderer">
                                 <property name="ellipsize">end</property>
@@ -1328,6 +1471,7 @@ Author: Dmitriy Yefremov
                             <property name="title" translatable="yes">Description</property>
                             <property name="expand">True</property>
                             <property name="alignment">0.5</property>
+                            <property name="sort_column_id">5</property>
                             <child>
                               <object class="GtkCellRendererText" id="rec_desc_renderer">
                                 <property name="ellipsize">end</property>
@@ -1344,7 +1488,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -1386,7 +1530,7 @@ Author: Dmitriy Yefremov
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -1469,7 +1613,7 @@ Author: Dmitriy Yefremov
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="recordings_path_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Paths</property>
@@ -2297,59 +2441,163 @@ Author: Dmitriy Yefremov
   <object class="GtkBox" id="control_box">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="margin_top">2</property>
     <property name="orientation">vertical</property>
     <property name="spacing">10</property>
     <child>
-      <object class="GtkBox" id="power_button_box">
+      <object class="GtkBox" id="control_header_box">
         <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">25</property>
-        <property name="margin_right">25</property>
+        <property name="margin_left">20</property>
+        <property name="margin_right">20</property>
         <property name="margin_top">5</property>
         <property name="margin_bottom">5</property>
+        <property name="spacing">15</property>
         <child>
-          <object class="GtkButton" id="standby_button">
-            <property name="width_request">70</property>
-            <property name="visible">True</property>
+          <object class="GtkToggleButton" id="control_network_button">
+            <property name="label">gtk-network</property>
+            <property name="width_request">100</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Standby</property>
-            <property name="action_name">app.on_standby</property>
-            <child>
-              <object class="GtkImage" id="standby_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">16</property>
-                <property name="icon_name">system-log-out</property>
-                <property name="icon_size">1</property>
-              </object>
-            </child>
+            <property name="valign">center</property>
+            <property name="use_stock">True</property>
+            <property name="always_show_image">True</property>
+            <signal name="toggled" handler="on_network_toggled" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButton" id="wake_up_button">
-            <property name="width_request">70</property>
+        <child type="center">
+          <object class="GtkBox" id="power_button_box">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Wake Up</property>
-            <property name="action_name">app.on_wake_up</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
             <child>
-              <object class="GtkImage" id="wake_up_image">
+              <object class="GtkButton" id="standby_button">
+                <property name="width_request">70</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">16</property>
-                <property name="icon_name">document-revert</property>
-                <property name="icon_size">1</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Standby</property>
+                <property name="action_name">app.on_standby</property>
+                <child>
+                  <object class="GtkImage" id="standby_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">system-log-out</property>
+                    <property name="icon_size">1</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="wake_up_button">
+                <property name="width_request">70</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Wake Up</property>
+                <property name="action_name">app.on_wake_up</property>
+                <child>
+                  <object class="GtkImage" id="wake_up_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">document-revert</property>
+                    <property name="icon_size">1</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="reboot_button">
+                <property name="width_request">70</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Reboot</property>
+                <property name="action_name">app.on_reboot</property>
+                <child>
+                  <object class="GtkImage" id="reboot_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">view-refresh</property>
+                    <property name="icon_size">1</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="restart_gui_butto">
+                <property name="width_request">70</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Restart GUI</property>
+                <property name="action_name">app.on_restart_gui</property>
+                <child>
+                  <object class="GtkImage" id="restart_gui_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">window-new</property>
+                    <property name="icon_size">1</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="shutdown_butto">
+                <property name="width_request">70</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Shutdown</property>
+                <property name="action_name">app.on_shutdown</property>
+                <child>
+                  <object class="GtkImage" id="shutdown_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">application-exit</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <style>
+              <class name="group"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -2357,80 +2605,6 @@ Author: Dmitriy Yefremov
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButton" id="reboot_button">
-            <property name="width_request">70</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Reboot</property>
-            <property name="action_name">app.on_reboot</property>
-            <child>
-              <object class="GtkImage" id="reboot_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">16</property>
-                <property name="icon_name">view-refresh</property>
-                <property name="icon_size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="restart_gui_butto">
-            <property name="width_request">70</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Restart GUI</property>
-            <property name="action_name">app.on_restart_gui</property>
-            <child>
-              <object class="GtkImage" id="restart_gui_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">16</property>
-                <property name="icon_name">window-new</property>
-                <property name="icon_size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="shutdown_butto">
-            <property name="width_request">70</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Shutdown</property>
-            <property name="action_name">app.on_shutdown</property>
-            <child>
-              <object class="GtkImage" id="shutdown_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixel_size">16</property>
-                <property name="icon_name">application-exit</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">5</property>
-          </packing>
-        </child>
-        <style>
-          <class name="group"/>
-        </style>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -2443,11 +2617,108 @@ Author: Dmitriy Yefremov
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">10</property>
+        <child>
+          <object class="GtkFrame" id="control_network_frame">
+            <property name="width_request">240</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0.5</property>
+            <property name="shadow_type">in</property>
+            <property name="visible" bind-source="control_network_button" bind-property="active"/>
+            <child>
+              <object class="GtkBox" id="network_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>
+                <child>
+                  <object class="GtkScrolledWindow" id="network_scrolled_window">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="network_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">network_model</property>
+                        <property name="enable_search">False</property>
+                        <property name="tooltip_column">3</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="network_view_selection"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="network_name_column">
+                            <property name="title" translatable="yes">Name</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="network_name_renderer"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="network_ip_column">
+                            <property name="title" translatable="yes">IP</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="network_ip_renderer"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="network_status_column">
+                            <property name="title" translatable="yes">Status</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="network_status_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+            <child type="label_item">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkFrame" id="info_box_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
+            <property name="label_xalign">0.5</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkBox" id="info_box">
@@ -2458,27 +2729,6 @@ Author: Dmitriy Yefremov
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkViewport" id="screenshot_view_port">
-                    <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>
-                    <child>
-                      <object class="GtkDrawingArea" id="screenshot_area">
-                        <property name="can_focus">False</property>
-                        <signal name="draw" handler="on_screenshot_draw" swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkBox" id="remote_signal_box">
                     <property name="visible">True</property>
@@ -2628,6 +2878,27 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkViewport" id="screenshot_view_port">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">2</property>
+                    <property name="margin_right">2</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="screenshot_area">
+                        <property name="can_focus">False</property>
+                        <signal name="draw" handler="on_screenshot_draw" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="label_item">
@@ -2637,7 +2908,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -2645,7 +2916,7 @@ Author: Dmitriy Yefremov
             <property name="width_request">300</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
+            <property name="label_xalign">0.5</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkBox" id="remote_control_box">
@@ -2654,8 +2925,8 @@ Author: Dmitriy Yefremov
                 <property name="valign">center</property>
                 <property name="margin_left">25</property>
                 <property name="margin_right">25</property>
-                <property name="margin_top">25</property>
-                <property name="margin_bottom">25</property>
+                <property name="margin_top">20</property>
+                <property name="margin_bottom">20</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
@@ -2670,6 +2941,7 @@ Author: Dmitriy Yefremov
                     <property name="margin_bottom">5</property>
                     <property name="row_spacing">5</property>
                     <property name="column_spacing">5</property>
+                    <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkButton" id="control_ok_button">
                         <property name="label" translatable="yes">OK</property>
@@ -3052,7 +3324,7 @@ audio-volume-medium-symbolic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
-                    <property name="margin_top">50</property>
+                    <property name="margin_top">15</property>
                     <property name="label_xalign">0.5</property>
                     <property name="shadow_type">none</property>
                     <child>
@@ -3065,10 +3337,12 @@ audio-volume-medium-symbolic</property>
                         <property name="margin_right">5</property>
                         <property name="margin_top">5</property>
                         <property name="margin_bottom">5</property>
+                        <property name="homogeneous">True</property>
                         <property name="layout_style">expand</property>
                         <child>
                           <object class="GtkButton">
                             <property name="label" translatable="yes">All</property>
+                            <property name="width_request">75</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -3137,7 +3411,7 @@ audio-volume-medium-symbolic</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>

app/ui/control.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@ from urllib.parse import quote
 from gi.repository import GLib
 
 from .dialogs import get_builder, show_dialog, DialogType, get_message
+from .main_helper import get_base_paths, get_base_model
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Page, Column, KeyboardKey, IS_GNOME_SESSION
 from ..commons import run_task, run_with_delay, log, run_idle
 from ..connections import HttpAPI, UtfFTP
@@ -659,13 +660,20 @@ class RecordingsTool(Gtk.Box):
                     "on_path_activated": self.on_path_activated,
                     "on_recordings_activated": self.on_recordings_activated,
                     "on_recording_remove": self.on_recording_remove,
-                    "on_recordings_model_changed": self.on_recordings_model_changed}
+                    "on_recordings_model_changed": self.on_recordings_model_changed,
+                    "on_recordings_filter_changed": self.on_recordings_filter_changed,
+                    "on_recordings_filter_toggled": self.on_recordings_filter_toggled}
 
         builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers,
-                              objects=("recordings_box", "recordings_model", "rec_paths_model"))
+                              objects=("recordings_box", "recordings_model", "rec_paths_model",
+                                       "recordings_sort_model", "recordings_filter_model"))
         self._rec_view = builder.get_object("recordings_view")
         self._paths_view = builder.get_object("recordings_paths_view")
         self._paned = builder.get_object("recordings_paned")
+        self._model = builder.get_object("recordings_model")
+        self._filter_model = builder.get_object("recordings_filter_model")
+        self._filter_model.set_visible_func(self.recordings_filter_function)
+        self._filter_entry = builder.get_object("recordings_filter_entry")
         self._recordings_count_label = builder.get_object("recordings_count_label")
         self.pack_start(builder.get_object("recordings_box"), True, True, 0)
         if settings.alternate_layout:
@@ -675,7 +683,7 @@ class RecordingsTool(Gtk.Box):
         self.show()
 
     def clear_data(self):
-        self._rec_view.get_model().clear()
+        self._model.clear()
         self._paths_view.get_model().clear()
 
     def on_layout_changed(self, app, alt_layout):
@@ -752,9 +760,8 @@ class RecordingsTool(Gtk.Box):
 
     @run_idle
     def update_recordings_data(self, recordings):
-        model = self._rec_view.get_model()
-        model.clear()
-        list(map(model.append, (self.get_recordings_row(r) for r in recordings.get("recordings", []))))
+        self._model.clear()
+        list(map(self._model.append, (self.get_recordings_row(r) for r in recordings.get("recordings", []))))
 
     def get_recordings_row(self, rec):
         service = rec.get("e2servicename")
@@ -781,6 +788,9 @@ class RecordingsTool(Gtk.Box):
             return
 
         model, paths = self._rec_view.get_selection().get_selected_rows()
+        paths = get_base_paths(paths, model)
+        model = get_base_model(model)
+
         if paths and self._ftp:
             for file, itr in ((model[p][-1].get("e2filename", ""), model.get_iter(p)) for p in paths):
                 resp = self._ftp.delete_file(file)
@@ -793,6 +803,17 @@ class RecordingsTool(Gtk.Box):
     def on_recordings_model_changed(self, model, path, itr=None):
         self._recordings_count_label.set_text(str(len(model)))
 
+    def on_recordings_filter_changed(self, entry):
+        self._filter_model.refilter()
+
+    def recordings_filter_function(self, model, itr, data):
+        txt = self._filter_entry.get_text().upper()
+        return next((s for s in model.get(itr, 0, 1, 2, 3, 4, 5) if s and txt in s.upper()), False)
+
+    def on_recordings_filter_toggled(self, button):
+        if not button.get_active():
+            self._filter_entry.set_text("")
+
     def on_playback(self, box, state):
         """ Updates state of the UI elements for playback mode. """
         if self._settings.play_streams_mode is PlayStreamsMode.BUILT_IN:
@@ -820,10 +841,11 @@ class ControlTool(Gtk.Box):
         self._pix = None
 
         handlers = {"on_volume_changed": self.on_volume_changed,
-                    "on_screenshot_draw": self.on_screenshot_draw}
+                    "on_screenshot_draw": self.on_screenshot_draw,
+                    "on_network_toggled": self.on_network_toggled}
 
         builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers,
-                              objects=("control_box", "volume_adjustment"))
+                              objects=("control_box", "volume_adjustment", "network_model"))
 
         self.pack_start(builder.get_object("control_box"), True, True, 0)
         self._remote_box = builder.get_object("remote_box")
@@ -838,7 +860,10 @@ class ControlTool(Gtk.Box):
         self._ber_level_bar = builder.get_object("ber_level_bar")
         self._agc_level_bar = builder.get_object("agc_level_bar")
         self._volume_button = builder.get_object("volume_button")
+        self._network_button = builder.get_object("control_network_button")
+        self._header_box = builder.get_object("control_header_box")
         self.init_actions(app)
+
         if settings.alternate_layout:
             self.on_layout_changed(app, True)
 
@@ -876,7 +901,11 @@ class ControlTool(Gtk.Box):
         app.set_action("on_screenshot_osd", self.on_screenshot_osd)
 
     def on_layout_changed(self, app, alt_layout):
-        self._remote_box.reorder_child(self._remote_box.get_children()[0], 1)
+        children = self._remote_box.get_children()
+        self._remote_box.reorder_child(children[0], len(children) - 1)
+        self._remote_box.reorder_child(children[-1], 0)
+        pack_type = Gtk.PackType.END if alt_layout else Gtk.PackType.START
+        self._header_box.set_child_packing(self._network_button, False, False, 0, pack_type)
 
     # ***************** Remote controller ********************* #
 
@@ -1006,3 +1035,9 @@ class ControlTool(Gtk.Box):
         self._snr_level_bar.set_value(int(snr.strip("%N/A") or 0))
         self._agc_level_bar.set_value(int(acg.rstrip("%N/A") or 0))
         self._ber_level_bar.set_value(int(ber.rstrip("N/A") or 0))
+
+    # ***************** Network explorer ********************** #
+
+    @run_task
+    def on_network_toggled(self, button):
+        pass

app/ui/dialogs.glade

@@ -40,7 +40,7 @@ Author: Dmitriy Yefremov
     <property name="icon_name">system-help</property>
     <property name="type_hint">normal</property>
     <property name="program_name">DemonEditor</property>
-    <property name="version">2.2.0 Beta</property>
+    <property name="version">2.2.4 Beta</property>
     <property name="copyright">2018-2022 Dmitriy Yefremov
 </property>
     <property name="comments" translatable="yes">Enigma2 channel and satellite list editor.</property>

app/ui/dialogs.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -28,10 +28,10 @@
 
 """ Common module for showing dialogs """
 import gettext
+import xml.etree.ElementTree as ET
 from enum import Enum
 from functools import lru_cache
 from pathlib import Path
-import xml.etree.ElementTree as ET
 
 from app.commons import run_idle
 from app.settings import SEP, IS_WIN
@@ -238,15 +238,16 @@ def get_builder(path, handlers=None, use_str=False, objects=None, tag="property"
 
 
 def translate_xml(path, tag="property"):
-    """
-        Used to translate GUI from * .glade files in MS Windows.
+    """ Used to translate GUI from * .glade files in MS Windows.
 
         More info: https://gitlab.gnome.org/GNOME/gtk/-/issues/569
     """
     et = ET.parse(path)
     root = et.getroot()
-    for e in root.iter(tag):
-        if e.attrib.get("translatable", None) == "yes":
+    for e in root.iter():
+        if e.tag == tag and e.attrib.get("translatable", None) == "yes":
+            e.text = get_message(e.text)
+        elif e.tag == "item" and e.attrib.get("translatable", None) == "yes":
             e.text = get_message(e.text)
 
     return ET.tostring(root, encoding="unicode", method="xml")

app/ui/epg.py

@@ -108,7 +108,7 @@ class EpgDialog:
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("info_bar_message_label")
         self._assign_ref_popup_item = builder.get_object("bouquet_assign_ref_popup_item")
-        self._left_header_box = builder.get_object("left_header_box")
+        self._left_action_box = builder.get_object("left_action_box")
         self._xml_download_progress_bar = builder.get_object("xml_download_progress_bar")
         # Filter
         self._filter_bar = builder.get_object("filter_bar")
@@ -500,7 +500,7 @@ class EpgDialog:
 
     @run_idle
     def update_active_header_elements(self, state):
-        self._left_header_box.set_sensitive(state)
+        self._left_action_box.set_sensitive(state)
         self._xml_download_progress_bar.set_visible(not state)
         self._source_info_label.set_text("" if state else "Downloading XML:")
 

app/ui/ftp.glade

@@ -349,6 +349,7 @@ Author: Dmitriy Yefremov
                                 <property name="headers_visible">False</property>
                                 <property name="search_column">0</property>
                                 <property name="tooltip_column">0</property>
+                                <property name="activate_on_single_click">True</property>
                                 <signal name="button-press-event" handler="on_view_popup_menu" object="bookmark_popup_menu" swapped="no"/>
                                 <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
                                 <signal name="row-activated" handler="on_bookmark_activated" swapped="no"/>

app/ui/iptv.glade

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 
+<!-- Generated with glade 3.22.2
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2022 Dmitriy Yefremov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ Author: Dmitriy Yefremov
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
   <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-copyright 2018-2022 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkImage" id="remove_selection_image">
     <property name="visible">True</property>
@@ -64,7 +64,6 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkDialog" id="search_unavailable_streams_dialog">
     <property name="use-header-bar">1</property>
-    <property name="width_request">320</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">   </property>
     <property name="resizable">False</property>
@@ -103,76 +102,98 @@ Author: Dmitriy Yefremov
             <property name="label_yalign">1</property>
             <property name="shadow_type">in</property>
             <child>
-              <object class="GtkGrid">
+              <object class="GtkBox" id="search_unavailable_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_left">10</property>
+                <property name="margin_right">10</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
-                <property name="column_spacing">10</property>
+                <property name="spacing">10</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkGrid" id="search_unavailable_grid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="spacing">2</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkBox" id="found_state_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Found</property>
+                        <property name="halign">center</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Found</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="streams_rows_counter_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">unavailable streams.</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="streams_rows_counter_label">
+                      <object class="GtkLevelBar" id="unavailable_streams_level_bar">
+                        <property name="height_request">10</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
+                        <property name="valign">center</property>
+                        <property name="inverted">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">unavailable streams.</property>
+                        <property name="label" translatable="yes">Please wait,  streams testing  in progress...</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLevelBar" id="unavailable_streams_level_bar">
-                    <property name="height_request">10</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="inverted">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -181,6 +202,7 @@ Author: Dmitriy Yefremov
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Cancel</property>
+                    <property name="valign">center</property>
                     <child>
                       <object class="GtkImage" id="cancel_image">
                         <property name="visible">True</property>
@@ -190,27 +212,12 @@ Author: Dmitriy Yefremov
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Please wait,  streams testing  in progress...</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
             <child type="label_item">

app/ui/iptv.py

@@ -379,9 +379,13 @@ class SearchUnavailableDialog:
 
     @run_task
     def do_search(self):
-        import concurrent.futures
+        import ssl
+        import certifi
+
+        context = ssl.create_default_context(cafile=certifi.where())
+
         with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor:
-            futures = {executor.submit(self.get_unavailable, row): row for row in self._iptv_rows}
+            futures = {executor.submit(self.get_unavailable, row, context): row for row in self._iptv_rows}
             for future in concurrent.futures.as_completed(futures):
                 if not self._download_task:
                     executor.shutdown()
@@ -390,13 +394,13 @@ class SearchUnavailableDialog:
             self._download_task = False
         self.on_close()
 
-    def get_unavailable(self, row):
+    def get_unavailable(self, row, context):
         if not self._download_task:
             return
         try:
             req = Request(get_iptv_url(row, self._s_type))
             self.update_bar()
-            urlopen(req, timeout=2)
+            urlopen(req, context=context, timeout=2)
         except HTTPError as e:
             if e.code != 403:
                 self.append_data(row)
@@ -662,7 +666,7 @@ class M3uImportDialog(IptvListDialog):
         progress_box.pack_start(load_label, False, False, 0)
         # Picons
         self._picons_switch = Gtk.Switch(visible=True)
-        self._picon_box = Gtk.HBox(visible=True, sensitive=False, spacing=2)
+        self._picon_box = Gtk.HBox(visible=True, sensitive=False, spacing=5)
         self._picon_box.pack_end(self._picons_switch, False, False, 0)
         self._picon_box.pack_end(Gtk.Label(visible=True, label=get_message("Download picons")), False, False, 0)
         # Extra box

app/ui/mac_style.css

@@ -1,19 +1,37 @@
 * {
-  -GtkDialog-action-area-border: 6em;
+  background-clip: padding-box;
+  -GtkScrolledWindow-scrollbar-spacing: 0;
+  -GtkToolItemGroup-expander-size: 11;
+  -GtkWidget-text-handle-width: 20;
+  -GtkWidget-text-handle-height: 20;
   -GtkDialog-button-spacing: 12;
+  -GtkDialog-action-area-border: 6;
 }
 
 entry {
   min-height: 2.0em;
+  padding: 0.2em;
+}
+
+entry > image {
+  padding-left: 0.3em;
+  padding-right: 0.3em;
 }
 
 button {
-  min-height: 1.5em;
-  min-width: 1em;
-  padding-left: 0.4em;
-  padding-right: 0.4em;
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
+  min-height: 1.2em;
+  min-width: 1.5em;
+  padding-top: 0.3em;
+  padding-bottom: 0.3em;
+}
+
+button:active, button:checked {
+  color: @theme_selected_fg_color;
+  background-image: linear-gradient(@theme_selected_bg_color, @theme_selected_bg_color);
+}
+
+combobox {
+  min-height: 2.2em;
 }
 
 spinbutton {
@@ -33,11 +51,25 @@ infobar {
   min-height: 2em;
 }
 
+revealer > box > button {
+  padding: 0.2em;
+}
+
 switch slider {
   min-height: 1.5em;
   min-width: 1.5em;
 }
 
+popover .view {
+  background-color: transparent;
+}
+
+.font > box {
+  min-height: 1.5em;
+  padding-top: 0.1em;
+  padding-bottom: 0.1em;
+}
+
 .dialog-action-area button {
   margin-bottom: 0.6em;
 }

app/ui/main.glade

@@ -1587,7 +1587,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">2.2.0 Beta</property>
+                                <property name="label">2.2.4 Beta</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -2783,6 +2783,7 @@ Author: Dmitriy Yefremov
                                                 <property name="fixed_height_mode">True</property>
                                                 <property name="rubber_banding">True</property>
                                                 <property name="enable_grid_lines">both</property>
+                                                <property name="tooltip_column">3</property>
                                                 <property name="activate_on_single_click">True</property>
                                                 <signal name="button-press-event" handler="on_view_popup_menu" object="iptv_popup_menu" swapped="no"/>
                                                 <signal name="button-press-event" handler="on_view_press" swapped="no"/>
@@ -2792,6 +2793,7 @@ Author: Dmitriy Yefremov
                                                 <signal name="drag-drop" handler="on_services_view_drag_drop" swapped="no"/>
                                                 <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
                                                 <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
+                                                <signal name="query-tooltip" handler="on_iptv_view_query_tooltip" swapped="no"/>
                                                 <child internal-child="selection">
                                                   <object class="GtkTreeSelection" id="iptv_services_selection">
                                                     <property name="mode">multiple</property>

app/ui/main.py

@@ -143,6 +143,7 @@ class Application(Gtk.Application):
                     "on_bq_view_query_tooltip": self.on_bq_view_query_tooltip,
                     "on_fav_view_query_tooltip": self.on_fav_view_query_tooltip,
                     "on_services_view_query_tooltip": self.on_services_view_query_tooltip,
+                    "on_iptv_view_query_tooltip": self.on_iptv_view_query_tooltip,
                     "on_view_drag_begin": self.on_view_drag_begin,
                     "on_view_drag_end": self.on_view_drag_end,
                     "on_view_drag_data_get": self.on_view_drag_data_get,
@@ -273,6 +274,10 @@ class Application(Gtk.Application):
                            GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
         GObject.signal_new("fav-clicked", self, GObject.SIGNAL_RUN_LAST,
                            GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
+        GObject.signal_new("srv-clicked", self, GObject.SIGNAL_RUN_LAST,
+                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
+        GObject.signal_new("iptv-clicked", self, GObject.SIGNAL_RUN_LAST,
+                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
         GObject.signal_new("page-changed", self, GObject.SIGNAL_RUN_LAST,
                            GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
         GObject.signal_new("change-page", self, GObject.SIGNAL_RUN_LAST,
@@ -450,7 +455,6 @@ class Application(Gtk.Application):
         if IS_GNOME_SESSION:
             header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
             header_bar.pack_start(builder.get_object("file_header_button"))
-            header_bar.pack_start(Gtk.Separator(visible=True))
             header_bar.pack_start(profile_box)
             header_bar.pack_start(toolbar_box)
             header_bar.set_custom_title(builder.get_object("stack_switcher"))
@@ -1534,8 +1538,29 @@ class Application(Gtk.Application):
 
         return self.get_tooltip(view, result, tooltip, target=ViewTarget.SERVICES)
 
-    def get_tooltip(self, view, dest_row, tooltip, target=ViewTarget.FAV):
-        path, pos = dest_row
+    def on_iptv_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
+        if not self._main_window.is_active():
+            return False
+
+        result = view.get_dest_row_at_pos(x, y)
+        if not result or not self._settings.show_srv_hints:
+            return False
+
+        path, pos = result
+        srv = self._services.get(view.get_model()[path][Column.IPTV_FAV_ID], None)
+        if srv and srv.picon_id:
+            tooltip.set_icon(get_picon_pixbuf(self._settings.profile_picons_path + srv.picon_id,
+                                              size=self._settings.tooltip_logo_size))
+            fav_id = srv.fav_id
+            names = (b[:b.rindex(":")] for b, ids in self._bouquets.items() if fav_id in ids)
+            text = f"{get_message('Name')}: {srv.service}\n{get_message('Bouquets')}: {', '.join(names)}"
+            tooltip.set_text(text)
+            view.set_tooltip_row(tooltip, path)
+            return True
+        return False
+
+    def get_tooltip(self, view, dst_row, tooltip, target=ViewTarget.FAV):
+        path, pos = dst_row
         model = view.get_model()
 
         target_column = Column.FAV_ID if target is ViewTarget.FAV else Column.SRV_FAV_ID
@@ -1832,6 +1857,12 @@ class Application(Gtk.Application):
 
             name, model = get_model_data(view)
             self.delete_views_selection(name)
+        elif event.get_event_type() == Gdk.EventType.DOUBLE_BUTTON_PRESS and event.button == Gdk.BUTTON_PRIMARY:
+            if self._settings.main_list_playback and self._fav_click_mode is not FavClickMode.DISABLED:
+                if view is self._services_view:
+                    self.emit("srv-clicked", self._fav_click_mode)
+                elif view is self._iptv_services_view:
+                    self.emit("iptv-clicked", self._fav_click_mode)
 
     def on_view_release(self, view, event):
         """ Handles a mouse click (release) to view. """
@@ -2640,7 +2671,7 @@ class Application(Gtk.Application):
         elif key is KeyboardKey.DELETE:
             self.on_delete(view)
         elif ctrl and key is KeyboardKey.R or key is KeyboardKey.F2:
-            if event.state & Gdk.ModifierType.SHIFT_MASK:
+            if event.state & Gdk.ModifierType.MOD1_MASK:  # ALT
                 self.on_rename_for_bouquet()
             else:
                 self.on_rename(view)
@@ -3291,18 +3322,21 @@ class Application(Gtk.Application):
             if srv_type == BqServiceType.IPTV.name:
                 return srv.fav_id.strip()
             elif srv.picon_id:
-                ref = srv.picon_id.rstrip(".png").replace("_", ":")
-                if self._s_type is SettingsType.ENIGMA_2:
-                    return ref
-                elif self._s_type is SettingsType.NEUTRINO_MP:
-                    # It may require some correction for cable and terrestrial channels!
-                    try:
-                        pos, freq = int(self.get_pos_num(srv.pos)) * 10, int(srv.freq)
-                        tid, nid, sid = int(ref[: -8], 16), int(ref[-8: -4], 16), int(srv.ssid, 16)
-                    except ValueError:
-                        log(f"Error getting reference for: {srv}")
-                    else:
-                        return format((pos + freq * 4 << 48 | tid << 32 | nid << 16 | sid), "x")
+                return self.get_service_ref_data(srv)
+
+    def get_service_ref_data(self, srv):
+        ref = srv.picon_id.rstrip(".png").replace("_", ":")
+        if self._s_type is SettingsType.ENIGMA_2:
+            return ref
+        elif self._s_type is SettingsType.NEUTRINO_MP:
+            # It may require some correction for cable and terrestrial channels!
+            try:
+                pos, freq = int(self.get_pos_num(srv.pos)) * 10, int(srv.freq)
+                tid, nid, sid = int(ref[: -8], 16), int(ref[-8: -4], 16), int(srv.ssid, 16)
+            except ValueError:
+                log(f"Error getting reference for: {srv}")
+            else:
+                return format((pos + freq * 4 << 48 | tid << 32 | nid << 16 | sid), "x")
 
     def update_info(self, req, cb):
         """ Updating current info over HTTP API. """

app/ui/main_helper.py

@@ -686,9 +686,9 @@ def append_text_to_tview(char, view):
     view.scroll_to_mark(insert, 0.0, True, 0.0, 1.0)
 
 
-def get_iptv_url(row, s_type):
+def get_iptv_url(row, s_type, column=Column.FAV_ID):
     """ Returns url from iptv type row """
-    data = row[Column.FAV_ID].split(":" if s_type is SettingsType.ENIGMA_2 else "::")
+    data = row[column].split(":" if s_type is SettingsType.ENIGMA_2 else "::")
     if s_type is SettingsType.ENIGMA_2:
         data = list(filter(lambda x: "http" in x, data))
     if data:

app/ui/picons.glade

@@ -709,6 +709,7 @@ Author: Dmitriy Yefremov
                                     <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services.</property>
                                     <property name="model">picons_src_sort_model</property>
                                     <property name="fixed_height_mode">True</property>
+                                    <property name="rubber_banding">True</property>
                                     <property name="enable_grid_lines">horizontal</property>
                                     <property name="tooltip_column">0</property>
                                     <property name="activate_on_single_click">True</property>
@@ -720,7 +721,9 @@ Author: Dmitriy Yefremov
                                     <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
                                     <signal name="query-tooltip" handler="on_view_query_tooltip" swapped="no"/>
                                     <child internal-child="selection">
-                                      <object class="GtkTreeSelection" id="picons_src_view_selection"/>
+                                      <object class="GtkTreeSelection" id="picons_src_view_selection">
+                                        <property name="mode">multiple</property>
+                                      </object>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="src_picon_column">
@@ -841,9 +844,10 @@ Author: Dmitriy Yefremov
                                   <object class="GtkTreeView" id="picons_dest_view">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services. </property>
+                                    <property name="tooltip_text" translatable="yes">Drag the services to the desired picon or picon to the list of selected services.</property>
                                     <property name="model">picons_dst_sort_model</property>
                                     <property name="fixed_height_mode">True</property>
+                                    <property name="rubber_banding">True</property>
                                     <property name="enable_grid_lines">horizontal</property>
                                     <property name="tooltip_column">0</property>
                                     <property name="activate_on_single_click">True</property>
@@ -856,7 +860,9 @@ Author: Dmitriy Yefremov
                                     <signal name="key-press-event" handler="on_tree_view_key_press" swapped="no"/>
                                     <signal name="query-tooltip" handler="on_view_query_tooltip" swapped="no"/>
                                     <child internal-child="selection">
-                                      <object class="GtkTreeSelection" id="picons_dest_view_selection"/>
+                                      <object class="GtkTreeSelection" id="picons_dest_view_selection">
+                                        <property name="mode">multiple</property>
+                                      </object>
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="dest_picon_column">

app/ui/picons.py

@@ -453,12 +453,12 @@ class PiconManager(Gtk.Box):
     def on_send_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
         path = self.get_path_from_uris(data)
         if path:
-            self.on_send(files_filter={path.name}, path=path.parent)
+            self.on_picons_send(files_filter={path.name}, path=path.parent)
 
     def on_download_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
         path = self.get_path_from_uris(data)
         if path:
-            self.on_download(files_filter={path.name})
+            self.on_picons_download(files_filter={path.name})
 
     def on_remove_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
         path = self.get_path_from_uris(data)
@@ -526,12 +526,12 @@ class PiconManager(Gtk.Box):
     def on_selective_send(self, view):
         path = self.get_selected_path(view)
         if path:
-            self.on_send(files_filter={path.name}, path=path.parent)
+            self.on_picons_send(files_filter={path.name}, path=path.parent)
 
     def on_selective_download(self, view):
         path = self.get_selected_path(view)
         if path:
-            self.on_download(files_filter={path.name})
+            self.on_picons_download(files_filter={path.name})
 
     def on_selective_remove(self, view):
         path = self.get_selected_path(view)
@@ -541,20 +541,32 @@ class PiconManager(Gtk.Box):
     def on_local_remove(self, view):
         model, paths = view.get_selection().get_selected_rows()
         if paths and show_dialog(DialogType.QUESTION, self._app_window) == Gtk.ResponseType.OK:
-            itr = model.get_iter(paths.pop())
-            p_path = Path(model.get_value(itr, 2)).resolve()
-            if p_path.is_file():
-                p_path.unlink()
-                base_model = get_base_model(model)
-                filter_model = model.get_model()
-                itr = filter_model.convert_iter_to_child_iter(model.convert_iter_to_child_iter(itr))
-                base_model.remove(itr)
-                self._app.update_picons()
+            base_model = get_base_model(model)
+            filter_model = model.get_model()
+            to_del = []
+
+            for p in paths:
+                itr = model.get_iter(p)
+                p_path = Path(model.get_value(itr, 2)).resolve()
+                if p_path.is_file():
+                    p_path.unlink()
+                    to_del.append(filter_model.convert_iter_to_child_iter(model.convert_iter_to_child_iter(itr)))
+
+            list(map(base_model.remove, to_del))
+            self._app.update_picons()
 
         if view is self._picons_dest_view:
             self._dst_count_label.set_text(str(len(model)))
 
-    def on_send(self, item=None, files_filter=None, path=None):
+    def on_send(self, item=None):
+        view = self._picons_src_view if self._picons_src_view.is_focus() else self._picons_dest_view
+        model, paths = view.get_selection().get_selected_rows()
+        if paths:
+            self.on_picons_send(files_filter={Path(model[p][-1]).resolve().name for p in paths})
+        else:
+            self._app.show_error_message("No selected item!")
+
+    def on_picons_send(self, item=None, files_filter=None, path=None):
         dest_path = path or self._settings.profile_picons_path
         settings = Settings(self._settings.settings)
         settings.profile_picons_path = f"{dest_path}{SEP}"
@@ -567,7 +579,10 @@ class PiconManager(Gtk.Box):
                                                                                        Gtk.MessageType.INFO),
                                           files_filter=files_filter))
 
-    def on_download(self, item=None, files_filter=None, path=None):
+    def on_download(self, item=None):
+        self.on_picons_download()
+
+    def on_picons_download(self, item=None, files_filter=None, path=None):
         path = path or self._settings.profile_picons_path
         settings = Settings(self._settings.settings)
         settings.profile_picons_path = path + SEP

app/ui/playback.py

@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2018-2021 Dmitriy Yefremov
+# Copyright (c) 2018-2022 Dmitriy Yefremov
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -57,6 +57,8 @@ class PlayerBox(Gtk.Box):
 
         self._app = app
         self._app.connect("fav-clicked", self.on_fav_clicked)
+        self._app.connect("srv-clicked", self.on_srv_clicked)
+        self._app.connect("iptv-clicked", self.on_iptv_clicked)
         self._app.connect("page-changed", self.on_page_changed)
         self._app.connect("play-current", self.on_play_current)
         self._app.connect("play-recording", self.on_play_recording)
@@ -112,6 +114,42 @@ class PlayerBox(Gtk.Box):
         elif mode is FavClickMode.PLAY:
             self.on_play_service()
 
+    def on_srv_clicked(self, app, mode):
+        if not self._app.http_api:
+            return
+
+        view = self._app.services_view
+        path, column = view.get_cursor()
+        if path:
+            srv = self._app.current_services.get(view.get_model()[path][Column.SRV_FAV_ID], None)
+            if not srv or not srv.picon_id:
+                return
+
+            ref = self._app.get_service_ref_data(srv)
+            s_type = self._app.app_settings.setting_type
+            error_msg = "No connection to the receiver!"
+            if s_type is SettingsType.ENIGMA_2:
+                def zap(rq):
+                    self.on_watch() if rq and rq.get("e2state", False) else self.on_error(None, error_msg)
+
+                self._app.http_api.send(HttpAPI.Request.ZAP, ref, zap)
+            elif self._s_type is SettingsType.NEUTRINO_MP:
+                def zap(rq):
+                    self.on_watch() if rq and rq.get("data", None) == "ok" else self.on_error(None, error_msg)
+
+                self._app.http_api.send(HttpAPI.Request.N_ZAP, f"?{ref}", zap)
+
+    def on_iptv_clicked(self, app, mode):
+        if not self._app.http_api:
+            return
+
+        view = self._app.iptv_services_view
+        path, column = view.get_cursor()
+        if path:
+            row = view.get_model()[path][:]
+            url = get_iptv_url(row, self._app.app_settings.setting_type, Column.IPTV_FAV_ID)
+            self.play(url, row[Column.IPTV_SERVICE]) if url else self.on_error(None, "No reference is present!")
+
     def on_play_current(self, app, url):
         self.on_watch()
 
@@ -266,7 +304,7 @@ class PlayerBox(Gtk.Box):
         if click_mode is FavClickMode.PLAY:
             self.on_play_service()
         elif click_mode is FavClickMode.ZAP_PLAY:
-            self.on_zap(self.on_watch)
+            self._app.on_zap(self.on_watch)
         elif click_mode is FavClickMode.STREAM:
             self.on_play_stream()
 
@@ -302,7 +340,7 @@ class PlayerBox(Gtk.Box):
         widget.set_size_request(w * 0.6, -1)
 
     @run_idle
-    def show_playback_window(self):
+    def show_playback_window(self, title=None):
         width, height = 480, 240
         size = self._app.app_settings.get("playback_window_size")
         if size:
@@ -310,9 +348,9 @@ class PlayerBox(Gtk.Box):
 
         if self._playback_window:
             self._playback_window.show()
-            self._playback_window.set_title(self.get_playback_title())
+            self._playback_window.set_title(title or self.get_playback_title())
         else:
-            self._playback_window = Gtk.Window(title=self.get_playback_title(),
+            self._playback_window = Gtk.Window(title=title or self.get_playback_title(),
                                                window_position=Gtk.WindowPosition.CENTER,
                                                icon_name="demon-editor")
 
@@ -381,7 +419,7 @@ class PlayerBox(Gtk.Box):
         url = self._app.get_url_from_m3u(data)
         GLib.timeout_add_seconds(1, self.play, url) if url else self.on_error(None, "Can't Playback!")
 
-    def play(self, url):
+    def play(self, url, title=None):
         if self._play_mode is PlayStreamsMode.M3U:
             self._app.save_stream_to_m3u(url)
             return
@@ -393,7 +431,7 @@ class PlayerBox(Gtk.Box):
         if self._play_mode is PlayStreamsMode.BUILT_IN:
             self.show()
         elif self._play_mode is PlayStreamsMode.WINDOW:
-            self.show_playback_window()
+            self.show_playback_window(title)
 
         if self._player:
             self.emit("play", url)

app/ui/satellites.glade

@@ -3,7 +3,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2022 Dmitriy Yefremov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -195,7 +195,6 @@ Author: Dmitriy Yefremov
   <object class="GtkMenu" id="transponder_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="reserve_toggle_size">False</property>
     <child>
       <object class="GtkImageMenuItem" id="add_tr_popup_menu_item">
         <property name="label" translatable="yes">Add</property>
@@ -399,7 +398,7 @@ Author: Dmitriy Yefremov
                 <property name="margin_left">5</property>
                 <property name="margin_right">5</property>
                 <property name="margin_bottom">5</property>
-                <property name="column_spacing">2</property>
+                <property name="column_spacing">5</property>
                 <child>
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
@@ -579,7 +578,7 @@ Author: Dmitriy Yefremov
             <property name="margin_right">5</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">5</property>
-            <property name="label_xalign">0.019999999552965164</property>
+            <property name="label_xalign">0.02</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkBox" id="tr_box">
@@ -594,7 +593,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkGrid" id="tr_dialog_grid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">2</property>
+                    <property name="column_spacing">5</property>
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
@@ -666,7 +665,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
-                        <property name="max_width_chars">10</property>
+                        <property name="max_width_chars">14</property>
                         <property name="primary_icon_name">document-edit-symbolic</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
@@ -685,7 +684,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
-                        <property name="max_width_chars">10</property>
+                        <property name="max_width_chars">14</property>
                         <property name="primary_icon_name">document-edit-symbolic</property>
                         <property name="placeholder_text" translatable="yes">27500000</property>
                         <property name="input_purpose">digits</property>
@@ -703,7 +702,7 @@ Author: Dmitriy Yefremov
                         <property name="model">pol_store</property>
                         <property name="id_column">0</property>
                         <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                          <object class="GtkCellRendererText" id="pol_cellrenderertext"/>
                           <attributes>
                             <attribute name="text">0</attribute>
                           </attributes>
@@ -784,9 +783,9 @@ Author: Dmitriy Yefremov
                       <object class="GtkGrid" id="tr_dialog_grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="column_spacing">2</property>
+                        <property name="column_spacing">5</property>
                         <child>
-                          <object class="GtkLabel" id="label7">
+                          <object class="GtkLabel" id="tr_pls_mode_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Pls mode</property>
@@ -797,7 +796,7 @@ Author: Dmitriy Yefremov
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label8">
+                          <object class="GtkLabel" id="tr_pls_code_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Pls code</property>
@@ -808,7 +807,7 @@ Author: Dmitriy Yefremov
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label9">
+                          <object class="GtkLabel" id="id_id_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Is ID</property>
@@ -870,6 +869,34 @@ Author: Dmitriy Yefremov
                             <property name="top_attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="tr_t2mi_plp_id_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">T2-MI PLP ID</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="t2mi_plp_id_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="width_chars">5</property>
+                            <property name="max_width_chars">12</property>
+                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="placeholder_text" translatable="yes">0 - 255</property>
+                            <property name="input_purpose">digits</property>
+                            <signal name="changed" handler="on_entry_changed" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
@@ -929,6 +956,8 @@ Author: Dmitriy Yefremov
       <column type="gchararray"/>
       <!-- column-name is_id -->
       <column type="gchararray"/>
+      <!-- column-name t2mi_plp_id -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkBox" id="satellite_editor_box">
@@ -1310,6 +1339,18 @@ Author: Dmitriy Yefremov
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="t2mi_plp_id_column">
+                            <property name="visible">False</property>
+                            <property name="title" translatable="yes">T2-MI PLP ID</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="t2mi_plp_id_cellrenderertext"/>
+                              <attributes>
+                                <attribute name="text">9</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -1426,7 +1467,6 @@ Author: Dmitriy Yefremov
                     <property name="tooltip_text" translatable="yes">Source</property>
                     <property name="active">0</property>
                     <items>
-                      <item id="FLYSAT" translatable="yes">FlySat</item>
                       <item id="LYNGSAT" translatable="yes">LyngSat</item>
                       <item id="KINGOFSAT" translatable="yes">KingOfSat</item>
                     </items>

app/ui/satellites.py

@@ -304,6 +304,7 @@ class TransponderDialog:
         self._pls_mode_box = builder.get_object("pls_mode_box")
         self._pls_code_entry = builder.get_object("pls_code_entry")
         self._is_id_entry = builder.get_object("is_id_entry")
+        self._t2mi_plp_id_entry = builder.get_object("t2mi_plp_id_entry")
         # pattern for frequency and rate entries (only digits)
         self._pattern = re.compile(r"\D")
         # style
@@ -336,6 +337,7 @@ class TransponderDialog:
         self._pls_mode_box.set_active_id(PLS_MODE.get(transponder.pls_mode, None))
         self._is_id_entry.set_text(transponder.is_id if transponder.is_id else "")
         self._pls_code_entry.set_text(transponder.pls_code if transponder.pls_code else "")
+        self._t2mi_plp_id_entry.set_text(transponder.t2mi_plp_id if transponder.t2mi_plp_id else "")
 
     def to_transponder(self):
         return Transponder(frequency=self._freq_entry.get_text(),
@@ -346,7 +348,8 @@ class TransponderDialog:
                            modulation=self._mod_box.get_active_id(),
                            pls_mode=get_key_by_value(PLS_MODE, self._pls_mode_box.get_active_id()),
                            pls_code=self._pls_code_entry.get_text(),
-                           is_id=self._is_id_entry.get_text())
+                           is_id=self._is_id_entry.get_text(),
+                           t2mi_plp_id=self._t2mi_plp_id_entry.get_text())
 
     def on_entry_changed(self, entry):
         entry.set_name("digit-entry" if self._pattern.search(entry.get_text()) else "GtkEntry")
@@ -360,6 +363,8 @@ class TransponderDialog:
             return False
         elif self._pattern.search(tr.pls_code) or self._pattern.search(tr.is_id):
             return False
+        elif self._pattern.search(tr.t2mi_plp_id):
+            return False
 
         return True
 
@@ -525,11 +530,11 @@ class UpdateDialog:
 
     @run_task
     def get_sat_list(self, src, callback):
-        sat_src = SatelliteSource.FLYSAT
+        sat_src = SatelliteSource.LYNGSAT
         if src == 1:
-            sat_src = SatelliteSource.LYNGSAT
-        elif src == 2:
             sat_src = SatelliteSource.KINGOFSAT
+        elif src == 2:
+            sat_src = SatelliteSource.FLYSAT
 
         sats = self._parser.get_satellites_list(sat_src)
         callback(sats)
@@ -739,9 +744,7 @@ class ServicesUpdateDialog(UpdateDialog):
         self._transponder_view.connect("select_all", lambda w: self.update_transponder_selection(True))
 
         self._transponder_paned.set_visible(True)
-        self._source_box.remove(0)
         self._source_box.connect("changed", self.on_update_satellites_list)
-        self._source_box.set_active(0)
 
     @run_idle
     def on_receive_data(self, item):
@@ -838,8 +841,8 @@ class ServicesUpdateDialog(UpdateDialog):
         sat_src = SatelliteSource.LYNGSAT
         if src == 1:
             sat_src = SatelliteSource.KINGOFSAT
-            self._services_parser.source = sat_src
 
+        self._services_parser.source = sat_src
         sats = self._parser.get_satellites_list(sat_src)
         callback(sats)
         self.is_download = False

app/ui/settings_dialog.py

@@ -37,10 +37,6 @@ from .main_helper import update_entry_data, scroll_to, get_picon_pixbuf
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON, APP_FONT, IS_GNOME_SESSION
 
 
-def show_settings_dialog(transient, options):
-    return SettingsDialog(transient, options).show()
-
-
 class SettingsDialog:
     _DIGIT_ENTRY_NAME = "digit-entry"
     _DIGIT_PATTERN = re.compile("(?:^[\\s]*$|\\D)")
@@ -149,14 +145,12 @@ class SettingsDialog:
         self._audio_codec_combo_box = builder.get_object("audio_codec_combo_box")
         self._transcoding_switch.bind_property("active", builder.get_object("record_box"), "sensitive")
         self._edit_preset_switch.bind_property("active", self._apply_presets_button, "sensitive")
-        self._edit_preset_switch.bind_property("active", builder.get_object("video_options_frame"), "sensitive")
-        self._edit_preset_switch.bind_property("active", builder.get_object("audio_options_frame"), "sensitive")
-        self._play_in_built_radio_button = builder.get_object("play_in_built_radio_button")
-        self._play_in_window_radio_button = builder.get_object("play_in_window_radio_button")
-        self._get_m3u_radio_button = builder.get_object("get_m3u_radio_button")
-        self._gst_lib_button = builder.get_object("gst_lib_button")
-        self._vlc_lib_button = builder.get_object("vlc_lib_button")
-        self._mpv_lib_button = builder.get_object("mpv_lib_button")
+        self._edit_preset_switch.bind_property("active", builder.get_object("video_options_grid"), "sensitive")
+        self._edit_preset_switch.bind_property("active", builder.get_object("audio_options_grid"), "sensitive")
+        self._play_streams_combo_box = builder.get_object("play_streams_combo_box")
+        self._stream_lib_combo_box = builder.get_object("stream_lib_combo_box")
+        self._double_click_combo_box = builder.get_object("double_click_combo_box")
+        self._allow_main_list_playback_switch = builder.get_object("allow_main_list_playback_switch")
         # Program.
         self._before_save_switch = builder.get_object("before_save_switch")
         self._before_downloading_switch = builder.get_object("before_downloading_switch")
@@ -177,13 +171,6 @@ class SettingsDialog:
         self._enable_yt_dl_switch = builder.get_object("enable_yt_dl_switch")
         self._enable_update_yt_dl_switch = builder.get_object("enable_update_yt_dl_switch")
         self._enable_send_to_switch = builder.get_object("enable_send_to_switch")
-        self._click_mode_disabled_button = builder.get_object("click_mode_disabled_button")
-        self._click_mode_stream_button = builder.get_object("click_mode_stream_button")
-        self._click_mode_play_button = builder.get_object("click_mode_play_button")
-        self._click_mode_zap_button = builder.get_object("click_mode_zap_button")
-        self._click_mode_zap_and_play_button = builder.get_object("click_mode_zap_and_play_button")
-        self._click_mode_zap_button.bind_property("sensitive", self._click_mode_play_button, "sensitive")
-        self._click_mode_zap_button.bind_property("sensitive", self._click_mode_zap_and_play_button, "sensitive")
         # EXPERIMENTAL.
         self._enable_exp_switch = builder.get_object("enable_experimental_switch")
         self._enable_exp_switch.bind_property("active", builder.get_object("yt_dl_box"), "sensitive")
@@ -192,9 +179,9 @@ class SettingsDialog:
         self._enable_exp_switch.bind_property("active", builder.get_object("enable_direct_playback_box"), "sensitive")
         # Enigma2 only.
         self._enigma_radio_button.bind_property("active", builder.get_object("bq_naming_grid"), "sensitive")
-        self._enigma_radio_button.bind_property("active", builder.get_object("enable_experimental_box"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("program_frame"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("experimental_box"), "sensitive")
+        self._enigma_radio_button.bind_property("active", builder.get_object("allow_double_click_box"), "sensitive")
         # Profiles.
         self._profile_view = builder.get_object("profile_tree_view")
         self._profile_add_button = builder.get_object("profile_add_button")
@@ -245,7 +232,6 @@ class SettingsDialog:
         self._neutrino_radio_button.set_active(self._s_type is SettingsType.NEUTRINO_MP)
         self.update_picon_paths()
         self.update_title()
-        self._click_mode_zap_button.set_sensitive(self._support_http_api_switch.get_active())
         self._lang_combo_box.set_active_id(self._ext_settings.language)
         self.on_info_bar_close() if is_enigma_profile else self.show_info_message(
             "The Neutrino has only experimental support. Not all features are supported!", Gtk.MessageType.WARNING)
@@ -323,9 +309,10 @@ class SettingsDialog:
         self._record_data_path_field.set_text(self._settings.records_path)
         self._before_save_switch.set_active(self._settings.backup_before_save)
         self._before_downloading_switch.set_active(self._settings.backup_before_downloading)
-        self.set_fav_click_mode(self._settings.fav_click_mode)
-        self.set_play_stream_mode(self._settings.play_streams_mode)
-        self.set_stream_lib(self._settings.stream_lib)
+        self._play_streams_combo_box.set_active_id(str(self._settings.play_streams_mode.value))
+        self._stream_lib_combo_box.set_active_id(self._settings.stream_lib)
+        self._double_click_combo_box.set_active_id(str(self._settings.fav_click_mode))
+        self._allow_main_list_playback_switch.set_active(self._settings.main_list_playback)
         self._load_on_startup_switch.set_active(self._settings.load_last_config)
         self._bouquet_hints_switch.set_active(self._settings.show_bq_hints)
         self._services_hints_switch.set_active(self._settings.show_srv_hints)
@@ -386,9 +373,10 @@ class SettingsDialog:
         self._ext_settings.profiles = self._settings.profiles
         self._ext_settings.backup_before_save = self._before_save_switch.get_active()
         self._ext_settings.backup_before_downloading = self._before_downloading_switch.get_active()
-        self._ext_settings.fav_click_mode = self.get_fav_click_mode()
-        self._ext_settings.play_streams_mode = self.get_play_stream_mode()
-        self._ext_settings.stream_lib = self.get_stream_lib()
+        self._ext_settings.play_streams_mode = PlayStreamsMode(int(self._play_streams_combo_box.get_active_id()))
+        self._ext_settings.stream_lib = self._stream_lib_combo_box.get_active_id()
+        self._ext_settings.fav_click_mode = int(self._double_click_combo_box.get_active_id())
+        self._ext_settings.main_list_playback = self._allow_main_list_playback_switch.get_active()
         self._ext_settings.language = self._lang_combo_box.get_active_id()
         self._ext_settings.load_last_config = self._load_on_startup_switch.get_active()
         self._ext_settings.show_bq_hints = self._bouquet_hints_switch.get_active()
@@ -494,11 +482,8 @@ class SettingsDialog:
         self._colors_grid.set_sensitive(state)
 
     def on_http_mode_switch(self, switch, state):
-        self._click_mode_zap_button.set_sensitive(state)
-        if any((self._click_mode_play_button.get_active(),
-                self._click_mode_zap_button.get_active(),
-                self._click_mode_zap_and_play_button.get_active())):
-            self._click_mode_disabled_button.set_active(True)
+        if self._main_stack.get_visible_child_name() == "program" and not state:
+            self.show_info_message("May affect some features availability! ", Gtk.MessageType.WARNING)
 
     def on_experimental_switch(self, switch, state):
         if not state:
@@ -528,7 +513,7 @@ class SettingsDialog:
         name = "profile"
         while name in self._profiles:
             count += 1
-            name = "profile{}".format(count)
+            name = f"profile{count}"
 
         self._profiles[name] = self._s_type.get_default_settings()
         model.append((name, None))
@@ -637,78 +622,26 @@ class SettingsDialog:
         self._settings.http_port = port
 
     def on_click_mode_togged(self, button):
-        if self._main_stack.get_visible_child_name() != "extra":
+        if self._main_stack.get_visible_child_name() != "streaming":
             return
 
-        mode = self.get_fav_click_mode()
+        mode = FavClickMode(int(self._double_click_combo_box.get_active_id()))
         if mode is FavClickMode.PLAY:
             self.show_info_message("Operates in standby mode or current active transponder!", Gtk.MessageType.WARNING)
+        elif mode is FavClickMode.STREAM:
+            self.show_info_message("Playback IPTV streams only!", Gtk.MessageType.WARNING)
+        elif mode is FavClickMode.DISABLED:
+            self._allow_main_list_playback_switch.set_active(False)
         else:
             self.on_info_bar_close()
 
-    @run_idle
-    def set_fav_click_mode(self, mode):
-        mode = FavClickMode(mode)
-        self._click_mode_disabled_button.set_active(mode is FavClickMode.DISABLED)
-        self._click_mode_stream_button.set_active(mode is FavClickMode.STREAM)
-        self._click_mode_play_button.set_active(mode is FavClickMode.PLAY)
-        self._click_mode_zap_button.set_active(mode is FavClickMode.ZAP)
-        self._click_mode_zap_and_play_button.set_active(mode is FavClickMode.ZAP_PLAY)
-
-    def get_fav_click_mode(self):
-        if self._click_mode_zap_button.get_active():
-            return FavClickMode.ZAP
-        if self._click_mode_play_button.get_active():
-            return FavClickMode.PLAY
-        if self._click_mode_zap_and_play_button.get_active():
-            return FavClickMode.ZAP_PLAY
-        if self._click_mode_stream_button.get_active():
-            return FavClickMode.STREAM
-
-        return FavClickMode.DISABLED
+        self._allow_main_list_playback_switch.set_sensitive(mode is not FavClickMode.DISABLED)
 
     def on_play_mode_changed(self, button):
-        if self._main_stack.get_visible_child_name() != "streaming" or not button.get_active():
+        if self._main_stack.get_visible_child_name() != "streaming":
             return
 
-        if self._settings.is_darwin:
-            is_gst = self._gst_lib_button.get_active()
-            self._play_in_built_radio_button.set_sensitive(is_gst)
-            self._play_in_window_radio_button.set_active(not is_gst and self._play_in_built_radio_button.get_active())
-
-        if button.get_active():
-            self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
-
-    @run_idle
-    def set_play_stream_mode(self, mode):
-        self._play_in_built_radio_button.set_active(mode is PlayStreamsMode.BUILT_IN)
-        self._play_in_window_radio_button.set_active(mode is PlayStreamsMode.WINDOW)
-        self._get_m3u_radio_button.set_active(mode is PlayStreamsMode.M3U)
-
-        if self._settings.is_darwin and self._settings.stream_lib != "gst":
-            self._play_in_built_radio_button.set_sensitive(False)
-
-    def get_play_stream_mode(self):
-        if self._play_in_built_radio_button.get_active():
-            return PlayStreamsMode.BUILT_IN
-        if self._play_in_window_radio_button.get_active():
-            return PlayStreamsMode.WINDOW
-        if self._get_m3u_radio_button.get_active():
-            return PlayStreamsMode.M3U
-
-        return self._settings.play_streams_mode
-
-    def set_stream_lib(self, mode):
-        self._vlc_lib_button.set_active(mode == "vlc")
-        self._gst_lib_button.set_active(mode == "gst")
-        self._mpv_lib_button.set_active(mode == "mpv")
-
-    def get_stream_lib(self):
-        if self._gst_lib_button.get_active():
-            return "gst"
-        elif self._vlc_lib_button.get_active():
-            return "vlc"
-        return "mpv"
+        self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
 
     def on_transcoding_preset_changed(self, button):
         presets = self._settings.transcoding_presets

app/ui/style.css

@@ -15,8 +15,8 @@
 }
 
 #stack-switch-button {
-  padding-top: 2px;
-  padding-bottom: 2px;
+  padding-top: 0;
+  padding-bottom: 0;
 }
 
 paned > separator {

app/ui/win_style.css

@@ -9,3 +9,12 @@ switch {
 spinbutton entry {
   min-height: 16px;
 }
+
+button > image {
+  padding: 2px;
+}
+
+grid > button {
+  padding-left: 15px;
+  padding-right: 15px;
+}

build/BUILD_WIN.md

@@ -0,0 +1,40 @@
+## Launch
+The best way to run this program from source is using of [MSYS2](https://www.msys2.org/) platform. 
+1. Download and install the platform as described [here](https://www.msys2.org/) up to point 4. 
+2. Launch **mingw64** shell.  
+![mingw64](https://user-images.githubusercontent.com/7511379/161400639-898ceb10-7de8-4557-bde1-25fe32bdfb03.png)
+3. Run first `pacman -Suy` After that, you may need to restart the terminal and re-run the update command. 
+4. Install minimal required packages:  
+   `pacman -S mingw-w64-x86_64-gtk3 mingw-w64-x86_64-python3 mingw-w64-x86_64-python3-gobject mingw-w64-x86_64-python3-pip mingw-w64-x86_64-python3-requests`  
+Optional: `pacman -S mingw-w64-x86_64-python3-pillow`  
+To support streams playback, install the following packages (the list may not be complete):   
+For [MPV](https://mpv.io/) `pacman -S mingw-w64-x86_64-mpv`,  
+For  [GStreamer](https://gstreamer.freedesktop.org/)  `pacman -S mingw-w64-x86_64-gst-libav mingw-w64-x86_64-gst-plugins-bad mingw-w64-x86_64-gst-plugins-base mingw-w64-x86_64-gst-plugins-good mingw-w64-x86_64-gstreamer`  
+5. Download and unzip the archive with sources from preferred branch (e.g. [master](https://github.com/DYefremov/DemonEditor/archive/refs/heads/master.zip)) in to folder where MSYS2 is installed. E.g: `c:\msys64\home\username\`
+6. Run mingw64 shell. Go to the folder where the program was unpacked. E.g: `cd DemonEditor/`
+And run: `./start.py`
+
+## Building a package
+To build a standalone package, we can use [PyInstaller](https://pyinstaller.readthedocs.io/en/stable/). 
+1. Launch mingw64 shell.
+2. Install PyInstaller via pip:  `pip3 install pyinstaller`
+3. Go to the folder where the program was unpacked. E.g: `c:\msys64\home\username\DemonEditor\`
+4. Сopy and replace the files from the /build/win/ folder to the root .
+5. Go to the folder with the program in the running terminal:  `cd DemonEditor/`
+6. Give the following command: `pyinstaller.exe DemonEditor.spec`
+7. Wait until the operation end. In the dist folder you will find a ready-made build.
+
+### Appearance
+To change the look we can use third party [Gtk3 themes and Icon sets](https://www.gnome-look.org).   
+To set the default theme:
+1. Сreate a folder "`\etc\gtk-3.0\`" in the root of the finished build folder.
+2. Create a _settings.ini_ file in this folder with the following content: 
+  ```
+  [Settings]
+  gtk-icon-theme-name = Adwaita
+  gtk-theme-name = Windows-10
+  ```
+In this case, we are using the default icon theme "Adwaita" and the [third party theme](https://github.com/B00merang-Project/Windows-10) "Windows-10".
+Themes and icon sets should be located in the `share\themes` and `share\icons` folders respectively. 
+To fine-tune the default theme you use, you can use the _win_style.css_ file in the `ui` folder. 
+You can find more info about changing the appearance of Gtk applications on the Web yourself. 

build/linux/build-deb.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VER="2.2.0_Beta"
+VER="2.2.4_Beta"
 B_PATH="dist/DemonEditor"
 DEB_PATH="$B_PATH/usr/share/demoneditor"
 

build/linux/deb/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: demon-editor
-Version: 2.2.0-Beta
+Version: 2.2.4-Beta
 Section: utils
 Priority: optional
 Architecture: all
@@ -8,9 +8,18 @@ Depends: python3 (>= 3.6),
          python3-requests,
          python3-gi,
          python3-gi-cairo,
-         gir1.2-notify-0.7
+         gir1.2-notify-0.7,
+         p7zip-full
 Recommends: libmpv1,
             python3-chardet,
             libgtksourceview (>= 3.0)
 Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
+Homepage: https://dyefremov.github.io/DemonEditor
 Description: Enigma2 channel and satellite list editor
+ Editing bouquets, channels, satellites, importing services,
+ downloading picons and updating satellites from the Web, 
+ extended support of IPTV, assignment of EPG from DVB or
+ XML for IPTV services, playback of IPTV or other streams
+ directly from the bouquet list, control panel (via HTTP API),
+ ability to view EPG and manage timers (via HTTP API), 
+ simple FTP client (experimental).

build/linux/deb/usr/share/applications/DemonEditor.desktop

@@ -5,6 +5,7 @@ Comment=Channel and satellite list editor for Enigma2
 Comment[ru]=Редактор списка каналов и спутников для Enigma2
 Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
 Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
+Comment[it]=Editor di liste canali e satelliti per Enigma2
 Comment[tr]=Enigma2 için kanal ve uydu listesi editörü
 Comment[es]=Editor de listas de canales y satélites para Enigma2
 Icon=demon-editor

build/mac/DemonEditor.spec

@@ -32,6 +32,16 @@ a = Analysis([EXE_NAME],
              hiddenimports=['fileinput', 'uuid'],
              hookspath=[],
              runtime_hooks=[],
+             hooksconfig={
+                "gi": {
+                    "languages": ["en", "be", "es", "it", "nl",
+                                  "pl", "pt", "ru", "tr", "zh_CN"],
+                    "module-versions": {
+                        "Gtk": "3.0",
+                        "GtkSource": "3",
+                    },
+                },
+             },
              excludes=excludes,
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
@@ -69,7 +79,8 @@ app = BUNDLE(coll,
                  'CFBundleGetInfoString': "Enigma2 channel and satellite editor",
                  'LSApplicationCategoryType': 'public.app-category.utilities',
                  'LSMinimumSystemVersion': '10.13',
-                 'CFBundleShortVersionString': f"2.2.0.{BUILD_DATE} Beta",
+                 'CFBundleShortVersionString': f"2.2.4.{BUILD_DATE} Beta",
                  'NSHumanReadableCopyright': u"Copyright © 2022, Dmitriy Yefremov",
-                 'NSRequiresAquaSystemAppearance': 'false'
+                 'NSRequiresAquaSystemAppearance': 'false',
+                 'NSHighResolutionCapable': 'true'
              })

build/win/DemonEditor.spec

@@ -30,6 +30,16 @@ a = Analysis([EXE_NAME],
              hiddenimports=['fileinput', 'uuid', 'ctypes.wintypes'],
              hookspath=[],
              runtime_hooks=[],
+             hooksconfig={
+                "gi": {
+                    "languages": ["en", "be", "es", "it", "nl",
+                                  "pl", "pt", "ru", "tr", "zh_CN"],
+                    "module-versions": {
+                        "Gtk": "3.0",
+                        "GtkSource": "3",
+                    },
+                },
+             },
              excludes=excludes,
              win_no_prefer_redirects=False,
              win_private_assemblies=False,

build/win/start.py

@@ -1,8 +1,14 @@
 #!/usr/bin/env python3
+import os
+import ssl
 
 if __name__ == "__main__":
     from multiprocessing import freeze_support
     from app.ui.main import start_app
 
+    os.environ["PYTHONUTF8"] = "1"
+    # TODO There needs to be a more "correct" way.
+    ssl._create_default_https_context = ssl._create_unverified_context
+
     freeze_support()
     start_app()

po/be/demon-editor.po

@@ -1253,6 +1253,9 @@ msgstr "Выконваецца загрузка дадзеных!"
 msgid "Recordings"
 msgstr "Запісы"
 
+msgid "Recordings:"
+msgstr "Запісы:"
+
 msgid "Help"
 msgstr "Даведка"
 
@@ -1283,6 +1286,9 @@ msgstr "Аўтаматычная ўсталёўка імя са спіса аб
 msgid "Playback"
 msgstr "Прайграванне"
 
+msgid "Playback:"
+msgstr "Прайграванне:"
+
 msgid "Audio"
 msgstr "Аўдыё"
 
@@ -1348,3 +1354,9 @@ msgstr "Дадаць закладку"
 
 msgid "All bouquets"
 msgstr "Усе букеты"
+
+msgid "Playback from the main list"
+msgstr "Прайграванне з асноўнага спіса"
+
+msgid "Enables URL parsing using youtube-dl to get direct links to media."
+msgstr "Улучае аналіз URL-адрасоў з дапамогай youtube-dl для атрымання прамых спасылак на медыя."

po/de/demon-editor.po

@@ -935,7 +935,7 @@ msgid "Built-in player"
 msgstr "Integrierter Player"
 
 msgid "In a separate window"
-msgstr "In einem separaten Fenster"
+msgstr "In separatem Fenster"
 
 msgid "Only get m3u file"
 msgstr "Nur m3u-Datei erhalten"
@@ -1267,6 +1267,9 @@ msgstr "Daten werden geladen!"
 msgid "Recordings"
 msgstr "Aufnahmen"
 
+msgid "Recordings:"
+msgstr "Aufnahmen:"
+
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1297,8 +1300,11 @@ msgstr "Automatisch den in der Favoritenliste ausgewählten Namen einstellen."
 msgid "Playback"
 msgstr "Wiedergabe"
 
+msgid "Playback:"
+msgstr "Wiedergabe:"
+
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 msgid "Audio Track"
 msgstr "Audio"
@@ -1363,3 +1369,8 @@ msgstr "Lesezeichen hinzufügen"
 msgid "All bouquets"
 msgstr "Alle Bouquets"
 
+msgid "Playback from the main list"
+msgstr "Wiedergabe aus der Hauptliste"
+
+msgid "Enables URL parsing using youtube-dl to get direct links to media."
+msgstr "Aktiviert URL-Parsing mit youtube-dl, um direkte Links zu Medien zu erhalten."

po/pl/demon-editor.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Last-Translator: wwns <https://github.com/wwns>\n"
+"Last-Translator: lareq <lareq@lareq.eu>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -13,10 +13,12 @@ msgstr ""
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Language-Team: \n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 2.3\n"
 
 msgid "translator-credits"
-msgstr "wwns"
+msgstr ""
+"lareq <lareq@lareq.eu>\n"
+"wwns <https://github.com/wwns>"
 
 # Main
 msgid "Service"
@@ -215,7 +217,7 @@ msgid "Host:"
 msgstr "Host:"
 
 msgid "Loading data..."
-msgstr "Ładowanie danych…"
+msgstr "Ładowanie danych..."
 
 msgid "Receive"
 msgstr "Pobierz"
@@ -542,10 +544,10 @@ msgid "Done!"
 msgstr "Zrobione!"
 
 msgid "Please, wait..."
-msgstr "Proszę czekać…"
+msgstr "Proszę czekać..."
 
 msgid "Resizing..."
-msgstr "Zmiana rozmiaru…"
+msgstr "Zmiana rozmiaru..."
 
 msgid "Select paths!"
 msgstr "Wybierz ścieżki!"
@@ -573,7 +575,7 @@ msgstr "Nie znaleziono VLC. Sprawdź, czy jest zainstalowany!"
 
 # Search unavailable streams dialog
 msgid "Please wait,  streams testing  in progress..."
-msgstr "Proszę czekać, trwa testowanie strumieni…"
+msgstr "Proszę czekać, trwa testowanie strumieni..."
 
 msgid "Found"
 msgstr "Znaleziono"
@@ -989,7 +991,7 @@ msgid "Gtk3 Themes and Icons:"
 msgstr "Gtk3 motywy i ikony:"
 
 msgid "Deleting data..."
-msgstr "Usuwanie danych…"
+msgstr "Usuwanie danych..."
 
 msgid "Download from the receiver"
 msgstr "Pobierz z odbiornika"
@@ -1019,7 +1021,7 @@ msgid "EXPERIMENTAL!"
 msgstr "EKSPERYMENTALNE!"
 
 msgid "Sorting data..."
-msgstr "Sortowanie danych…"
+msgstr "Sortowanie danych..."
 
 msgid ""
 "There are unsaved changes.\n"
@@ -1059,7 +1061,7 @@ msgid "Enable Dark Mode"
 msgstr "Włącz tryb ciemny"
 
 msgid "Extract..."
-msgstr "Rozpakuj…"
+msgstr "Rozpakuj..."
 
 msgid "Unsupported format!"
 msgstr "Format nieobsługiwany!"
@@ -1331,3 +1333,45 @@ msgstr "Przeciągnij usługi na żądaną ikonę lub na listę wybranych usług.
 
 msgid "Sets the profile folder as default to store picons, backups, etc."
 msgstr "Ustawia folder profilu jako domyślny do przechowywania pikonów, kopii zapasowych itp."
+
+msgid "New sub-bouquet"
+msgstr "Nowy sub-bukiet"
+
+msgid "Mark not presented in Bouquets"
+msgstr "Zaznacz te, których nie ma w bukietach"
+
+msgid "Not in Bouquets"
+msgstr "Nie ma w bukietach"
+
+msgid "Do not show services present in Bouquets."
+msgstr "Nie pokazuj usług obecnych w bukietach."
+
+msgid "IPTV services only"
+msgstr "Tylko serwisy IPTV"
+
+msgid "Display picons"
+msgstr "Wyświetl pikony"
+
+msgid "Alternate layout"
+msgstr "Alternatywny wygląd"
+
+msgid "Layout of elements has been changed!"
+msgstr "Zmieniono układ elementów!"
+
+msgid "Restart the program to apply all changes."
+msgstr "Uruchom ponownie program, aby zastosować wszystkie zmiany."
+
+msgid "New folder"
+msgstr "Nowy katalog"
+
+msgid "Bookmarks"
+msgstr "Zakładki"
+
+msgid "Add bookmark"
+msgstr "Dodaj zakładkę"
+
+msgid "All bouquets"
+msgstr "Wszystkie bukiety"
+
+msgid "Playback from the main list"
+msgstr "Odtwarzanie z listy głównej"

po/ru/demon-editor.po

@@ -1250,6 +1250,9 @@ msgstr "Выполняется загрузка данных!"
 msgid "Recordings"
 msgstr "Записи"
 
+msgid "Recordings:"
+msgstr "Записи:"
+
 msgid "Help"
 msgstr "Справка"
 
@@ -1280,6 +1283,9 @@ msgstr "Автоматическая установка имени из спис
 msgid "Playback"
 msgstr "Воспроизведение"
 
+msgid "Playback:"
+msgstr "Воспроизведение:"
+
 msgid "Audio"
 msgstr "Аудио"
 
@@ -1345,3 +1351,9 @@ msgstr "Добавить в закладки"
 
 msgid "All bouquets"
 msgstr "Все букеты"
+
+msgid "Playback from the main list"
+msgstr "Воспроизведение из основного списка"
+
+msgid "Enables URL parsing using youtube-dl to get direct links to media."
+msgstr "Включает анализ URL-адресов с помощью youtube-dl для получения прямых ссылок на медиа."

po/tr/demon-editor.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: DemonEditor\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-16 15:59+0300\n"
-"PO-Revision-Date: 2022-02-21 22:06+0300\n"
+"PO-Revision-Date: 2022-04-17 22:05+0300\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1312,6 +1312,9 @@ msgstr "Favoriler listesinde seçilen adı otomatik olarak ayarlayın."
 msgid "Playback"
 msgstr "Oynatım"
 
+msgid "Playback:"
+msgstr "Oynatım:"
+
 msgid "Audio"
 msgstr "Ses"
 
@@ -1362,3 +1365,21 @@ msgstr "Öğelerin düzeni değiştirildi!"
 
 msgid "Restart the program to apply all changes."
 msgstr "Tüm değişiklikleri uygulamak için programı yeniden başlatın."
+
+msgid "New folder"
+msgstr "Yeni dosya"
+
+msgid "Rename"
+msgstr "Düzenle"
+
+msgid "Bookmarks"
+msgstr "Yer imleri"
+
+msgid "Add bookmark"
+msgstr "Yer imleri ekle"
+
+msgid "All bouquets"
+msgstr "Tüm buketler"
+
+msgid "Playback from the main list"
+msgstr "Ana listeden oynatma"

start.py

@@ -6,19 +6,19 @@ def update_icon():
     need_update = False
     icon_name = "DemonEditor.desktop"
 
-    with open(icon_name, "r") as f:
+    with open(icon_name, "r", encoding="utf-8") as f:
         lines = f.readlines()
         for i, line in enumerate(lines):
             if line.startswith("Icon="):
                 icon_path = line.lstrip("Icon=")
-                current_path = "{}/app/ui/icons/hicolor/96x96/apps/demon-editor.png".format(os.getcwd())
+                current_path = f"{os.getcwd()}/app/ui/icons/hicolor/96x96/apps/demon-editor.png"
                 if icon_path != current_path:
                     need_update = True
-                    lines[i] = "Icon={}\n".format(current_path)
+                    lines[i] = f"Icon={current_path}\n"
                 break
 
     if need_update:
-        with open(icon_name, "w") as f:
+        with open(icon_name, "w", encoding="utf-8") as f:
             f.writelines(lines)