Spanish, Portuguese and Dutch translation update

(cherry picked from commit 8d96f02e2e)

DemonEditor.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=DemonEditor
+Comment=Channels and satellites list editor for Enigma2
+Comment[ru]=Редактор списка каналов и спутников для Enigma2
+Icon=demon-editor
+Exec=bash -c 'cd $(dirname %k) && ./start.py'
+Terminal=false
+Type=Application
+Categories=Utility;Application;
+StartupNotify=false

DemonEditor.spec

@@ -1,57 +0,0 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-EXE_NAME = 'start.py'
-DIR_PATH = os.getcwd()
-PATH_EXE = [os.path.join(DIR_PATH, EXE_NAME)]
-
-block_cipher = None
-
-
-excludes = ['app.tools.mpv',
-            'gi.repository.Gst',
-            'gi.repository.GstBase',
-            'gi.repository.GstVideo',
-            'youtube_dl',
-            'tkinter']
-
-
-ui_files = [('app\\ui\\*.glade', 'ui'),
-            ('app\\ui\\*.css', 'ui'),
-            ('app\\ui\\*.ui', 'ui'),
-            ('app\\ui\\lang*', 'share\\locale'),
-            ('app\\ui\\icons*', 'share\\icons')
-            ]
-
-
-a = Analysis([EXE_NAME],
-             pathex=PATH_EXE,
-             binaries=[],
-             datas=ui_files,
-             hiddenimports=['fileinput', 'uuid', 'ctypes.wintypes'],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=excludes,
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          [],
-          exclude_binaries=True,
-          name='DemonEditor',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=False, icon='icon.ico')
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               upx_exclude=[],
-               name='DemonEditor')

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2020 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

README.md

@@ -1,33 +1,27 @@
 # <img src="app/ui/icons/hicolor/96x96/apps/demon-editor.png" width="32" /> DemonEditor
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) ![platform](https://img.shields.io/badge/platform-windows-lightgrey)
-## Enigma2 channel and satellite list editor for MS Windows (experimental).  
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+## Enigma2 channel and satellites list editor for GNU/Linux.                                                                       
+Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).                                                   
+Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc)
 
-[<img src="https://user-images.githubusercontent.com/7511379/116426009-6bd3fa80-a84b-11eb-81ea-3407396a0c4b.png" width="850"/>](https://user-images.githubusercontent.com/7511379/116426009-6bd3fa80-a84b-11eb-81ea-3407396a0c4b.png)   
-
-Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).  
-Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).                                
-**The functionality and performance of this version may be different from the [Linux version](https://github.com/DYefremov/DemonEditor)!**
-
-## Main features of the program
+### Main features of the program:
 * Editing bouquets, channels, satellites.
 * Import function.
 * Backup function.
 * Extended support of IPTV.
 * Support of picons.
-* Importing services, downloading picons and updating satellites from the Web.
+* Downloading of picons and updating of satellites (transponders) from the web.
 * Import to bouquet(Neutrino WEBTV) from m3u.
 * Export of bouquets with IPTV services in m3u.
 * Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
-* Preview (playback) of IPTV or other streams directly from the bouquet list.
-* Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).
-* Simple FTP client (experimental). 
-
-#### Keyboard shortcuts
+* Preview (playback) of IPTV or other streams directly from the bouquet list (should be installed [VLC](https://www.videolan.org/vlc/)).
+                                                                                                 
+### Keyboard shortcuts:
 * **Ctrl + X** - only in bouquet list.
-* **Ctrl + C** - only in services list.                                                              
+* **Ctrl + C** - only in services list.                                                                 
 Clipboard is **"rubber"**. There is an accumulation before the insertion!                                                                                                                     
-* **Ctrl + Insert** - copies the selected channels from the main list to the bouquet  
-  beginning or inserts (creates) a new bouquet.  
+* **Ctrl + Insert** - copies the selected channels from the main list to the the bouquet 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.                                                                                                                                                                                                                                                                                                                     
@@ -36,38 +30,40 @@ Clipboard is **"rubber"**. There is an accumulation before the insertion!
 * **Ctrl + H** - hide/skip.                                                                                                                                                                                                 
 * **Ctrl + P** - start play IPTV or other stream in the bouquet list.                                                                                        
 * **Ctrl + Z** - switch(**zap**) the channel(works when the HTTP API is enabled, Enigma2 only).                         
-* **Ctrl + W** - switch to the channel and watch in the program.                                                                                                                                                                                                                                                                                                                                                                                                     
+* **Ctrl + W** - switch to the channel and watch in the program.                                                                                                                                                                                                                                                                                                                                                                                                      
 * **Space** - select/deselect.                                                                                                                                                                                                                                                                                                           
 * **Left/Right** - remove selection.                                                                                       
-* **Ctrl + Up, Down, PageUp, PageDown, Home, End**- move selected items in the list.  
+* **Ctrl + Up, Down, PageUp, PageDown, Home, End** - move selected items in the list.                                   
 * **Ctrl + O** - (re)load user data from current dir.                                                                   
 * **Ctrl + D** - load data from receiver.                                                                                                                                                         
-* **Ctrl + U/B** - upload data/bouquets to receiver.
-* **Ctrl + I** - extra info, details.
+* **Ctrl + U/B** upload data/bouquets to receiver.
 * **Ctrl + F** - show/hide search bar.
-* **Ctrl + Shift + F** - show/hide filter bar.
+* **Ctrl + Shift + F** - show/hide filter bar.                                                                          
 
-For **multiple** selection with the mouse, press and hold the **Ctrl** key!
+For multiple mouse selection (including Drag and Drop), press and hold the **Ctrl** key!
+                                                                                                                                                                                                                                                                       
+### Minimum requirements:
+Python >= 3.5.2 and GTK+ >= 3.16 with PyGObject bindings, python3-requests. 
+                                            
+### Launching:                                                                                                           
+To start the program, in most cases it is enough to download the archive, unpack and run it by                                                   
+double clicking on DemonEditor.desktop in the root directory, or launching from the console                                                           
+with the command: ```./start.py```                                                                              
+Extra folders can be deleted, excluding the *app* folder and root files like *DemonEditor.desktop* and *start.py*!      
+                                                                                                                                                                       
+### Note:
+To create a simple **debian package**, you can use the *build-deb.sh.*                                                   
+Users of **LTS** versions of [Ubuntu](https://ubuntu.com/) or those based on them can use [PPA](https://launchpad.net/~dmitriy-yefremov/+archive/ubuntu/demon-editor) repository.
 
-## Minimum requirements
-*Python >= 3.5.2, GTK+ >= 3.22 with PyGObject bindings, python3-requests.*
-                                                                    
-## Important
-**This version is not fully tested and has experimental status!**
+The program is tested only with [openATV](https://www.opena.tv/) image and **Formuler F1** receiver in my favourite Linux distributions  
+(the latest versions of [Linux Mint](https://linuxmint.com/) 18.* and 19* MATE 64-bit)!                                                                                                                                                                                                                                                                             
 
-Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2.                                                                                                
+### Important: 
+Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2!                                                                                                
 Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support!                                                                                                                                                        
-For version **3** is only read mode available. When saving, version **4** format is used instead.   
+For version **3** is only read mode available. When saving, version **4** format is used instead!   
 
-When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the selected bouquets!**
-If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten), 
-just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services 
-(excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.
-
-#### Command line arguments:
-* **-l** - write logs to file.
-* **-d on/off** - turn on/off debug mode. Allows to display more information in the logs.
-* **-t on/off** - show/hide simple built-in **telnet** client (experimental). **ANSI escape sequences are not supported!**
-
-## License
-Licensed under the [MIT](LICENSE) license.                                     
+When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the  
+selected bouquets!** If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten),  
+just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services  
+(excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.                      

_config.yml

@@ -1,4 +1,2 @@
-theme: jekyll-theme-slate
-title: DemonEditor
-description: Enigma2 channel and satellite list editor.
-show_downloads: false
+theme: jekyll-theme-cayman
+show_downloads: true

app/commons.py

@@ -67,7 +67,7 @@ def run_with_delay(timeout=5):
                 timer.cancel()
 
             def run():
-                GLib.idle_add(func, priority=GLib.PRIORITY_LOW, *args, **kwargs)
+                GLib.idle_add(func, *args, **kwargs, priority=GLib.PRIORITY_LOW)
 
             timer = Timer(interval=timeout, function=run)
             timer.start()

app/connections.py

@@ -5,7 +5,8 @@ import time
 import urllib
 import xml.etree.ElementTree as ETree
 from enum import Enum
-from ftplib import FTP, CRLF, Error, error_perm
+from ftplib import FTP, error_perm
+from http.client import RemoteDisconnected
 from telnetlib import Telnet
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlencode
@@ -34,6 +35,25 @@ class DownloadType(Enum):
     EPG = 5
 
 
+class HttpRequestType(Enum):
+    ZAP = "zap?sRef="
+    INFO = "about"
+    SIGNAL = "signal"
+    STREAM = "stream.m3u?ref="
+    STREAM_CURRENT = "streamcurrent.m3u"
+    CURRENT = "getcurrent"
+    TEST = None
+    TOKEN = "session"
+    PLAY = "mediaplayerplay?file="
+    PLAYER_LIST = "mediaplayerlist?path=playlist"
+    PLAYER_PLAY = "mediaplayercmd?command=play"
+    PLAYER_NEXT = "mediaplayercmd?command=next"
+    PLAYER_PREV = "mediaplayercmd?command=previous"
+    PLAYER_STOP = "mediaplayercmd?command=stop"
+    PLAYER_REMOVE = "mediaplayerremove?file="
+    GRUB = "grab?format=jpg&"
+
+
 class TestException(Exception):
     pass
 
@@ -42,289 +62,8 @@ class HttpApiException(Exception):
     pass
 
 
-class UtfFTP(FTP):
-    """ FTP class wrapper. """
-
-    def retrlines(self, cmd, callback=None):
-        """ Small modification of the original method.
-
-            It is used to retrieve data in line mode and skip errors related
-            to reading file names in encoding other than UTF-8 or Latin-1.
-            Decode errors are ignored [UnicodeDecodeError, etc].
-         """
-        if callback is None:
-            callback = log
-        self.sendcmd("TYPE A")
-        with self.transfercmd(cmd) as conn, conn.makefile("r", encoding=self.encoding, errors="ignore") as fp:
-            while 1:
-                line = fp.readline(self.maxline + 1)
-                if len(line) > self.maxline:
-                    msg = "UtfFTP [retrlines] error: got more than {} bytes".format(self.maxline)
-                    log(msg)
-                    raise Error(msg)
-                if self.debugging > 2:
-                    log('UtfFTP [retrlines] *retr* {}'.format(repr(line)))
-                if not line:
-                    break
-                if line[-2:] == CRLF:
-                    line = line[:-2]
-                elif line[-1:] == "\n":
-                    line = line[:-1]
-                callback(line)
-        return self.voidresp()
-
-    # ***************** Download ******************* #
-
-    def download_files(self, save_path, file_list, callback=None):
-        """ Downloads files from the receiver via FTP. """
-        for file in filter(lambda s: s.endswith(file_list), self.nlst()):
-            self.download_file(file, save_path, callback)
-
-    def download_file(self, name, save_path, callback=None):
-        with open(save_path + name, "wb") as f:
-            msg = "Downloading file: {}.   Status: {}\n"
-            try:
-                resp = str(self.retrbinary("RETR " + name, f.write))
-            except error_perm as e:
-                resp = str(e)
-                msg = msg.format(name, e)
-                log(msg.rstrip())
-            else:
-                msg = msg.format(name, resp)
-
-            callback(msg) if callback else log(msg.rstrip())
-
-            return resp
-
-    def download_dir(self, path, save_path, callback=None):
-        """  Downloads directory from FTP with all contents.
-
-            Creates a leaf directory and all intermediate ones. This is recursive.
-         """
-        os.makedirs(os.path.join(save_path, path), exist_ok=True)
-
-        files = []
-        self.dir(path, files.append)
-        for f in files:
-            f_data = f.split()
-            f_path = os.path.join(path, " ".join(f_data[8:]))
-
-            if f_data[0][0] == "d":
-                try:
-                    os.makedirs(os.path.join(save_path, f_path), exist_ok=True)
-                except OSError as e:
-                    msg = "Download dir error: {}".format(e).rstrip()
-                    log(msg)
-                    return "500 " + msg
-                else:
-                    self.download_dir(f_path, save_path, callback)
-            else:
-                try:
-                    self.download_file(f_path, save_path, callback)
-                except OSError as e:
-                    log("Download dir error: {}".format(e).rstrip())
-
-        resp = "226 Transfer complete."
-        msg = "Copy directory {}.   Status: {}".format(path, resp)
-        log(msg)
-
-        if callback:
-            callback(msg)
-
-        return resp
-
-    def download_xml(self, data_path, xml_path, xml_files, callback):
-        """ Used for download *.xml files. """
-        self.cwd(xml_path)
-        self.download_files(data_path, xml_files, callback)
-
-    def download_picons(self, src, dest, callback, files_filter=None):
-        try:
-            self.cwd(src)
-        except error_perm as e:
-            callback(str(e))
-            return
-
-        for file in filter(picons_filter_function(files_filter), self.nlst()):
-            self.download_file(file, dest, callback)
-
-    # ***************** Uploading ******************* #
-
-    def upload_bouquets(self, data_path, remove_unused, callback):
-        if remove_unused:
-            self.remove_unused_bouquets(callback)
-        self.upload_files(data_path, BQ_FILES_LIST, callback)
-
-    def upload_files(self, data_path, file_list, callback):
-        for file_name in os.listdir(data_path):
-            if file_name in STC_XML_FILE or file_name in WEB_TV_XML_FILE:
-                continue
-            if file_name.endswith(file_list):
-                self.send_file(file_name, data_path, callback)
-
-    def upload_xml(self, data_path, xml_path, xml_files, callback):
-        """ Used for transfer *.xml files. """
-        self.cwd(xml_path)
-        for xml_file in xml_files:
-            self.send_file(xml_file, data_path, callback)
-
-    def upload_picons(self, src, dest, callback, files_filter=None):
-        try:
-            self.cwd(dest)
-        except error_perm as e:
-            if str(e).startswith("550"):
-                self.mkd(dest)  # if not exist
-                self.cwd(dest)
-
-        for file_name in filter(picons_filter_function(files_filter), os.listdir(src)):
-            self.send_file(file_name, src, callback)
-
-    def remove_unused_bouquets(self, callback):
-        bq_files = ("userbouquet.", "bouquets.xml", "ubouquets.xml")
-
-        for file in filter(lambda f: f.startswith(bq_files), self.nlst()):
-            self.delete_file(file, callback)
-
-    def send_file(self, file_name, path, callback=None):
-        """ Opens the file in binary mode and transfers into receiver """
-        file_src = path + file_name
-        resp = "500"
-        if not os.path.isfile(file_src):
-            log("Uploading file: '{}'. File not found. Skipping.".format(file_src))
-            return resp + " File not found."
-
-        with open(file_src, "rb") as f:
-            msg = "Uploading file: {}.   Status: {}\n"
-            try:
-                resp = str(self.storbinary("STOR " + file_name, f))
-            except Error as e:
-                resp = str(e)
-                msg = msg.format(file_name, resp)
-                log(msg)
-            else:
-                msg = msg.format(file_name, resp)
-
-            if callback:
-                callback(msg)
-
-        return resp
-
-    def upload_dir(self, path, callback=None):
-        """ Uploads directory to FTP with all contents.
-
-            Creates a leaf directory and all intermediate ones. This is recursive.
-        """
-        resp = "200"
-        msg = "Uploading directory: {}.   Status: {}"
-        try:
-            files = os.listdir(path)
-        except OSError as e:
-            log(e)
-        else:
-            os.chdir(path)
-            for f in files:
-                file = r"{}{}".format(path, f)
-                if os.path.isfile(file):
-                    self.send_file(f, path, callback)
-                elif os.path.isdir(file):
-                    try:
-                        self.mkd(f)
-                    except Error:
-                        pass  # NOP
-
-                    try:
-                        self.cwd(f)
-                    except Error as e:
-                        resp = str(e)
-                        log(msg.format(f, resp))
-                    else:
-                        self.upload_dir(file + "/")
-
-            self.cwd("..")
-            os.chdir("..")
-
-            if callback:
-                callback(msg.format(path, resp))
-
-        return resp
-
-    # ****************** Deletion ******************** #
-
-    def delete_picons(self, callback, dest=None, files_filter=None):
-        if dest:
-            try:
-                self.cwd(dest)
-            except Error as e:
-                callback(str(e))
-                return
-
-        for file in filter(picons_filter_function(files_filter), self.nlst()):
-            self.delete_file(file, callback)
-
-    def delete_file(self, file, callback=log):
-        msg = "Deleting file: {}.   Status: {}\n"
-        try:
-            resp = self.delete(file)
-        except Error as e:
-            resp = str(e)
-            msg = msg.format(file, resp)
-            log(msg)
-        else:
-            msg = msg.format(file, resp)
-
-        if callback:
-            callback(msg)
-
-        return resp
-
-    def delete_dir(self, path, callback=None):
-        files = []
-        self.dir(path, files.append)
-        for f in files:
-            f_data = f.split()
-            name = " ".join(f_data[8:])
-            f_path = path + "/" + name
-
-            if f_data[0][0] == "d":
-                self.delete_dir(f_path, callback)
-            else:
-                self.delete_file(f_path, callback)
-
-        msg = "Remove directory {}.   Status: {}\n"
-        try:
-            resp = self.rmd(path)
-        except Error as e:
-            msg = msg.format(path, e)
-            log(msg)
-            return "500"
-        else:
-            msg = msg.format(path, resp)
-            log(msg.rstrip())
-
-        if callback:
-            callback(msg)
-
-        return resp
-
-    def rename_file(self, from_name, to_name, callback=None):
-        msg = "File rename: {}.   Status: {}\n"
-        try:
-            resp = self.rename(from_name, to_name)
-        except Error as e:
-            resp = str(e)
-            msg = msg.format(from_name, resp)
-            log(msg)
-        else:
-            msg = msg.format(from_name, resp)
-
-        if callback:
-            callback(msg)
-
-        return resp
-
-
-def download_data(*, settings, download_type=DownloadType.ALL, callback=log, files_filter=None):
-    with UtfFTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
+def download_data(*, settings, download_type=DownloadType.ALL, callback=print, files_filter=None):
+    with FTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
         ftp.encoding = "utf-8"
         callback("FTP OK.\n")
         save_path = settings.data_local_path
@@ -333,17 +72,18 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=log, fil
         if download_type is DownloadType.ALL or download_type is DownloadType.BOUQUETS:
             ftp.cwd(settings.services_path)
             file_list = BQ_FILES_LIST + DATA_FILES_LIST if download_type is DownloadType.ALL else BQ_FILES_LIST
-            ftp.download_files(save_path, file_list, callback)
+            for file in filter(lambda f: f.endswith(file_list), ftp.nlst()):
+                download_file(ftp, file, save_path, callback)
         # *.xml and webtv
         if download_type in (DownloadType.ALL, DownloadType.SATELLITES):
-            ftp.download_xml(save_path, settings.satellites_xml_path, STC_XML_FILE, callback)
+            download_xml(ftp, save_path, settings.satellites_xml_path, STC_XML_FILE, callback)
         if download_type in (DownloadType.ALL, DownloadType.WEBTV):
-            ftp.download_xml(save_path, settings.satellites_xml_path, WEB_TV_XML_FILE, callback)
+            download_xml(ftp, save_path, settings.satellites_xml_path, WEB_TV_XML_FILE, callback)
 
         if download_type is DownloadType.PICONS:
             picons_path = settings.picons_local_path
             os.makedirs(os.path.dirname(picons_path), exist_ok=True)
-            ftp.download_picons(settings.picons_path, picons_path, callback, files_filter)
+            download_picons(ftp, settings.picons_path, picons_path, callback, files_filter)
         # epg.dat
         if download_type is DownloadType.EPG:
             stb_path = settings.services_path
@@ -353,13 +93,14 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=log, fil
                 save_path = epg_options.get("epg_dat_path", save_path)
 
             ftp.cwd(stb_path)
-            ftp.download_files(save_path, "epg.dat", callback)
+            for file in filter(lambda f: f.endswith("epg.dat"), ftp.nlst()):
+                download_file(ftp, file, save_path, callback)
 
         callback("\nDone.\n")
 
 
 def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False,
-                callback=log, done_callback=None, use_http=False, files_filter=None):
+                callback=print, done_callback=None, use_http=False, files_filter=None):
     s_type = settings.setting_type
     data_path = settings.data_local_path
     host = settings.host
@@ -369,7 +110,7 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
 
     try:
         if s_type is SettingsType.ENIGMA_2 and use_http:
-            ht = http(settings.user, settings.password, base_url, callback, settings.http_use_ssl)
+            ht = http(settings.http_user, settings.http_password, base_url, callback, settings.http_use_ssl)
             next(ht)
             message = ""
             if download_type is DownloadType.BOUQUETS:
@@ -378,8 +119,6 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
                 message = "All user data will be reloaded!"
             elif download_type is DownloadType.SATELLITES:
                 message = "Satellites.xml file will be updated!"
-            elif download_type is DownloadType.PICONS:
-                message = "Picons will be updated!"
 
             params = urlencode({"text": message, "type": 2, "timeout": 5})
             ht.send((url + "message?{}".format(params), "Sending info message... "))
@@ -389,50 +128,46 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
                 ht.send((url + "powerstate?newstate=0", "Toggle Standby "))
                 time.sleep(2)
         else:
-            if download_type is not DownloadType.PICONS:
-                # telnet
-                tn = telnet(host=host,
-                            user=settings.user,
-                            password=settings.password,
-                            timeout=settings.telnet_timeout)
-                next(tn)
-                # terminate enigma or neutrino
-                callback("Telnet initialization ...\n")
-                tn.send("init 4")
-                callback("Stopping GUI...\n")
+            # telnet
+            tn = telnet(host=host,
+                        user=settings.telnet_user,
+                        password=settings.telnet_password,
+                        timeout=settings.telnet_timeout)
+            next(tn)
+            # terminate enigma or neutrino
+            tn.send("init 4")
 
-        with UtfFTP(host=host, user=settings.user, passwd=settings.password) as ftp:
+        with FTP(host=host, user=settings.user, passwd=settings.password) as ftp:
             ftp.encoding = "utf-8"
             callback("FTP OK.\n")
             sat_xml_path = settings.satellites_xml_path
             services_path = settings.services_path
 
             if download_type is DownloadType.SATELLITES:
-                ftp.upload_xml(data_path, sat_xml_path, STC_XML_FILE, callback)
+                upload_xml(ftp, data_path, sat_xml_path, STC_XML_FILE, callback)
 
             if s_type is SettingsType.NEUTRINO_MP and download_type is DownloadType.WEBTV:
-                ftp.upload_xml(data_path, sat_xml_path, WEB_TV_XML_FILE, callback)
+                upload_xml(ftp, data_path, sat_xml_path, WEB_TV_XML_FILE, callback)
 
             if download_type is DownloadType.BOUQUETS:
                 ftp.cwd(services_path)
-                ftp.upload_bouquets(data_path, remove_unused, callback)
+                upload_bouquets(ftp, data_path, remove_unused, callback)
 
             if download_type is DownloadType.ALL:
-                ftp.upload_xml(data_path, sat_xml_path, STC_XML_FILE, callback)
+                upload_xml(ftp, data_path, sat_xml_path, STC_XML_FILE, callback)
                 if s_type is SettingsType.NEUTRINO_MP:
-                    ftp.upload_xml(data_path, sat_xml_path, WEB_TV_XML_FILE, callback)
+                    upload_xml(ftp, data_path, sat_xml_path, WEB_TV_XML_FILE, callback)
 
                 ftp.cwd(services_path)
-                ftp.upload_bouquets(data_path, remove_unused, callback)
-                ftp.upload_files(data_path, DATA_FILES_LIST, callback)
+                upload_bouquets(ftp, data_path, remove_unused, callback)
+                upload_files(ftp, data_path, DATA_FILES_LIST, callback)
 
             if download_type is DownloadType.PICONS:
-                ftp.upload_picons(settings.picons_local_path, settings.picons_path, callback, files_filter)
+                upload_picons(ftp, settings.picons_local_path, settings.picons_path, callback, files_filter)
 
             if tn and not use_http:
                 # resume enigma or restart neutrino
                 tn.send("init 3" if s_type is SettingsType.ENIGMA_2 else "init 6")
-                callback("Starting...\n" if s_type is SettingsType.ENIGMA_2 else "Rebooting...\n")
             elif ht and use_http:
                 if download_type is DownloadType.BOUQUETS:
                     ht.send((url + "servicelistreload?mode=2", "Reloading Userbouquets."))
@@ -449,13 +184,80 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
             ht.close()
 
 
+def upload_bouquets(ftp, data_path, remove_unused, callback):
+    if remove_unused:
+        remove_unused_bouquets(ftp, callback)
+    upload_files(ftp, data_path, BQ_FILES_LIST, callback)
+
+
+def upload_files(ftp, data_path, file_list, callback):
+    for file_name in os.listdir(data_path):
+        if file_name in STC_XML_FILE or file_name in WEB_TV_XML_FILE:
+            continue
+        if file_name.endswith(file_list):
+            send_file(file_name, data_path, ftp, callback)
+
+
+def remove_unused_bouquets(ftp, callback):
+    for file in filter(lambda f: f.endswith(("tv", "radio", "bouquets.xml", "ubouquets.xml")), ftp.nlst()):
+        callback("Deleting file: {}.   Status: {}\n".format(file, ftp.delete(file)))
+
+
+def upload_xml(ftp, data_path, xml_path, xml_files, callback):
+    """ Used for transfer *.xml files. """
+    ftp.cwd(xml_path)
+    for xml_file in xml_files:
+        send_file(xml_file, data_path, ftp, callback)
+
+
+def download_xml(ftp, data_path, xml_path, xml_files, callback):
+    """ Used for download *.xml files. """
+    ftp.cwd(xml_path)
+    list(map(lambda f: download_file(ftp, f, data_path, callback), (f for f in ftp.nlst() if f.endswith(xml_files))))
+
+
 # ***************** Picons *******************#
 
+def upload_picons(ftp, src, dest, callback, files_filter=None):
+    try:
+        ftp.cwd(dest)
+    except error_perm as e:
+        if str(e).startswith("550"):
+            ftp.mkd(dest)  # if not exist
+            ftp.cwd(dest)
+
+    for file_name in filter(picons_filter_function(files_filter), os.listdir(src)):
+        send_file(file_name, src, ftp, callback)
+
+
+def download_picons(ftp, src, dest, callback, files_filter=None):
+    try:
+        ftp.cwd(src)
+    except error_perm as e:
+        callback(str(e))
+        return
+
+    for file in filter(picons_filter_function(files_filter), ftp.nlst()):
+        download_file(ftp, file, dest, callback)
+
+
+def delete_picons(ftp, callback, dest=None, files_filter=None):
+    if dest:
+        try:
+            ftp.cwd(dest)
+        except error_perm as e:
+            callback(str(e))
+            return
+
+    for file in filter(picons_filter_function(files_filter), ftp.nlst()):
+        callback("Delete file: {}.   Status: {}\n".format(file, ftp.delete(file)))
+
+
 def remove_picons(*, settings, callback, done_callback=None, files_filter=None):
-    with UtfFTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
+    with FTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
         ftp.encoding = "utf-8"
         callback("FTP OK.\n")
-        ftp.delete_picons(callback, settings.picons_path, files_filter)
+        delete_picons(ftp, callback, settings.picons_path, files_filter)
         if done_callback:
             done_callback()
 
@@ -464,13 +266,29 @@ def picons_filter_function(files_filter=None):
     return lambda f: f in files_filter if files_filter else f.endswith(PICONS_SUF)
 
 
+def download_file(ftp, name, save_path, callback):
+    with open(save_path + name, "wb") as f:
+        callback("Downloading file: {}.   Status: {}\n".format(name, str(ftp.retrbinary("RETR " + name, f.write))))
+
+
+def send_file(file_name, path, ftp, callback):
+    """ Opens the file in binary mode and transfers into receiver """
+    file_src = path + file_name
+    if not os.path.isfile(file_src):
+        log("Uploading file: '{}'. File not found. Skipping.".format(file_src))
+        return
+
+    with open(file_src, "rb") as f:
+        callback("Uploading file: {}.   Status: {}\n".format(file_name, str(ftp.storbinary("STOR " + file_name, f))))
+
+
 def http(user, password, url, callback, use_ssl=False):
     init_auth(user, password, url, use_ssl)
     data = get_post_data(url, password, url)
 
     while True:
         url, message = yield
-        resp = get_response(HttpAPI.Request.TEST, url, data).get("e2statetext", None)
+        resp = get_response(HttpRequestType.TEST, url, data).get("e2statetext", None)
         callback("HTTP: {} {}\n".format(message, "Successful." if resp and message else ""))
 
 
@@ -483,11 +301,11 @@ def telnet(host, port=23, user="", password="", timeout=5):
         time.sleep(1)
         command = yield
         if user != "":
-            tn.read_until(b"login: ", timeout)
+            tn.read_until(b"login: ")
             tn.write(user.encode("utf-8") + b"\n")
             time.sleep(timeout)
         if password != "":
-            tn.read_until(b"Password: ", timeout)
+            tn.read_until(b"Password: ")
             tn.write(password.encode("utf-8") + b"\n")
             time.sleep(timeout)
         tn.write("{}\r\n".format(command).encode("utf-8"))
@@ -504,74 +322,6 @@ def telnet(host, port=23, user="", password="", timeout=5):
 class HttpAPI:
     __MAX_WORKERS = 4
 
-    class Request(Enum):
-        ZAP = "zap?sRef="
-        INFO = "about"
-        SIGNAL = "signal"
-        STREAM = "stream.m3u?ref="
-        STREAM_TS = "ts.m3u?file="
-        STREAM_CURRENT = "streamcurrent.m3u"
-        CURRENT = "getcurrent"
-        TEST = None
-        TOKEN = "session"
-        # Player
-        PLAY = "mediaplayerplay?file="
-        PLAYER_LIST = "mediaplayerlist?path=playlist"
-        PLAYER_PLAY = "mediaplayercmd?command=play"
-        PLAYER_NEXT = "mediaplayercmd?command=next"
-        PLAYER_PREV = "mediaplayercmd?command=previous"
-        PLAYER_STOP = "mediaplayercmd?command=stop"
-        PLAYER_REMOVE = "mediaplayerremove?file="
-        # Remote control
-        POWER = "powerstate?newstate="
-        REMOTE = "remotecontrol?command="
-        VOL = "vol?set=set"
-        # EPG
-        EPG = "epgservice?sRef="
-        # Timer
-        TIMER = ""
-        TIMER_LIST = "timerlist"
-        # Recordings
-        RECORDINGS = "movielist?dirname="
-        REC_DIRS = "getlocations"
-        REC_CURRENT = "getcurrlocation"
-        # Screenshot
-        GRUB = "grab?format=jpg&"
-
-    class Remote(str, Enum):
-        """ Args for HttpRequestType [REMOTE] class. """
-        UP = "103"
-        LEFT = "105"
-        RIGHT = "106"
-        DOWN = "108"
-        MENU = "139"
-        EXIT = "174"
-        OK = "352"
-        RED = "398"
-        GREEN = "399"
-        YELLOW = "400"
-        BLUE = "401"
-
-    class Power(str, Enum):
-        """ Args for HttpRequestType [POWER] class. """
-        TOGGLE_STANDBY = "0"
-        DEEP_STANDBY = "1"
-        REBOOT = "2"
-        RESTART_GUI = "3"
-        WAKEUP = "4"
-        STANDBY = "5"
-
-    PARAM_REQUESTS = {Request.REMOTE,
-                      Request.POWER,
-                      Request.VOL,
-                      Request.EPG,
-                      Request.TIMER,
-                      Request.RECORDINGS}
-
-    STREAM_REQUESTS = {Request.STREAM,
-                       Request.STREAM_CURRENT,
-                       Request.STREAM_TS}
-
     def __init__(self, settings):
         from concurrent.futures import ThreadPoolExecutor as PoolExecutor
         self._executor = PoolExecutor(max_workers=self.__MAX_WORKERS)
@@ -592,15 +342,13 @@ class HttpAPI:
         url = self._base_url + req_type.value
         data = self._data
 
-        if req_type is self.Request.ZAP or req_type in self.STREAM_REQUESTS:
+        if req_type is HttpRequestType.ZAP or req_type is HttpRequestType.STREAM:
             url += urllib.parse.quote(ref)
-        elif req_type is self.Request.PLAY or req_type is self.Request.PLAYER_REMOVE:
+        elif req_type is HttpRequestType.PLAY or req_type is HttpRequestType.PLAYER_REMOVE:
             url += "{}{}".format(ref_prefix, urllib.parse.quote(ref).replace("%3A", "%253A"))
-        elif req_type is self.Request.GRUB:
+        elif req_type is HttpRequestType.GRUB:
             data = None  # Must be disabled for token-based security.
             url = "{}/{}{}".format(self._main_url, req_type.value, ref)
-        elif req_type in self.PARAM_REQUESTS:
-            url += ref
 
         def done_callback(f):
             callback(f.result())
@@ -610,17 +358,17 @@ class HttpAPI:
 
     @run_task
     def init(self):
-        user, password = self._settings.user, self._settings.password
+        user, password = self._settings.http_user, self._settings.http_password
         use_ssl = self._settings.http_use_ssl
         self._main_url = "http{}://{}:{}".format("s" if use_ssl else "", self._settings.host, self._settings.http_port)
         self._base_url = "{}/web/".format(self._main_url)
         init_auth(user, password, self._main_url, use_ssl)
-        url = "{}/web/{}".format(self._main_url, self.Request.TOKEN.value)
+        url = "{}/web/{}".format(self._main_url, HttpRequestType.TOKEN.value)
         s_id = get_session_id(user, password, url)
         if s_id != "0":
             self._data = urllib.parse.urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
 
-        self.send(self.Request.INFO, None, self.init_callback)
+        self.send(HttpRequestType.INFO, None, self.init_callback)
 
     def init_callback(self, info):
         if info:
@@ -643,35 +391,24 @@ class HttpAPI:
 def get_response(req_type, url, data=None):
     try:
         with urlopen(Request(url, data=data), timeout=10) as f:
-            if req_type in HttpAPI.STREAM_REQUESTS:
+            if req_type is HttpRequestType.STREAM or req_type is HttpRequestType.STREAM_CURRENT:
                 return {"m3u": f.read().decode("utf-8")}
-            elif req_type is HttpAPI.Request.GRUB:
+            elif req_type is HttpRequestType.GRUB:
                 return {"img_data": f.read()}
-            elif req_type is HttpAPI.Request.CURRENT:
+            elif req_type is HttpRequestType.CURRENT:
                 for el in ETree.fromstring(f.read().decode("utf-8")).iter("e2event"):
                     return {el.tag: el.text for el in el.iter()}  # return first[current] event from the list
-            elif req_type is HttpAPI.Request.PLAYER_LIST:
+            elif req_type is HttpRequestType.PLAYER_LIST:
                 return [{el.tag: el.text for el in el.iter()} for el in
                         ETree.fromstring(f.read().decode("utf-8")).iter("e2file")]
-            elif req_type is HttpAPI.Request.EPG:
-                return {"event_list": [{el.tag: el.text for el in el.iter()} for el in
-                                       ETree.fromstring(f.read().decode("utf-8")).iter("e2event")]}
-            elif req_type is HttpAPI.Request.TIMER_LIST:
-                return {"timer_list": [{el.tag: el.text for el in el.iter()} for el in
-                                       ETree.fromstring(f.read().decode("utf-8")).iter("e2timer")]}
-            elif req_type is HttpAPI.Request.REC_DIRS:
-                return {"rec_dirs": [el.text for el in ETree.fromstring(f.read().decode("utf-8")).iter("e2location")]}
-            elif req_type is HttpAPI.Request.RECORDINGS:
-                return {"recordings": [{el.tag: el.text for el in el.iter()} for el in
-                                       ETree.fromstring(f.read().decode("utf-8")).iter("e2movie")]}
             else:
                 return {el.tag: el.text for el in ETree.fromstring(f.read().decode("utf-8")).iter()}
     except HTTPError as e:
-        if req_type is HttpAPI.Request.TEST:
+        if req_type is HttpRequestType.TEST:
             raise e
         return {"error_code": e.code}
-    except (URLError, ConnectionResetError) as e:
-        if req_type is HttpAPI.Request.TEST:
+    except (URLError, RemoteDisconnected, ConnectionResetError) as e:
+        if req_type is HttpRequestType.TEST:
             raise e
     except ETree.ParseError as e:
         log("Parsing response error: {}".format(e))
@@ -698,11 +435,11 @@ def init_auth(user, password, url, use_ssl=False):
 
 def get_session_id(user, password, url):
     data = urllib.parse.urlencode(dict(user=user, password=password)).encode("utf-8")
-    return get_response(HttpAPI.Request.TOKEN, url, data=data).get("e2sessionid", "0")
+    return get_response(HttpRequestType.TOKEN, url, data=data).get("e2sessionid", "0")
 
 
 def get_post_data(base_url, password, user):
-    s_id = get_session_id(user, password, "{}/web/{}".format(base_url, HttpAPI.Request.TOKEN.value))
+    s_id = get_session_id(user, password, "{}/web/{}".format(base_url, HttpRequestType.TOKEN.value))
     data = None
     if s_id != "0":
         data = urllib.parse.urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
@@ -728,8 +465,8 @@ def test_http(host, port, user, password, timeout=5, use_ssl=False, skip_message
     data = get_post_data(base_url, password, user)
 
     try:
-        return get_response(HttpAPI.Request.TEST, "{}/web/{}".format(base_url, params), data).get("e2statetext", "")
-    except (URLError, HTTPError) as e:
+        return get_response(HttpRequestType.TEST, "{}/web/{}".format(base_url, params), data).get("e2statetext", "")
+    except (RemoteDisconnected, URLError, HTTPError) as e:
         raise TestException(e)
 
 

app/eparser/__init__.py

@@ -1,35 +1,8 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
 from app.commons import run_task
 from app.settings import SettingsType
 from .ecommons import Service, Satellite, Transponder, Bouquet, Bouquets, is_transponder_valid
 from .enigma.blacklist import get_blacklist, write_blacklist
-from .enigma.bouquets import to_bouquet_id, BouquetsWriter, BouquetsReader
+from .enigma.bouquets import get_bouquets as get_enigma_bouquets, write_bouquets as write_enigma_bouquets, to_bouquet_id
 from .enigma.lamedb import get_services as get_enigma_services, write_services as write_enigma_services
 from .iptv import parse_m3u
 from .neutrino.bouquets import get_bouquets as get_neutrino_bouquets, write_bouquets as write_neutrino_bouquets
@@ -54,24 +27,15 @@ def write_services(path, channels, s_type, format_version):
 
 def get_bouquets(path, s_type):
     if s_type is SettingsType.ENIGMA_2:
-        return BouquetsReader(path).get()
+        return get_enigma_bouquets(path)
     elif s_type is SettingsType.NEUTRINO_MP:
         return get_neutrino_bouquets(path)
 
 
-def write_bouquet(path, bq, s_type):
-    if s_type is SettingsType.ENIGMA_2:
-        writer = BouquetsWriter(path, None)
-        writer.write_bouquet(path + "userbouquet.{}.{}".format(bq.name, bq.type), bq.name, bq.services)
-    elif s_type is SettingsType.NEUTRINO_MP:
-        from .neutrino.bouquets import write_bouquet
-        write_bouquet(path, bq)
-
-
 @run_task
 def write_bouquets(path, bouquets, s_type, force_bq_names=False):
     if s_type is SettingsType.ENIGMA_2:
-        BouquetsWriter(path, bouquets, force_bq_names).write()
+        write_enigma_bouquets(path, bouquets, force_bq_names)
     elif s_type is SettingsType.NEUTRINO_MP:
         write_neutrino_bouquets(path, bouquets)
 

app/eparser/ecommons.py

@@ -14,11 +14,9 @@ class BqServiceType(Enum):
     IPTV = "IPTV"
     MARKER = "MARKER"  # 64
     SPACE = "SPACE"  # 832 [hidden marker]
-    ALT = "ALT"  # Service with alternatives
 
 
-Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden", "file"])
-Bouquet.__new__.__defaults__ = (None, BqServiceType.DEFAULT, [], None, None, None)  # For Python3 < 3.7
+Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden"])
 Bouquets = namedtuple("Bouquets", ["name", "type", "bouquets"])
 BouquetService = namedtuple("BouquetService", ["name", "type", "data", "num"])
 
@@ -35,7 +33,6 @@ class TrType(Enum):
     Satellite = "s"
     Terrestrial = "t"
     Cable = "c"
-    ATSC = "a"
 
 
 class BqType(Enum):
@@ -148,10 +145,6 @@ T_SYSTEM = {"0": "DVB-T", "1": "DVB-T2", "-1": "DVB-T/T2"}
 # Cable
 C_MODULATION = {"0": "Auto", "1": "QAM16", "2": "QAM32", "3": "QAM64", "4": "QAM128", "5": "QAM256"}
 
-# ATSC
-A_MODULATION = {"0": "Auto", "1": "QAM16", "2": "QAM32", "3": "QAM64", "4": "QAM128", "5": "QAM256", "6": "8VSB",
-                "7": "16VSB"}
-
 # CAS
 CAS = {"C:26": "BISS", "C:0B": "Conax", "C:06": "Irdeto", "C:18": "Nagravision", "C:05": "Viaccess", "C:01": "SECA",
        "C:0E": "PowerVu", "C:4A": "DRE-Crypt", "C:7B": "DRE-Crypt", "C:56": "Verimatrix", "C:09": "VideoGuard"}

app/eparser/enigma/blacklist.py

@@ -9,15 +9,13 @@ __FILE_NAME = "blacklist"
 
 def get_blacklist(path):
     with suppress(FileNotFoundError):
-        with open(path + __FILE_NAME, "r", encoding="utf-8") as file:
+        with open(path + __FILE_NAME, "r") as file:
             # filter empty values and "\n"
-
-            return set(filter(None, (x.strip() for x in file.readlines())))
-    return set()
+            return {*list(filter(None, (x.strip() for x in file.readlines())))}
 
 
 def write_blacklist(path, channels):
-    with open(path + __FILE_NAME, "w", encoding="utf-8") as file:
+    with open(path + __FILE_NAME, "w") as file:
         if channels:
             file.writelines("\n".join(channels))
 

app/eparser/enigma/bouquets.py

@@ -1,229 +1,76 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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 working with Enigma2 bouquets. """
 import re
 from collections import Counter
-from pathlib import Path
 
 from app.commons import log
 from app.eparser.ecommons import BqServiceType, BouquetService, Bouquets, Bouquet, BqType
 
-_TV_FILE = "bouquets.tv"
-_RADIO_FILE = "bouquets.radio"
+_TV_ROOT_FILE_NAME = "bouquets.tv"
+_RADIO_ROOT_FILE_NAME = "bouquets.radio"
 _DEFAULT_BOUQUET_NAME = "favourites"
 
 
-class BouquetsWriter:
-    """ Class for creating and writing bouquet files..
+def get_bouquets(path):
+    return parse_bouquets(path, "bouquets.tv", BqType.TV.value), parse_bouquets(path, "bouquets.radio",
+                                                                                BqType.RADIO.value)
+
+
+def write_bouquets(path, bouquets, force_bq_names=False):
+    """ Creating and writing bouquets files.
 
         If "force_bq_names" then naming the files using the name of the bouquet.
         Some images may have problems displaying the favorites list!
      """
-    _SERVICE = '#SERVICE 1:7:{}:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.{}.{}" ORDER BY bouquet\n'
-    _MARKER = "#SERVICE 1:64:{:X}:0:0:0:0:0:0:0::{}\n"
-    _SPACE = "#SERVICE 1:832:D:{}:0:0:0:0:0:0:\n"
-    _ALT = '#SERVICE 1:134:1:0:0:0:0:0:0:0:FROM BOUQUET "{}" ORDER BY bouquet\n'
-    _ALT_PAT = r"[<>:\"/\\|?*\-\s]"
+    srv_line = '#SERVICE 1:7:{}:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.{}.{}" ORDER BY bouquet\n'
+    line = []
+    pattern = re.compile("[^\\w_()]+")
+    m_index = [0]
+    s_index = [0]
 
-    def __init__(self, path, bouquets, force_bq_names=False):
-        self._path = path
-        self._bouquets = bouquets
-        self._force_bq_names = force_bq_names
-        self._marker_index = 1
-        self._space_index = 0
-        self._alt_names = set()
+    for bqs in bouquets:
+        line.clear()
+        line.append("#NAME {}\n".format(bqs.name))
 
-    def write(self):
-        line = []
-        pattern = re.compile("[^\\w_()]+")
-
-        for bqs in self._bouquets:
-            line.clear()
-            line.append("#NAME {}\n".format(bqs.name))
-            bq_file_names = {b.file for b in bqs.bouquets}
-            count = 1
-
-            for bq in bqs.bouquets:
-                bq_name = bq.file
-                if not bq_name:
-                    if self._force_bq_names:
-                        bq_name = re.sub(pattern, "_", bq.name)
-                    else:
-                        bq_name = "de{0:02d}".format(count)
-                        while bq_name in bq_file_names:
-                            count += 1
-                            bq_name = "de{0:02d}".format(count)
-                        bq_file_names.add(bq_name)
-
-                line.append(self._SERVICE.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
-                self.write_bouquet(self._path + "userbouquet.{}.{}".format(bq_name, bq.type), bq.name, bq.services)
-
-            with open(self._path + "bouquets.{}".format(bqs.type), "w", encoding="utf-8") as file:
-                file.writelines(line)
-
-    def write_bouquet(self, path, name, services):
-        """ Writes single bouquet file. """
-        bouquet = ["#NAME {}\n".format(name)]
-        for srv in services:
-            s_type = srv.service_type
-            if s_type == BqServiceType.IPTV.name:
-                bouquet.append("#SERVICE {}\n".format(srv.fav_id.strip()))
-            elif s_type == BqServiceType.MARKER.name:
-                m_data = srv.fav_id.strip().split(":")
-                m_data[2] = self._marker_index
-                self._marker_index += 1
-                bouquet.append(self._MARKER.format(m_data[2], m_data[-1]))
-            elif s_type == BqServiceType.SPACE.name:
-                bouquet.append(self._SPACE.format(self._space_index))
-                self._space_index += 1
-            elif s_type == BqServiceType.ALT.name:
-                services = srv.transponder
-                if services:
-                    p = Path(path)
-                    alt_name = srv.data_id
-                    f_name = "alternatives.{}{}".format(alt_name, p.suffix)
-
-                    if self._force_bq_names:
-                        alt_name = re.sub(self._ALT_PAT, "_", srv.service).lower()
-                        f_name = "alternatives.{}{}".format(alt_name, p.suffix)
-
-                    alt_path = "{}/{}".format(p.parent, f_name)
-                    bouquet.append(self._ALT.format(f_name))
-                    self.write_bouquet(alt_path, srv.service, services)
+        for index, bq in enumerate(bqs.bouquets):
+            bq_name = bq.name
+            if bq_name == "Favourites (TV)" or bq_name == "Favourites (Radio)":
+                bq_name = _DEFAULT_BOUQUET_NAME
             else:
-                data = to_bouquet_id(srv)
-                if srv.service:
-                    bouquet.append("#SERVICE {}:{}\n#DESCRIPTION {}\n".format(data, srv.service, srv.service))
-                else:
-                    bouquet.append("#SERVICE {}\n".format(data))
+                bq_name = re.sub(pattern, "_", bq.name) if force_bq_names else "de{0:02d}".format(index)
+            line.append(srv_line.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
+            write_bouquet(path + "userbouquet.{}.{}".format(bq_name, bq.type), bq.name, bq.services, m_index, s_index)
 
-        with open(path, "w", encoding="utf-8") as file:
-            file.writelines(bouquet)
+        with open(path + "bouquets.{}".format(bqs.type), "w", encoding="utf-8") as file:
+            file.writelines(line)
 
 
-class BouquetsReader:
-    """ Class for reading and parsing bouquets. """
-    _ALT_PAT = re.compile(".*alternatives\\.+(.*)\\.([tv|radio]+).*")
-    _BQ_PAT = re.compile(".*userbouquet\\.+(.*)\\.+[tv|radio].*")
-    _STREAM_TYPES = {"4097", "5001", "5002", "8193", "8739"}
+def write_bouquet(path, name, services, current_marker, current_space):
+    bouquet = ["#NAME {}\n".format(name)]
+    marker = "#SERVICE 1:64:{:X}:0:0:0:0:0:0:0::{}\n"
+    space = "#SERVICE 1:832:D:{}:0:0:0:0:0:0:\n"
 
-    __slots__ = ["_path"]
+    for srv in services:
+        s_type = srv.service_type
 
-    def __init__(self, path):
-        self._path = path
+        if s_type == BqServiceType.IPTV.name:
+            bouquet.append("#SERVICE {}\n".format(srv.fav_id.strip()))
+        elif s_type == BqServiceType.MARKER.name:
+            m_data = srv.fav_id.strip().split(":")
+            m_data[2] = current_marker[0]
+            current_marker[0] += 1
+            bouquet.append(marker.format(m_data[2], m_data[-1]))
+        elif s_type == BqServiceType.SPACE.name:
+            bouquet.append(space.format(current_space[0]))
+            current_space[0] += 1
+        else:
+            data = to_bouquet_id(srv)
+            if srv.service:
+                bouquet.append("#SERVICE {}:{}\n#DESCRIPTION {}\n".format(data, srv.service, srv.service))
+            else:
+                bouquet.append("#SERVICE {}\n".format(data))
 
-    def get(self):
-        """ Returns a tuple of TV and Radio bouquets. """
-        return self.parse_bouquets(_TV_FILE, BqType.TV.value), self.parse_bouquets(_RADIO_FILE, BqType.RADIO.value)
-
-    def parse_bouquets(self, bq_name, bq_type):
-        with open(self._path + bq_name, encoding="utf-8", errors="replace") as file:
-            lines = file.readlines()
-            bouquets = None
-            nm_sep = "#NAME"
-            b_names = set()
-            real_b_names = Counter()
-
-            for line in lines:
-                if nm_sep in line:
-                    _, _, name = line.partition(nm_sep)
-                    bouquets = Bouquets(name.strip(), bq_type, [])
-                if bouquets and "#SERVICE" in line:
-                    name = re.match(self._BQ_PAT, line)
-                    if name:
-                        b_name = name.group(1)
-                        if b_name in b_names:
-                            log("The list of bouquets contains duplicate [{}] names!".format(b_name))
-                        else:
-                            b_names.add(b_name)
-
-                        rb_name, services = self.get_bouquet(self._path, b_name, bq_type)
-                        if rb_name in real_b_names:
-                            log("Bouquet file 'userbouquet.{}.{}' has duplicate name: {}".format(b_name, bq_type,
-                                                                                                 rb_name))
-                            real_b_names[rb_name] += 1
-                            rb_name = "{} {}".format(rb_name, real_b_names[rb_name])
-                        else:
-                            real_b_names[rb_name] = 0
-
-                        bouquets[2].append(Bouquet(rb_name, bq_type, services, None, None, b_name))
-                    else:
-                        raise ValueError("No bouquet name found for: {}".format(line))
-
-        return bouquets
-
-    @staticmethod
-    def get_bouquet(path, bq_name, bq_type, prefix="userbouquet"):
-        """ Parsing services ids from bouquet file. """
-        with open(path + "{}.{}.{}".format(prefix, bq_name, bq_type), encoding="utf-8", errors="replace") as file:
-            chs_list = file.read()
-            services = []
-            srvs = list(filter(None, chs_list.split("\n#SERVICE")))  # filtering ['']
-            # May come across empty[wrong] files!
-            if not srvs:
-                log("Bouquet file 'userbouquet.{}.{}' is empty or wrong!".format(bq_name, bq_type))
-                return "{} [empty]".format(bq_name), services
-
-            bq_name = srvs.pop(0)
-
-            for num, srv in enumerate(srvs, start=1):
-                srv_data = srv.strip().split(":")
-                data_len = len(srv_data)
-                if data_len < 10:
-                    log("The bouquet [{}] service [{}] has the wrong data format: [{}]".format(bq_name, num, srv))
-                    continue
-
-                s_type = srv_data[1]
-                if s_type == "64":
-                    m_data, sep, desc = srv.partition("#DESCRIPTION")
-                    services.append(BouquetService(desc.strip() if desc else "", BqServiceType.MARKER, srv, num))
-                elif s_type == "832":
-                    m_data, sep, desc = srv.partition("#DESCRIPTION")
-                    services.append(BouquetService(desc.strip() if desc else "", BqServiceType.SPACE, srv, num))
-                elif s_type == "134":
-                    alt = re.match(BouquetsReader._ALT_PAT, srv)
-                    if alt:
-                        alt_name, alt_type = alt.group(1), alt.group(2)
-                        alt_bq_name, alt_srvs = BouquetsReader.get_bouquet(path, alt_name, alt_type, "alternatives")
-                        services.append(BouquetService(alt_bq_name, BqServiceType.ALT, alt_name, tuple(alt_srvs)))
-                elif srv_data[0].strip() in BouquetsReader._STREAM_TYPES or srv_data[10].startswith(("http", "rtsp")):
-                    stream_data, sep, desc = srv.partition("#DESCRIPTION")
-                    desc = desc.lstrip(":").strip() if desc else srv_data[-1].strip()
-                    services.append(BouquetService(desc, BqServiceType.IPTV, srv, num))
-                else:
-                    fav_id = "{}:{}:{}:{}".format(srv_data[3], srv_data[4], srv_data[5], srv_data[6])
-                    name = None
-                    if data_len == 12:
-                        name, sep, desc = str(srv_data[-1]).partition("\n#DESCRIPTION")
-                    services.append(BouquetService(name, BqServiceType.DEFAULT, fav_id.upper(), num))
-
-        return bq_name.lstrip("#NAME").strip(), services
+    with open(path, "w", encoding="utf-8") as file:
+        file.writelines(bouquet)
 
 
 def to_bouquet_id(srv):
@@ -235,5 +82,81 @@ def to_bouquet_id(srv):
         return "{}:0:{:X}:{}:0:0:0:".format(1, data_type, srv.fav_id)
 
 
+def get_bouquet(path, bq_name, bq_type):
+    """ Parsing services ids from bouquet file. """
+    with open(path + "userbouquet.{}.{}".format(bq_name, bq_type), encoding="utf-8", errors="replace") as file:
+        chs_list = file.read()
+        services = []
+        srvs = list(filter(None, chs_list.split("\n#SERVICE")))  # filtering ['']
+        # May come across empty[wrong] files!
+        if not srvs:
+            log("Bouquet file 'userbouquet.{}.{}' is empty or wrong!".format(bq_name, bq_type))
+            return "{} [empty]".format(bq_name), services
+
+        bq_name = srvs.pop(0)
+
+        for num, srv in enumerate(srvs, start=1):
+            srv_data = srv.strip().split(":")
+            if srv_data[1] == "64":
+                m_data, sep, desc = srv.partition("#DESCRIPTION")
+                services.append(BouquetService(desc.strip() if desc else "", BqServiceType.MARKER, srv, num))
+            elif srv_data[1] == "832":
+                m_data, sep, desc = srv.partition("#DESCRIPTION")
+                services.append(BouquetService(desc.strip() if desc else "", BqServiceType.SPACE, srv, num))
+            elif "http" in srv or srv_data[0] == "8193":
+                stream_data, sep, desc = srv.partition("#DESCRIPTION")
+                desc = desc.lstrip(":").strip() if desc else srv_data[-1].strip()
+                services.append(BouquetService(desc, BqServiceType.IPTV, srv, num))
+            else:
+                fav_id = "{}:{}:{}:{}".format(srv_data[3], srv_data[4], srv_data[5], srv_data[6])
+                name = None
+                if len(srv_data) == 12:
+                    name, sep, desc = str(srv_data[-1]).partition("\n#DESCRIPTION")
+                services.append(BouquetService(name, BqServiceType.DEFAULT, fav_id.upper(), num))
+
+    return bq_name.lstrip("#NAME").strip(), services
+
+
+def parse_bouquets(path, bq_name, bq_type):
+    with open(path + bq_name, encoding="utf-8", errors="replace") as file:
+        lines = file.readlines()
+        bouquets = None
+        nm_sep = "#NAME"
+        bq_pattern = re.compile(".*userbouquet\\.+(.*)\\.+[tv|radio].*")
+        b_names = set()
+        real_b_names = Counter()
+
+        for line in lines:
+            if nm_sep in line:
+                _, _, name = line.partition(nm_sep)
+                bouquets = Bouquets(name.strip(), bq_type, [])
+            if bouquets and "#SERVICE" in line:
+                name = re.match(bq_pattern, line)
+                if name:
+                    b_name = name.group(1)
+                    if b_name in b_names:
+                        log("The list of bouquets contains duplicate [{}] names!".format(b_name))
+                    else:
+                        b_names.add(b_name)
+
+                    rb_name, services = get_bouquet(path, b_name, bq_type)
+                    if rb_name in real_b_names:
+                        log("Bouquet file 'userbouquet.{}.{}' has duplicate name: {}".format(b_name, bq_type, rb_name))
+                        real_b_names[rb_name] += 1
+                        rb_name = "{} {}".format(rb_name, real_b_names[rb_name])
+                    else:
+                        real_b_names[rb_name] = 0
+
+                    bouquets[2].append(Bouquet(name=rb_name,
+                                               type=bq_type,
+                                               services=services,
+                                               locked=None,
+                                               hidden=None))
+                else:
+                    raise ValueError("No bouquet name found for: {}".format(line))
+
+    return bouquets
+
+
 if __name__ == "__main__":
     pass

app/eparser/enigma/lamedb.py

@@ -13,303 +13,271 @@ _END_LINE = "# File was created in DemonEditor.\n# ....Enjoy watching!....\n"
 
 
 def get_services(path, format_version):
-    return LameDbReader(path, format_version).parse()
+    return parse(path, format_version)
 
 
 def write_services(path, services, format_version=4):
-    LameDbWriter(path, services, format_version).write()
+    if format_version == 4:
+        write_to_lamedb(path, services)
+    elif format_version == 5:
+        write_to_lamedb5(path, services)
 
 
-class LameDbReader:
-    """ Lamedb parser class.
+def write_to_lamedb(path, services):
+    """ Writing lamedb file ver.4  """
+    lines = [_HEADER.format(4), "\ntransponders\n"]
+    tr_lines = []
+    services_lines = ["end\nservices\n"]
+    tr_set = set()
 
-        Reads and parses the Enigma2 lamedb[5] file.
-        Supports versions 3, 4 and 5..
-    """
-    __slots__ = ["_path", "_fmt"]
+    for srv in services:
+        data_id = str(srv.data_id).split(_SEP)
+        tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
+        if tr_id not in tr_set:
+            transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder)
+            tr_lines.append(transponder)
+            tr_set.add(tr_id)
+        # Services
+        services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas))
 
-    def __init__(self, path, fmt=4):
-        self._path = path
-        self._fmt = fmt
-
-    def parse(self):
-        """ Parsing lamedb. """
-        if self._fmt == 4:
-            return self.parse_v4()
-        elif self._fmt == 5:
-            return self.parse_v5()
-        raise SyntaxError("Unsupported version of the format.")
-
-    def parse_v3(self, services, transponders):
-        """ Parsing version 3. """
-        for t in transponders:
-            tr = transponders[t].lower()
-            tr_type = tr[0:1]
-            if tr_type == "c":
-                tr += ":0:0:0"
-            elif tr_type == "t" or tr_type == "a":
-                tr += ":0:0"
-            else:
-                tr_data = tr.split(_SEP)
-                len_data = len(tr_data)
-                if len_data == 6:
-                    tr_data.append("0")
-                elif len_data == 9:
-                    tr_data.insert(6, "0")
-                    tr_data.append("0")
-                    tr_data.append("2")
-
-                tr = _SEP.join(tr_data)
-
-            transponders[t] = tr
-
-        return self.parse_services(services, transponders)
-
-    def parse_v4(self):
-        """ Parsing version 4. """
-        with open(self._path + _FILE_NAME, "r", encoding="utf-8", errors="replace") as file:
-            try:
-                data = str(file.read())
-            except UnicodeDecodeError as e:
-                log("lamedb parse error: " + str(e))
-            else:
-                return self.get_services_list(data)
-
-    def parse_v5(self):
-        """ Parsing version 5. """
-        with open(self._path + "lamedb5", "r", encoding="utf-8", errors="replace") as file:
-            lns = file.readlines()
-
-            if lns and not lns[0].endswith("/5/\n"):
-                raise SyntaxError("lamedb ver.5 parsing error: unsupported format.")
-
-            trs, srvs = {}, [""]
-            for line in lns:
-                if line.startswith("s:"):
-                    srv_data = line.strip("s:").split(",", 2)
-                    srv_data[1] = srv_data[1].strip("\"")
-                    data_len = len(srv_data)
-                    if data_len == 3:
-                        srv_data[2] = srv_data[2].strip()
-                    elif data_len == 2:
-                        srv_data.append("p:")
-                    srvs.extend(srv_data)
-                elif line.startswith("t:"):
-                    data = line.split(",")
-                    len_data = len(data)
-                    if len_data > 1:
-                        tr, srv = data[0].strip("t:"), data[1].strip().replace(":", " ", 1)
-                        trs[tr] = srv
-                    else:
-                        log("Error while parsing transponder data [ver. 5] for line: {}".format(line))
-
-            return self.parse_services(srvs, trs)
-
-    def parse_services(self, services, transponders):
-        """ Parsing services. """
-        services_list = []
-        blacklist = get_blacklist(self._path) if self._path else {}
-        srvs = self.split(services, 3)
-        if srvs[0][0] == "":  # Remove first empty element.
-            srvs.remove(srvs[0])
-
-        for srv in srvs:
-            data_id = str(srv[0]).lower()  # Lower is for lamedb ver.3.
-            data = data_id.split(_SEP)
-            sp = "0"
-            tid = data[2]
-            nid = data[3]
-            # For lamedb ver.3
-            is_v3 = False
-            if len(tid) < 4:
-                is_v3 = True
-                tid = "{:0>4}".format(tid)
-                data[2] = tid
-            if len(nid) < 4:
-                is_v3 = True
-                nid = "{:0>4}".format(nid)
-                data[3] = nid
-            if is_v3:
-                data[0] = "{:0>4}".format(data[0])
-                data_id = _SEP.join(data)
-
-            srv_type = int(data[4])
-            transponder_id = "{}:{}:{}".format(data[1], tid, nid)
-            transponder = transponders.get(transponder_id, None)
-
-            tid = tid.lstrip(sp).upper()
-            nid = nid.lstrip(sp).upper()
-            ssid = str(data[0]).lstrip(sp).upper()
-            onid = str(data[1]).lstrip(sp).upper()
-            # For comparison in bouquets. Needed in upper case!!!
-            fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
-            picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(srv_type, ssid, tid, nid, onid)
-            s_id = "1:0:{:X}:{}:{}:{}:{}:0:0:0:".format(srv_type, ssid, tid, nid, onid)
-
-            all_flags = srv[2].split(",")
-            coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
-            flags = list(filter(lambda x: x.startswith("f:"), all_flags))
-            hide = HIDE_ICON if flags and Flag.is_hide(int(flags[0][2:])) else None
-            locked = LOCKED_ICON if s_id in blacklist else None
-
-            package = list(filter(lambda x: x.startswith("p:"), all_flags))
-            package = package[0][2:] if package else ""
-
-            if transponder is not None:
-                tr_type, sp, tr = str(transponder).partition(" ")
-                tr_type = TrType(tr_type)
-                tr = tr.split(_SEP)
-                service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"])
-                # Removing all non printable symbols!
-                srv_name = "".join(c for c in srv[1] if c.isprintable())
-                freq = tr[0]
-                rate = tr[1]
-                pol = None
-                fec = None
-                system = None
-                pos = None
-
-                if tr_type is TrType.Satellite:
-                    pol = POLARIZATION.get(tr[2], None)
-                    fec = FEC.get(tr[3], None)
-                    system = "DVB-S2" if len(tr) > 7 else "DVB-S"
-                    pos = tr[4]
-                if tr_type is TrType.Terrestrial:
-                    system = T_SYSTEM.get(tr[9], None)
-                    pos = "T"
-                    fec = T_FEC.get(tr[3], None)
-                elif tr_type is TrType.Cable:
-                    system = "DVB-C"
-                    pos = "C"
-                    fec = FEC_DEFAULT.get(tr[4])
-                elif tr_type is TrType.ATSC:
-                    system = "ATSC"
-                    pos = "T"
-                    fec = FEC_DEFAULT.get("0")
-
-                # Formatting displayed values.
-                try:
-                    freq = "{}".format(int(freq) // 1000)
-                    rate = "{}".format(int(rate) // 1000)
-                    if tr_type is TrType.Satellite:
-                        pos = int(pos)
-                        pos = "{:0.1f}{}".format(abs(pos / 10), "W" if pos < 0 else "E")
-                except ValueError as e:
-                    log("Parse error [parse_services]: {}".format(e))
-
-                s = Service(srv[2], tr_type.value, coded, srv_name, locked, hide, package, service_type, None,
-                            picon_id, data[0], freq, rate, pol, fec, system, pos, data_id, fav_id, transponder)
-
-                services_list.append(s)
-        return services_list
-
-    def get_services_list(self, data):
-        """ Returns a list of services from a string data representation. """
-        transponders, sep, services = data.partition("transponders")  # 1 step
-        pattern = re.compile("/[34]/$")
-        match = re.search(pattern, transponders)
-        if not match:
-            msg = "lamedb parsing error: unsupported format."
-            log(msg)
-            raise SyntaxError(msg)
-
-        transponders, sep, services = services.partition("services")  # 2 step
-        services, sep, _ = services.partition("\nend")  # 3 step
-
-        if match.group() == "/3/":
-            return self.parse_v3(services.split("\n"), self.parse_transponders(transponders.split("/")))
-
-        return self.parse_services(services.split("\n"), self.parse_transponders(transponders.split("/")))
-
-    @staticmethod
-    def get_services_lines(services):
-        """ Returns a list of strings from services for lamedb [v.4]. """
-        lines = [_HEADER.format(4), "\ntransponders\n"]
-        tr_lines = []
-        services_lines = ["end\nservices\n"]
-        tr_set = set()
-        for srv in services:
-            data_id = str(srv.data_id).split(_SEP)
-            tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
-            if tr_id not in tr_set:
-                transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder)
-                tr_lines.append(transponder)
-                tr_set.add(tr_id)
-            # Services
-            services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas))
-
-        tr_lines.sort()
-        lines.extend(tr_lines)
-        lines.extend(services_lines)
-        lines.append("end\n" + _END_LINE)
-
-        return lines
-
-    def parse_transponders(self, arg):
-        """ Parsing transponders. """
-        transponders = {}
-        for ar in arg:
-            tr = ar.replace("\n", "").split("\t")
-            if len(tr) == 2:
-                transponders[tr[0]] = tr[1]
-
-        return transponders
-
-    def split(self, itr, size):
-        """ Divide the iterable. """
-        srv = []
-        tmp = []
-        for i, line in enumerate(itr):
-            tmp.append(line)
-            if i % size == 0:
-                srv.append(tuple(tmp))
-                tmp.clear()
-
-        return srv
+    tr_lines.sort()
+    lines.extend(tr_lines)
+    lines.extend(services_lines)
+    lines.append("end\n" + _END_LINE)
+    with open(path + _FILE_NAME, "w") as file:
+        file.writelines(lines)
 
 
-class LameDbWriter:
-    """ Writes the Enigma2 lamedb[5] file.
+def write_to_lamedb5(path, services):
+    """ Writing lamedb5 file """
+    lines = [_HEADER.format(5) + "\n"]
+    services_lines = []
+    tr_set = set()
 
-        Version 4 will be used instead of version 3!
-    """
-    __slots__ = ["_path", "_fmt", "_services"]
+    for srv in services:
+        data_id = str(srv.data_id).split(_SEP)
+        tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
+        tr_set.add("t:{},{}\n".format(tr_id, srv.transponder.replace(" ", ":", 1)))
+        # Removing empty packages
+        flags = list(filter(lambda x: x != "p:", srv.flags_cas.split(",")))
+        flags = ",".join(flags)
+        flags = "," + flags if flags else ""
+        services_lines.append("s:{},\"{}\"{}\n".format(srv.data_id, srv.service, flags))
 
-    def __init__(self, path, services, fmt=4):
-        self._path = path
-        self._fmt = fmt
-        self._services = services
+    lines.extend(sorted(tr_set))
+    lines.extend(services_lines)
+    lines.append(_END_LINE)
 
-    def write(self):
-        if self._fmt == 4:
-            # Writing lamedb file ver.4
-            with open(self._path + _FILE_NAME, "w", encoding="utf-8") as file:
-                file.writelines(LameDbReader.get_services_lines(self._services))
-        elif self._fmt == 5:
-            self.write_to_lamedb5()
+    with open(path + "lamedb5", "w") as file:
+        file.writelines(lines)
 
-    def write_to_lamedb5(self):
-        """ Writing lamedb5 file. """
-        lines = [_HEADER.format(5) + "\n"]
-        services_lines = []
-        tr_set = set()
 
-        for srv in self._services:
-            data_id = str(srv.data_id).split(_SEP)
-            tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3])
-            tr_set.add("t:{},{}\n".format(tr_id, srv.transponder.replace(" ", ":", 1)))
-            # Removing empty packages
-            flags = list(filter(lambda x: x != "p:", srv.flags_cas.split(",")))
-            flags = ",".join(flags)
-            flags = "," + flags if flags else ""
-            services_lines.append("s:{},\"{}\"{}\n".format(srv.data_id, srv.service, flags))
+def parse(path, version=4):
+    """ Parsing lamedb """
+    if version == 4:
+        return parse_v4(path)
+    elif version == 5:
+        return parse_v5(path)
+    raise SyntaxError("Unsupported version of the format.")
 
-        lines.extend(sorted(tr_set))
-        lines.extend(services_lines)
-        lines.append(_END_LINE)
 
-        with open(self._path + "lamedb5", "w", encoding="utf-8") as file:
-            file.writelines(lines)
+def parse_v3(services, transponders, path):
+    """ Parsing version 3 """
+    for t in transponders:
+        tr = transponders[t].lower()
+        tr_type = tr[0:1]
+        if tr_type == "c":
+            tr += ":0:0:0"
+        elif tr_type == "t":
+            tr += ":0:0"
+        else:
+            tr_data = tr.split(_SEP)
+            len_data = len(tr_data)
+            if len_data == 6:
+                tr_data.append("0")
+            elif len_data == 9:
+                tr_data.insert(6, "0")
+                tr_data.append("0")
+                tr_data.append("2")
+
+            tr = _SEP.join(tr_data)
+
+        transponders[t] = tr
+
+    return parse_services(services, transponders, path)
+
+
+def parse_v4(path):
+    """ Parsing version 4 """
+    with open(path + _FILE_NAME, "r", encoding="utf-8", errors="replace") as file:
+        try:
+            data = str(file.read())
+        except UnicodeDecodeError as e:
+            log("lamedb parse error: " + str(e))
+        else:
+            transponders, sep, services = data.partition("transponders")  # 1 step
+            pattern = re.compile("/[34]/$")
+            match = re.search(pattern, transponders)
+            if not match:
+                msg = "lamedb parsing error: unsupported format."
+                log(msg)
+                raise SyntaxError(msg)
+
+            transponders, sep, services = services.partition("services")  # 2 step
+            services, sep, _ = services.partition("\nend")  # 3 step
+
+            if match.group() == "/3/":
+                return parse_v3(services.split("\n"), parse_transponders(transponders.split("/")), path)
+
+        return parse_services(services.split("\n"), parse_transponders(transponders.split("/")), path)
+
+
+def parse_v5(path):
+    """ Parsing version 5 """
+    with open(path + "lamedb5", "r", encoding="utf-8", errors="replace") as file:
+        lns = file.readlines()
+
+        if lns and not lns[0].endswith("/5/\n"):
+            raise SyntaxError("lamedb v.5 parsing error: unsupported format.")
+
+        trs, srvs = {}, [""]
+        for l in lns:
+            if l.startswith("s:"):
+                srv_data = l.strip("s:").split(",", 2)
+                srv_data[1] = srv_data[1].strip("\"")
+                data_len = len(srv_data)
+                if data_len == 3:
+                    srv_data[2] = srv_data[2].strip()
+                elif data_len == 2:
+                    srv_data.append("p:")
+                srvs.extend(srv_data)
+            elif l.startswith("t:"):
+                tr, srv = l.split(",")
+                trs[tr.strip("t:")] = srv.strip().replace(":", " ", 1)
+
+        return parse_services(srvs, trs, path)
+
+
+def parse_transponders(arg):
+    """ Parsing transponders """
+    transponders = {}
+    for ar in arg:
+        tr = ar.replace("\n", "").split("\t")
+        if len(tr) == 2:
+            transponders[tr[0]] = tr[1]
+
+    return transponders
+
+
+def parse_services(services, transponders, path):
+    """ Parsing services """
+    services_list = []
+    blacklist = str(get_blacklist(path))
+    srvs = split(services, 3)
+    if srvs[0][0] == "":  # remove first empty element
+        srvs.remove(srvs[0])
+
+    for srv in srvs:
+        data_id = str(srv[0]).lower()  # lower is for lamedb ver.3
+        data = data_id.split(_SEP)
+        sp = "0"
+        tid = data[2]
+        nid = data[3]
+        # For lamedb ver.3
+        is_v3 = False
+        if len(tid) < 4:
+            is_v3 = True
+            tid = "{:0>4}".format(tid)
+            data[2] = tid
+        if len(nid) < 4:
+            is_v3 = True
+            nid = "{:0>4}".format(nid)
+            data[3] = nid
+        if is_v3:
+            data[0] = "{:0>4}".format(data[0])
+            data_id = _SEP.join(data)
+
+        srv_type = int(data[4])
+        transponder_id = "{}:{}:{}".format(data[1], tid, nid)
+        transponder = transponders.get(transponder_id, None)
+
+        tid = tid.lstrip(sp).upper()
+        nid = nid.lstrip(sp).upper()
+        ssid = str(data[0]).lstrip(sp).upper()
+        onid = str(data[1]).lstrip(sp).upper()
+        # For comparison in bouquets. Needed in upper case!!!
+        fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
+        picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(srv_type, ssid, tid, nid, onid)
+
+        all_flags = srv[2].split(",")
+        coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
+        flags = list(filter(lambda x: x.startswith("f:"), all_flags))
+        hide = HIDE_ICON if flags and Flag.is_hide(int(flags[0][2:])) else None
+        locked = LOCKED_ICON if fav_id in blacklist else None
+
+        package = list(filter(lambda x: x.startswith("p:"), all_flags))
+        package = package[0][2:] if package else ""
+
+        if transponder is not None:
+            tr_type, sp, tr = str(transponder).partition(" ")
+            tr_type = TrType(tr_type)
+            tr = tr.split(_SEP)
+            service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"])
+            # removing all non printable symbols!
+            srv_name = "".join(c for c in srv[1] if c.isprintable())
+            pol = None
+            fec = None
+            system = None
+            pos = None
+
+            if tr_type is TrType.Satellite:
+                pol = POLARIZATION.get(tr[2], None)
+                fec = FEC.get(tr[3], None)
+                system = "DVB-S2" if len(tr) > 7 else "DVB-S"
+                pos = "{}.{}".format(tr[4][:-1], tr[4][-1:])
+            if tr_type is TrType.Terrestrial:
+                system = T_SYSTEM.get(tr[9], None)
+                pos = "T"
+                fec = T_FEC.get(tr[3], None)
+            elif tr_type is TrType.Cable:
+                system = "DVB-C"
+                pos = "C"
+                fec = FEC_DEFAULT.get(tr[4])
+
+            services_list.append(Service(flags_cas=srv[2],
+                                         transponder_type=tr_type.value,
+                                         coded=coded,
+                                         service=srv_name,
+                                         locked=locked,
+                                         hide=hide,
+                                         package=package,
+                                         service_type=service_type,
+                                         picon=None,
+                                         picon_id=picon_id,
+                                         ssid=data[0],
+                                         freq=tr[0],
+                                         rate=tr[1],
+                                         pol=pol,
+                                         fec=fec,
+                                         system=system,
+                                         pos=pos,
+                                         data_id=data_id,
+                                         fav_id=fav_id,
+                                         transponder=transponder))
+    return services_list
+
+
+def split(itr, size):
+    """ Divide the iterable. """
+    srv = []
+    tmp = []
+    for i, line in enumerate(itr):
+        tmp.append(line)
+        if i % size == 0:
+            srv.append(tuple(tmp))
+            tmp.clear()
+
+    return srv
 
 
 if __name__ == "__main__":

app/eparser/iptv.py

@@ -3,10 +3,9 @@ import re
 from enum import Enum
 from urllib.parse import unquote, quote
 
-from app.commons import log
-from app.eparser.ecommons import BqServiceType, Service
 from app.settings import SettingsType
 from app.ui.uicommons import IPTV_ICON
+from .ecommons import BqServiceType, Service
 
 # url, description, urlkey, account, usrname, psw, s_type, iconsrc, iconsrc_b, group
 NEUTRINO_FAV_ID_FORMAT = "{}::{}::{}::{}::{}::{}::{}::{}::{}::{}"
@@ -20,77 +19,33 @@ class StreamType(Enum):
     NONE_REC_1 = "5001"
     NONE_REC_2 = "5002"
     E_SERVICE_URI = "8193"
-    E_SERVICE_HLS = "8739"
 
 
-def parse_m3u(path, s_type, detect_encoding=True, params=None):
-    with open(path, "rb") as file:
-        data = file.read()
-        encoding = "utf-8"
-
-        if detect_encoding:
-            try:
-                import chardet
-            except ModuleNotFoundError:
-                pass
-            else:
-                enc = chardet.detect(data)
-                encoding = enc.get("encoding", "utf-8")
-
+def parse_m3u(path, s_type):
+    with open(path) as file:
         aggr = [None] * 10
-        s_aggr = aggr[: -3]
         services = []
         groups = set()
-        marker_counter = 1
-        sid_counter = 1
+        counter = 0
         name = None
-        picon = None
-        p_id = "1_0_1_0_0_0_0_0_0_0.png"
-        st = BqServiceType.IPTV.name
-        params = params or [0, 0, 0, 0]
 
-        for line in str(data, encoding=encoding, errors="ignore").splitlines():
+        for line in file.readlines():
             if line.startswith("#EXTINF"):
-                inf, sep, line = line.partition(" ")
-                if not line:
-                    line = inf
-                line, sep, name = line.rpartition(",")
-
-                data = re.split('"', line)
-                size = len(data)
-                if size < 3:
-                    continue
-                d = {data[i].lower().strip(" ="): data[i + 1] for i in range(0, len(data) - 1, 2)}
-                picon = d.get("tvg-logo", None)
-
-                grp_name = d.get("group-title", None)
-                if grp_name not in groups:
-                    groups.add(grp_name)
-                    fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
-                    marker_counter += 1
-                    mr = Service(None, None, None, grp_name, None, None, None, BqServiceType.MARKER.name, None, None,
-                                 None, None, None, None, None, None, None, None, fav_id, None)
-                    services.append(mr)
+                name = line[1 + line.index(","):].strip()
             elif line.startswith("#EXTGRP") and s_type is SettingsType.ENIGMA_2:
                 grp_name = line.strip("#EXTGRP:").strip()
                 if grp_name not in groups:
                     groups.add(grp_name)
-                    fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
-                    marker_counter += 1
-                    mr = Service(None, None, None, grp_name, None, None, None, BqServiceType.MARKER.name, None, None,
-                                 None, None, None, None, None, None, None, None, fav_id, None)
+                    fav_id = MARKER_FORMAT.format(counter, grp_name, grp_name)
+                    counter += 1
+                    mr = Service(None, None, None, grp_name, *aggr[0:3], BqServiceType.MARKER.name, *aggr, fav_id, None)
                     services.append(mr)
             elif not line.startswith("#"):
                 url = line.strip()
-                params[0] = sid_counter
-                sid_counter += 1
-                fav_id = get_fav_id(url, name, s_type, params)
-                if all((name, url, fav_id)):
-                    srv = Service(None, None, IPTV_ICON, name, None, None, None, st, picon, p_id, None, None, None,
-                                  None, None, None, None, url, fav_id, None)
+                fav_id = get_fav_id(url, name, s_type)
+                if name and url:
+                    srv = Service(None, None, IPTV_ICON, name, *aggr[0:3], BqServiceType.IPTV.name, *aggr, fav_id, None)
                     services.append(srv)
-                else:
-                    log("*.m3u* parse error ['{}']: name[{}], url[{}], fav id[{}]".format(path, name, url, fav_id))
 
     return services
 
@@ -118,15 +73,12 @@ def export_to_m3u(path, bouquet, s_type):
         file.writelines(lines)
 
 
-def get_fav_id(url, service_name, settings_type, params=None, stream_type=None, s_type=1):
+def get_fav_id(url, service_name, s_type):
     """ Returns fav id depending on the profile. """
-    if settings_type is SettingsType.ENIGMA_2:
-        stream_type = stream_type or StreamType.NONE_TS.value
-        params = params or (0, 0, 0, 0)
-        v1, v2, v3, v4 = params
-        return ENIGMA2_FAV_ID_FORMAT.format(stream_type, s_type, v1, v2, v3, v4, quote(url),
-                                            service_name, service_name, None)
-    elif settings_type is SettingsType.NEUTRINO_MP:
+    if s_type is SettingsType.ENIGMA_2:
+        stream_type = StreamType.NONE_TS.value
+        return ENIGMA2_FAV_ID_FORMAT.format(stream_type, 1, 0, 0, 0, 0, quote(url), service_name, service_name, None)
+    elif s_type is SettingsType.NEUTRINO_MP:
         return NEUTRINO_FAV_ID_FORMAT.format(url, "", 0, None, None, None, None, "", "", 1)
 
 

app/eparser/neutrino/bouquets.py

@@ -89,8 +89,11 @@ def parse_webtv(path, name, bq_type):
             group = group.value if group else group
             fav_id = NEUTRINO_FAV_ID_FORMAT.format(url, description, urlkey, account, usrname, psw, s_type, iconsrc,
                                                    iconsrc_b, group)
-            services.append(BouquetService(name=title, type=BqServiceType.IPTV, data=fav_id, num=0))
-
+            srv = BouquetService(name=title,
+                                 type=BqServiceType.IPTV,
+                                 data=fav_id,
+                                 num=0)
+            services.append(srv)
     bouquet = Bouquet(name="default", type=bq_type, services=services, locked=None, hidden=None)
     bouquets[2].append(bouquet)
 
@@ -122,15 +125,14 @@ def write_bouquet(file, bouquet):
         root.appendChild(bq_elem)
 
         for srv in bq.services:
-            f_data = srv.flags_cas.split(":")
             tr_id, on, ssid = srv.fav_id.split(":")
             srv_elem = doc.createElement("S")
             srv_elem.setAttribute("i", ssid)
             srv_elem.setAttribute("n", srv.service)
             srv_elem.setAttribute("t", tr_id)
             srv_elem.setAttribute("on", on)
-            srv_elem.setAttribute("s", f_data[1])
-            srv_elem.setAttribute("frq", srv.freq)
+            srv_elem.setAttribute("s", srv.pos.replace(".", ""))
+            srv_elem.setAttribute("frq", srv.freq[:-3])
             srv_elem.setAttribute("l", "0")  # temporary !!!
             bq_elem.appendChild(srv_elem)
 

app/eparser/neutrino/services.py

@@ -1,6 +1,5 @@
 from xml.dom.minidom import parse, Document
 
-from app.commons import log
 from ..ecommons import Service, POLARIZATION, FEC, SYSTEM, SERVICE_TYPE, PROVIDER
 
 _FILE = "services.xml"
@@ -29,7 +28,7 @@ def write_services(path, services):
         tr_atr = sat.split(":")
         sat_elem = doc.createElement("sat")
         sat_elem.setAttribute("name", tr_atr[0])
-        sat_elem.setAttribute("position", tr_atr[1])
+        sat_elem.setAttribute("position", tr_atr[1].replace(".", ""))
         sat_elem.setAttribute("diseqc", tr_atr[2])
         sat_elem.setAttribute("uncommited", tr_atr[3])
         root.appendChild(sat_elem)
@@ -89,6 +88,7 @@ def parse_services(path):
             if elem.hasAttributes():
                 sat_name = elem.attributes["name"].value
                 sat_pos = elem.attributes["position"].value
+                sat_pos = "{}.{}".format(sat_pos[:-1], sat_pos[-1:])
                 diseqc = elem.attributes.get("diseqc")
                 diseqc = diseqc.value if diseqc else diseqc
                 uncommited = elem.attributes.get("uncommited")
@@ -117,15 +117,6 @@ def parse_transponder(api, sat, sat_pos, services, tr_elem):
 
     tr = "{}:{}:{}:{}:{}:{}:{}:{}:{}".format(tr_id, on, freq, inv, rate, fec, pol, mod, sys)
     tr_id = tr_id.lstrip("0")
-    pol = POLARIZATION.get(pol)
-    # Formatting displayed values.
-    try:
-        freq = "{}".format(int(freq) // 1000)
-        rate = "{}".format(int(rate) // 1000)
-        sat_pos = int(sat_pos)
-        sat_pos = "{:0.1f}{}".format(abs(sat_pos / 10), "W" if sat_pos < 0 else "E")
-    except ValueError as e:
-        log("Neutrino parsing error [parse_transponder]: {}".format(e))
 
     for srv_elem in tr_elem.getElementsByTagName("S"):
         if srv_elem.hasAttributes():
@@ -150,10 +141,27 @@ def parse_transponder(api, sat, sat_pos, services, tr_elem):
             data_id = "{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}".format(api, srv_type, sys, num, f, v, a, p, pmt, tx, vt)
             fav_id = "{}:{}:{}".format(tr_id, on.lstrip("0"), ssid.lstrip("0"))
             picon_id = "{}{}{}.png".format(tr_id, on, ssid)
-            prv, st, = PROVIDER.get(int(on, 16)), SERVICE_TYPE.get(str(int(srv_type, 16)), SERVICE_TYPE.get("-2"))
 
-            srv = Service(sat, None, None, name, None, None, prv, st, None, picon_id, ssid, freq, rate, pol,
-                          FEC.get(fec), SYSTEM.get(sys), sat_pos, data_id, fav_id, tr)
+            srv = Service(flags_cas=sat,
+                          transponder_type=None,
+                          coded=None,
+                          service=name,
+                          locked=None,
+                          hide=None,
+                          package=PROVIDER.get(int(on, 16)),
+                          service_type=SERVICE_TYPE.get(str(int(srv_type, 16))),
+                          picon=None,
+                          picon_id=picon_id,
+                          ssid=ssid,
+                          freq=freq,
+                          rate=rate,
+                          pol=POLARIZATION.get(pol),
+                          fec=FEC.get(fec),
+                          system=SYSTEM.get(sys),
+                          pos=sat_pos,
+                          data_id=data_id,
+                          fav_id=fav_id,
+                          transponder=tr)
             services.append(srv)
 
 

app/eparser/satxml.py

@@ -53,9 +53,9 @@ def write_satellites(satellites, data_path):
             transponder_child.setAttribute("frequency", tr.frequency)
             transponder_child.setAttribute("symbol_rate", tr.symbol_rate)
             transponder_child.setAttribute("polarization", get_key_by_value(POLARIZATION, tr.polarization))
-            transponder_child.setAttribute("fec_inner", get_key_by_value(FEC, tr.fec_inner) or "0")
-            transponder_child.setAttribute("system", get_key_by_value(SYSTEM, tr.system) or "0")
-            transponder_child.setAttribute("modulation", get_key_by_value(MODULATION, tr.modulation) or "0")
+            transponder_child.setAttribute("fec_inner", get_key_by_value(FEC, tr.fec_inner))
+            transponder_child.setAttribute("system", get_key_by_value(SYSTEM, tr.system))
+            transponder_child.setAttribute("modulation", get_key_by_value(MODULATION, tr.modulation))
             if tr.pls_mode:
                 transponder_child.setAttribute("pls_mode", tr.pls_mode)
             if tr.pls_code:
@@ -90,6 +90,7 @@ def parse_transponders(elem, sat_name):
                                  atr["is_id"].value if "is_id" in atr else None)
             except Exception as e:
                 message = "Error: can't parse transponder for '{}' satellite! {}".format(sat_name, repr(e))
+                print(message)
                 log(message)
             else:
                 transponders.append(tr)

app/settings.py

@@ -5,17 +5,16 @@ import os
 import sys
 from enum import Enum, IntEnum
 from functools import lru_cache
+from pathlib import Path
 from pprint import pformat
 from textwrap import dedent
 
-SEP = os.sep
-HOME_PATH = os.path.expanduser("~")
-CONFIG_PATH = HOME_PATH + "{}.config{}demon-editor{}".format(SEP, SEP, SEP)
+HOME_PATH = str(Path.home())
+CONFIG_PATH = HOME_PATH + "/.config/demon-editor/"
 CONFIG_FILE = CONFIG_PATH + "config.json"
-DATA_PATH = HOME_PATH + "{}DemonEditor{}data{}".format(SEP, SEP, SEP)
+DATA_PATH = HOME_PATH + "/DemonEditor/data/"
 
 IS_DARWIN = sys.platform == "darwin"
-IS_WIN = sys.platform == "win32"
 
 
 class Defaults(Enum):
@@ -25,28 +24,25 @@ class Defaults(Enum):
     BACKUP_BEFORE_SAVE = True
     V5_SUPPORT = False
     FORCE_BQ_NAMES = False
-    HTTP_API_SUPPORT = IS_WIN
+    HTTP_API_SUPPORT = False
     ENABLE_YT_DL = False
     ENABLE_SEND_TO = False
     USE_COLORS = True
     NEW_COLOR = "rgb(255,230,204)"
     EXTRA_COLOR = "rgb(179,230,204)"
-    TOOLTIP_LOGO_SIZE = 96
-    LIST_PICON_SIZE = 32
     FAV_CLICK_MODE = 0
     PLAY_STREAMS_MODE = 1 if IS_DARWIN else 0
-    STREAM_LIB = "mpv" if IS_WIN else "vlc"
     PROFILE_FOLDER_DEFAULT = False
-    RECORDS_PATH = DATA_PATH + "records{}".format(SEP)
+    RECORDS_PATH = DATA_PATH + "records/"
     ACTIVATE_TRANSCODING = False
-    ACTIVE_TRANSCODING_PRESET = "720p TV{}device".format(SEP)
+    ACTIVE_TRANSCODING_PRESET = "720p TV/device"
 
 
 def get_settings():
     if not os.path.isfile(CONFIG_FILE) or os.stat(CONFIG_FILE).st_size == 0:
         write_settings(get_default_settings())
 
-    with open(CONFIG_FILE, "r", encoding="utf-8") as config_file:
+    with open(CONFIG_FILE, "r") as config_file:
         return json.load(config_file)
 
 
@@ -80,18 +76,18 @@ def get_default_transcoding_presets():
 
 def write_settings(config):
     os.makedirs(os.path.dirname(CONFIG_PATH), exist_ok=True)
-    with open(CONFIG_FILE, "w", encoding="utf-8") as config_file:
+    with open(CONFIG_FILE, "w") as config_file:
         json.dump(config, config_file, indent="    ")
 
 
 def set_local_paths(settings, profile_name, data_path=DATA_PATH, use_profile_folder=False):
-    settings["data_local_path"] = "{}{}{}".format(data_path, profile_name, SEP)
+    settings["data_local_path"] = "{}{}/".format(data_path, profile_name)
     if use_profile_folder:
-        settings["picons_local_path"] = "{}{}{}{}{}".format(data_path, profile_name, SEP, "picons", SEP)
-        settings["backup_local_path"] = "{}{}{}{}{}".format(data_path, profile_name, SEP, "backup", SEP)
+        settings["picons_local_path"] = "{}{}/{}/".format(data_path, profile_name, "picons")
+        settings["backup_local_path"] = "{}{}/{}/".format(data_path, profile_name, "backup")
     else:
-        settings["picons_local_path"] = "{}{}{}{}{}".format(data_path, "picons", SEP, profile_name, SEP)
-        settings["backup_local_path"] = "{}{}{}{}{}".format(data_path, "backup", SEP, profile_name, SEP)
+        settings["picons_local_path"] = "{}{}/{}/".format(data_path, "picons", profile_name)
+        settings["backup_local_path"] = "{}{}/{}/".format(data_path, "backup", profile_name)
 
 
 class SettingsType(IntEnum):
@@ -101,29 +97,27 @@ class SettingsType(IntEnum):
 
     def get_default_settings(self):
         """ Returns default settings for current type """
-        if self is SettingsType.ENIGMA_2:
+        if self is self.ENIGMA_2:
             return {"setting_type": self.value,
-                    "host": "127.0.0.1", "port": "21", "timeout": 5,
-                    "user": "root", "password": "root",
-                    "http_port": "80", "http_timeout": 5, "http_use_ssl": False,
-                    "telnet_port": "23", "telnet_timeout": 5,
+                    "host": "127.0.0.1", "port": "21", "user": "root", "password": "root", "timeout": 5,
+                    "http_user": "root", "http_password": "", "http_port": "80",
+                    "http_timeout": 5, "http_use_ssl": False,
+                    "telnet_user": "root", "telnet_password": "", "telnet_port": "23", "telnet_timeout": 5,
                     "services_path": "/etc/enigma2/", "user_bouquet_path": "/etc/enigma2/",
-                    "satellites_xml_path": "/etc/tuxbox/", "data_local_path": "{}enigma2{}".format(DATA_PATH, SEP),
+                    "satellites_xml_path": "/etc/tuxbox/", "data_local_path": DATA_PATH + "enigma2/",
                     "picons_path": "/usr/share/enigma2/picon/",
-                    "picons_local_path": "{}enigma2{}picons{}".format(DATA_PATH, SEP, SEP),
-                    "backup_local_path": "{}enigma2{}backup{}".format(DATA_PATH, SEP, SEP)}
-        elif self is SettingsType.NEUTRINO_MP:
+                    "picons_local_path": DATA_PATH + "enigma2/picons/",
+                    "backup_local_path": DATA_PATH + "enigma2/backup/"}
+        elif self is self.NEUTRINO_MP:
             return {"setting_type": self,
-                    "host": "127.0.0.1", "port": "21", "timeout": 5,
-                    "user": "root", "password": "root",
-                    "http_port": "80", "http_timeout": 2, "http_use_ssl": False,
-                    "telnet_port": "23", "telnet_timeout": 1,
+                    "host": "127.0.0.1", "port": "21", "user": "root", "password": "root", "timeout": 5,
+                    "http_user": "", "http_password": "", "http_port": "80", "http_timeout": 2, "http_use_ssl": False,
+                    "telnet_user": "root", "telnet_password": "", "telnet_port": "23", "telnet_timeout": 1,
                     "services_path": "/var/tuxbox/config/zapit/", "user_bouquet_path": "/var/tuxbox/config/zapit/",
-                    "satellites_xml_path": "/var/tuxbox/config/",
-                    "data_local_path": "{}neutrino{}".format(DATA_PATH, SEP),
+                    "satellites_xml_path": "/var/tuxbox/config/", "data_local_path": DATA_PATH + "neutrino/",
                     "picons_path": "/usr/share/tuxbox/neutrino/icons/logo/",
-                    "picons_local_path": "{}neutrino{}picons{}".format(DATA_PATH, SEP, SEP),
-                    "backup_local_path": "{}neutrino{}backup{}".format(DATA_PATH, SEP, SEP)}
+                    "picons_local_path": DATA_PATH + "neutrino/picons/",
+                    "backup_local_path": DATA_PATH + "neutrino/backup/"}
 
 
 class SettingsException(Exception):
@@ -137,7 +131,7 @@ class SettingsReadException(SettingsException):
 class PlayStreamsMode(IntEnum):
     """ Behavior mode when opening streams. """
     BUILT_IN = 0
-    WINDOW = 1
+    VLC = 1
     M3U = 2
 
 
@@ -185,7 +179,7 @@ class Settings:
             self._cp_settings[k] = v
 
         def_path = self.default_data_path
-        def_path += "enigma2{}".format(SEP) if self.setting_type is SettingsType.ENIGMA_2 else "neutrino{}".format(SEP)
+        def_path += "enigma2/" if self.setting_type is SettingsType.ENIGMA_2 else "neutrino/"
         set_local_paths(self._cp_settings, self._current_profile, def_path, self.profile_folder_is_default)
 
         if force_write:
@@ -285,6 +279,22 @@ class Settings:
     def password(self, value):
         self._cp_settings["password"] = value
 
+    @property
+    def http_user(self):
+        return self._cp_settings.get("http_user", self.get_default("http_user"))
+
+    @http_user.setter
+    def http_user(self, value):
+        self._cp_settings["http_user"] = value
+
+    @property
+    def http_password(self):
+        return self._cp_settings.get("http_password", self.get_default("http_password"))
+
+    @http_password.setter
+    def http_password(self, value):
+        self._cp_settings["http_password"] = value
+
     @property
     def http_port(self):
         return self._cp_settings.get("http_port", self.get_default("http_port"))
@@ -309,6 +319,22 @@ class Settings:
     def http_use_ssl(self, value):
         self._cp_settings["http_use_ssl"] = value
 
+    @property
+    def telnet_user(self):
+        return self._cp_settings.get("telnet_user", self.get_default("telnet_user"))
+
+    @telnet_user.setter
+    def telnet_user(self, value):
+        self._cp_settings["telnet_user"] = value
+
+    @property
+    def telnet_password(self):
+        return self._cp_settings.get("telnet_password", self.get_default("telnet_password"))
+
+    @telnet_password.setter
+    def telnet_password(self, value):
+        self._cp_settings["telnet_password"] = value
+
     @property
     def telnet_port(self):
         return self._cp_settings.get("telnet_port", self.get_default("telnet_port"))
@@ -441,14 +467,6 @@ class Settings:
     def play_streams_mode(self, value):
         self._settings["play_streams_mode"] = value
 
-    @property
-    def stream_lib(self):
-        return self._settings.get("stream_lib", Defaults.STREAM_LIB.value)
-
-    @stream_lib.setter
-    def stream_lib(self, value):
-        self._settings["stream_lib"] = value
-
     # *********** EPG ************ #
 
     @property
@@ -526,6 +544,30 @@ class Settings:
     def enable_send_to(self, value):
         self._settings["enable_send_to"] = value
 
+    @property
+    def use_colors(self):
+        return self._settings.get("use_colors", Defaults.USE_COLORS.value)
+
+    @use_colors.setter
+    def use_colors(self, value):
+        self._settings["use_colors"] = value
+
+    @property
+    def new_color(self):
+        return self._settings.get("new_color", Defaults.NEW_COLOR.value)
+
+    @new_color.setter
+    def new_color(self, value):
+        self._settings["new_color"] = value
+
+    @property
+    def extra_color(self):
+        return self._settings.get("extra_color", Defaults.EXTRA_COLOR.value)
+
+    @extra_color.setter
+    def extra_color(self, value):
+        self._settings["extra_color"] = value
+
     @property
     def fav_click_mode(self):
         return self._settings.get("fav_click_mode", Defaults.FAV_CLICK_MODE.value)
@@ -570,78 +612,6 @@ class Settings:
 
     # *********** Appearance *********** #
 
-    @property
-    def list_font(self):
-        return self._settings.get("list_font", "")
-
-    @list_font.setter
-    def list_font(self, value):
-        self._settings["list_font"] = value
-
-    @property
-    def list_picon_size(self):
-        return self._settings.get("list_picon_size", Defaults.LIST_PICON_SIZE.value)
-
-    @list_picon_size.setter
-    def list_picon_size(self, value):
-        self._settings["list_picon_size"] = value
-
-    @property
-    def tooltip_logo_size(self):
-        return self._settings.get("tooltip_logo_size", Defaults.TOOLTIP_LOGO_SIZE.value)
-
-    @tooltip_logo_size.setter
-    def tooltip_logo_size(self, value):
-        self._settings["tooltip_logo_size"] = value
-
-    @property
-    def use_colors(self):
-        return self._settings.get("use_colors", Defaults.USE_COLORS.value)
-
-    @use_colors.setter
-    def use_colors(self, value):
-        self._settings["use_colors"] = value
-
-    @property
-    def new_color(self):
-        return self._settings.get("new_color", Defaults.NEW_COLOR.value)
-
-    @new_color.setter
-    def new_color(self, value):
-        self._settings["new_color"] = value
-
-    @property
-    def extra_color(self):
-        return self._settings.get("extra_color", Defaults.EXTRA_COLOR.value)
-
-    @extra_color.setter
-    def extra_color(self, value):
-        self._settings["extra_color"] = value
-
-    @property
-    def dark_mode(self):
-        return self._settings.get("dark_mode", False)
-
-    @dark_mode.setter
-    def dark_mode(self, value):
-        self._settings["dark_mode"] = value
-
-    @property
-    def alternate_layout(self):
-        return self._settings.get("alternate_layout", IS_DARWIN)
-
-    @alternate_layout.setter
-    def alternate_layout(self, value):
-        self._settings["alternate_layout"] = value
-
-    @property
-    def bq_details_first(self):
-        return self._settings.get("bq_details_first", False)
-
-    @bq_details_first.setter
-    def bq_details_first(self, value):
-        self._settings["bq_details_first"] = value
-
     @property
     def is_themes_support(self):
         return self._settings.get("is_themes_support", False)
@@ -661,7 +631,7 @@ class Settings:
     @property
     @lru_cache(1)
     def themes_path(self):
-        return "{}{}.themes{}".format(HOME_PATH, SEP, SEP)
+        return "{}/.themes/".format(HOME_PATH)
 
     @property
     def icon_theme(self):
@@ -674,7 +644,7 @@ class Settings:
     @property
     @lru_cache(1)
     def icon_themes_path(self):
-        return "{}{}.icons{}".format(HOME_PATH, SEP, SEP)
+        return "{}/.icons/".format(HOME_PATH)
 
     @property
     def is_darwin(self):
@@ -708,17 +678,6 @@ class Settings:
     def debug_mode(self, value):
         self._settings["debug_mode"] = value
 
-    # **************** Experimental **************** #
-
-    @property
-    def is_enable_experimental(self):
-        """ Allows experimental functionality. """
-        return self._settings.get("enable_experimental", False)
-
-    @is_enable_experimental.setter
-    def is_enable_experimental(self, value):
-        self._settings["enable_experimental"] = value
-
 
 if __name__ == "__main__":
     pass

app/tools/media.py

@@ -1,409 +1,59 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
 import os
+import subprocess
 import sys
-from abc import ABC, abstractmethod
 from datetime import datetime
+from enum import Enum
+from urllib.request import urlopen
 
-from gi.repository import Gdk, Gtk
+from app.commons import run_task, log, _DATE_FORMAT
+from app.settings import PlayStreamsMode
 
-from app.commons import run_task, log, _DATE_FORMAT, run_with_delay
-
-
-class Player(ABC):
-    """ Base player class. Also used as a factory. """
-
-    @abstractmethod
-    def get_play_mode(self):
-        pass
-
-    @abstractmethod
-    def play(self, mrl=None):
-        pass
-
-    @abstractmethod
-    def stop(self):
-        pass
-
-    @abstractmethod
-    def pause(self):
-        pass
-
-    @abstractmethod
-    def set_time(self, time):
-        pass
-
-    @abstractmethod
-    def release(self):
-        pass
-
-    @abstractmethod
-    def is_playing(self):
-        pass
-
-    @abstractmethod
-    def get_instance(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        pass
-
-    def get_window_handle(self, widget):
-        """ Returns the identifier [pointer] for the window.
-
-            Based on gtkvlc.py[get_window_pointer] example from here:
-            https://github.com/oaubert/python-vlc/tree/master/examples
-        """
-        if sys.platform == "linux":
-            return widget.get_window().get_xid()
-        else:
-            is_darwin = sys.platform == "darwin"
-            try:
-                import ctypes
-
-                libgdk = ctypes.CDLL("libgdk-3.0.dylib" if is_darwin else "libgdk-3-0.dll")
-            except OSError as e:
-                log("{}: Load library error: {}".format(__class__.__name__, e))
-            else:
-                # https://gitlab.gnome.org/GNOME/pygobject/-/issues/112
-                ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
-                ctypes.pythonapi.PyCapsule_GetPointer.argtypes = [ctypes.py_object]
-                gpointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
-                get_pointer = libgdk.gdk_quartz_window_get_nsview if is_darwin else libgdk.gdk_win32_window_get_handle
-                get_pointer.restype = ctypes.c_void_p
-                get_pointer.argtypes = [ctypes.c_void_p]
-
-                return get_pointer(gpointer)
-
-    def get_video_widget(self, widget):
-        area = Gtk.DrawingArea(visible=True)
-        area.connect("draw", self.on_drawing_area_draw)
-        area.connect("motion-notify-event", self.on_mouse_motion)
-        area.set_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK)
-        widget.add(area)
-
-        return area
-
-    def on_drawing_area_draw(self, widget, cr):
-        """ Used for black background drawing in the player drawing area. """
-        cr.set_source_rgb(0, 0, 0)
-        cr.paint()
-
-    def on_mouse_motion(self, widget, event):
-        display = widget.get_display()
-        window = widget.get_window()
-        cursor = Gdk.Cursor.new_from_name(display, "default")
-        window.set_cursor(cursor)
-
-        self.hide_mouse_cursor(window, display)
-
-    @run_with_delay(3)
-    def hide_mouse_cursor(self, window, display):
-        cursor = Gdk.Cursor.new_for_display(display, Gdk.CursorType.BLANK_CURSOR)
-        window.set_cursor(cursor)
-
-    @staticmethod
-    def make(name, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
-        """ Factory method. We will not use a separate factory to return a specific implementation.
-
-            @param name: implementation name.
-            @param mode: current player mode [Built-in or windowed].
-            @param widget: parent of video widget.
-            @param buf_cb: buffering callback.
-            @param position_cb: time (position) callback.
-            @param error_cb: error callback.
-            @param playing_cb: playing state callback.
-
-            Throws a NameError if there is no implementation for the given name.
-        """
-        if name == "mpv":
-            return MpvPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        elif name == "gst":
-            return GstPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        elif name == "vlc":
-            return VlcPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        else:
-            raise NameError("There is no such [{}] implementation.".format(name))
-
-
-class MpvPlayer(Player):
-    """ Simple wrapper for MPV media player.
-
-        Uses python-mvp [https://github.com/jaseg/python-mpv].
-    """
-    __INSTANCE = None
-
-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        try:
-            from app.tools import mpv
-
-            self._player = mpv.MPV(wid=str(self.get_window_handle(self.get_video_widget(widget), )),
-                                   input_default_bindings=False,
-                                   input_cursor=False,
-                                   cursor_autohide="no")
-        except OSError as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No libmpv is found. Check that it is installed!")
-        else:
-            self._mode = mode
-            self._is_playing = False
-
-            @self._player.event_callback(mpv.MpvEventID.FILE_LOADED)
-            def on_open(event):
-                log("Starting playback...")
-                playing_cb()
-
-            @self._player.event_callback(mpv.MpvEventID.END_FILE)
-            def on_end(event):
-                event = event.get("event", {})
-                if event.get("reason", mpv.MpvEventEndFile.ERROR) == mpv.MpvEventEndFile.ERROR:
-                    log("Stream playback error: {}".format(event.get("error", mpv.ErrorCode.GENERIC)))
-                    error_cb()
-
-    @classmethod
-    def get_instance(cls, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        if not cls.__INSTANCE:
-            cls.__INSTANCE = MpvPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        return cls.__INSTANCE
-
-    def get_play_mode(self):
-        return self._mode
-
-    @run_task
-    def play(self, mrl=None):
-        if not mrl:
-            return
-
-        self._player.play(mrl)
-        self._is_playing = True
-
-    @run_task
-    def stop(self):
-        self._player.stop()
-        self._is_playing = True
-
-    def pause(self):
-        pass
-
-    def set_time(self, time):
-        pass
-
-    @run_task
-    def release(self):
-        self._player.terminate()
-        self.__INSTANCE = None
-
-    def is_playing(self):
-        return self._is_playing
-
-
-class GstPlayer(Player):
-    """ Simple wrapper for GStreamer playbin. """
-
-    __INSTANCE = None
-
-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
-        try:
-            import gi
-
-            gi.require_version("Gst", "1.0")
-            gi.require_version("GstVideo", "1.0")
-            from gi.repository import Gst, GstVideo
-            # Initialization of GStreamer.
-            Gst.init(sys.argv)
-        except (OSError, ValueError) as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No GStreamer is found. Check that it is installed!")
-        else:
-            self._error_cb = error_cb
-            self._playing_cb = playing_cb
-
-            self.STATE = Gst.State
-            self.STAT_RETURN = Gst.StateChangeReturn
-
-            self._mode = mode
-            self._is_playing = False
-            self._player = Gst.ElementFactory.make("playbin", "player")
-            # Initialization of the playback widget.
-            vid_widget = self.get_video_widget(widget)
-            widget.add(vid_widget)
-            vid_widget.show()
-            self._player.set_window_handle(self.get_window_handle(vid_widget))
-
-            bus = self._player.get_bus()
-            bus.add_signal_watch()
-            bus.connect("message::error", self.on_error)
-            bus.connect("message::state-changed", self.on_state_changed)
-            bus.connect("message::eos", self.on_eos)
-
-    @classmethod
-    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
-        if not cls.__INSTANCE:
-            cls.__INSTANCE = GstPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
-        return cls.__INSTANCE
-
-    def get_play_mode(self):
-        return self._mode
-
-    def play(self, mrl=None):
-        self._player.set_state(self.STATE.READY)
-        if not mrl:
-            return
-
-        self._player.set_property("uri", mrl)
-
-        log("Setting the URL for playback: {}".format(mrl))
-        ret = self._player.set_state(self.STATE.PLAYING)
-
-        if ret == self.STAT_RETURN.FAILURE:
-            log("ERROR: Unable to set the 'PLAYING' state for '{}'.".format(mrl))
-        else:
-            self._is_playing = True
-
-    def stop(self):
-        log("Stop playback...")
-        self._player.set_state(self.STATE.READY)
-        self._is_playing = False
-
-    def pause(self):
-        self._player.set_state(self.STATE.PAUSED)
-
-    def set_time(self, time):
-        pass
-
-    @run_task
-    def release(self):
-        self._is_playing = False
-        self._player.set_state(self.STATE.NULL)
-        self.__INSTANCE = None
-
-    def set_mrl(self, mrl):
-        self._player.set_property("uri", mrl)
-
-    def is_playing(self):
-        return self._is_playing
-
-    def on_error(self, bus, msg):
-        err, dbg = msg.parse_error()
-        log(err)
-        self._error_cb()
-
-    def on_state_changed(self, bus, msg):
-        if not msg.src == self._player:
-            # Not from the player.
-            return
-
-        old_state, new_state, pending = msg.parse_state_changed()
-        if new_state is self.STATE.PLAYING:
-            log("Starting playback...")
-            self._playing_cb()
-            self.get_stream_info()
-
-    def on_eos(self, bus, msg):
-        """ Called when an end-of-stream message appears. """
-        self._player.set_state(self.STATE.READY)
-        self._is_playing = False
-
-    def get_stream_info(self):
-        log("Getting stream info...")
-        nr_video = self._player.get_property("n-video")
-        for i in range(nr_video):
-            # Retrieve the stream's video tags.
-            tags = self._player.emit("get-video-tags", i)
-            if tags:
-                _, cod = tags.get_string("video-codec")
-                log("Video codec: {}".format(cod or "unknown"))
-
-        nr_audio = self._player.get_property("n-audio")
-        for i in range(nr_audio):
-            # Retrieve the stream's video tags.
-            tags = self._player.emit("get-audio-tags", i)
-            if tags:
-                _, cod = tags.get_string("audio-codec")
-                log("Audio codec: {}".format(cod or "unknown"))
-
-
-class VlcPlayer(Player):
-    """ Simple wrapper for VLC media player.
-
-        Uses python-vlc [https://github.com/oaubert/python-vlc].
-    """
 
+class Player:
     __VLC_INSTANCE = None
+    __PLAY_STREAMS_MODE = PlayStreamsMode.BUILT_IN
 
-    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
+    def __init__(self, rewind_callback, position_callback, error_callback, playing_callback):
         try:
-            if sys.platform == "win32":
-                os.add_dll_directory(r"C:\Program Files\VideoLAN\VLC")
-
             from app.tools import vlc
             from app.tools.vlc import EventType
-
+        except OSError as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
+            raise ImportError
+        else:
+            self._is_playing = False
             args = "--quiet {}".format("" if sys.platform == "darwin" else "--no-xlib")
             self._player = vlc.Instance(args).media_player_new()
-            vlc.libvlc_video_set_key_input(self._player, False)
-            vlc.libvlc_video_set_mouse_input(self._player, False)
-        except (OSError, AttributeError, NameError) as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
-            raise ImportError("No VLC is found. Check that it is installed!")
-        else:
-            self._mode = mode
-            self._is_playing = False
-
             ev_mgr = self._player.event_manager()
 
-            if buf_cb:
+            if rewind_callback:
                 # TODO look other EventType options
                 ev_mgr.event_attach(EventType.MediaPlayerBuffering,
-                                    lambda et, p: buf_cb(p.get_media().get_duration()),
+                                    lambda et, p: rewind_callback(p.get_media().get_duration()),
                                     self._player)
-            if position_cb:
+            if position_callback:
                 ev_mgr.event_attach(EventType.MediaPlayerTimeChanged,
-                                    lambda et, p: position_cb(p.get_time()),
+                                    lambda et, p: position_callback(p.get_time()),
                                     self._player)
 
-            if error_cb:
+            if error_callback:
                 ev_mgr.event_attach(EventType.MediaPlayerEncounteredError,
-                                    lambda et, p: error_cb(),
+                                    lambda et, p: error_callback(),
                                     self._player)
-            if playing_cb:
+            if playing_callback:
                 ev_mgr.event_attach(EventType.MediaPlayerPlaying,
-                                    lambda et, p: playing_cb(),
+                                    lambda et, p: playing_callback(),
                                     self._player)
 
-            self.init_video_widget(widget)
-
     @classmethod
-    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
+    def get_instance(cls, rewind_callback=None, position_callback=None, error_callback=None, playing_callback=None):
         if not cls.__VLC_INSTANCE:
-            cls.__VLC_INSTANCE = VlcPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
+            cls.__VLC_INSTANCE = Player(rewind_callback, position_callback, error_callback, playing_callback)
         return cls.__VLC_INSTANCE
 
-    def get_play_mode(self):
-        return self._mode
+    @staticmethod
+    def get_play_mode():
+        return Player.__PLAY_STREAMS_MODE
 
     @run_task
     def play(self, mrl=None):
@@ -430,7 +80,29 @@ class VlcPlayer(Player):
             self._is_playing = False
             self._player.stop()
             self._player.release()
-            self.__VLC_INSTANCE = None
+
+    def set_xwindow(self, xid):
+        self._player.set_xwindow(xid)
+
+    def set_nso(self, widget):
+        """ Used on MacOS to set NSObject.
+
+            Based on gtkvlc.py[get_window_pointer] example from here:
+            https://github.com/oaubert/python-vlc/tree/master/examples
+        """
+        try:
+            import ctypes
+            g_dll = ctypes.CDLL("libgdk-3.0.dylib")
+        except OSError as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
+        else:
+            get_nsview = g_dll.gdk_quartz_window_get_nsview
+            get_nsview.restype, get_nsview.argtypes = ctypes.c_void_p, [ctypes.c_void_p]
+            ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
+            ctypes.pythonapi.PyCapsule_GetPointer.argtypes = [ctypes.py_object]
+            # Get the C void* pointer to the window
+            pointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
+            self._player.set_nsobject(get_nsview(pointer))
 
     def set_mrl(self, mrl):
         self._player.set_mrl(mrl)
@@ -438,14 +110,94 @@ class VlcPlayer(Player):
     def is_playing(self):
         return self._is_playing
 
-    def init_video_widget(self, widget):
-        video_widget = self.get_video_widget(widget)
-        if sys.platform == "linux":
-            self._player.set_xwindow(video_widget.get_window().get_xid())
-        elif sys.platform == "darwin":
-            self._player.set_nsobject(self.get_window_handle(video_widget))
+    def set_full_screen(self, full):
+        self._player.set_fullscreen(full)
+
+
+class HttpPlayer:
+    """ Simple wrapper for VLC media player to interact over http. """
+
+    __VLC_INSTANCE = None
+    __PLAY_STREAMS_MODE = PlayStreamsMode.VLC
+
+    class Commands(Enum):
+        STATUS = "http://127.0.0.1:{}/requests/status.xml"
+        PLAY = "http://127.0.0.1:{}/requests/status.xml?command=in_play&input={}"
+        STOP = "http://127.0.0.1:{}/requests/status.xml?command=pl_stop"
+        CLEAR = "http://127.0.0.1:{}/requests/status.xml?command=pl_empty"
+
+    def __init__(self, exe, port, is_darwin):
+        from concurrent.futures import ThreadPoolExecutor as PoolExecutor
+
+        self._executor = PoolExecutor(max_workers=1)
+        self._cmd = [exe, "--no-stats", "--verbose=-1", "--extraintf", "http", "--http-port", port, "--quiet"]
+        if not is_darwin:
+            self._cmd.append("--one-instance")
+
+        self._p = None
+        self._state = None
+        self._port = port
+
+    @classmethod
+    def get_instance(cls, settings):
+        if not cls.__VLC_INSTANCE:
+            import shutil
+
+            is_darwin = settings.is_darwin
+            # TODO Add options[vlc_exe and port] to the settings!
+            exe = "/Applications/VLC.app/Contents/MacOS/VLC" if is_darwin else "/usr/bin/vlc"
+            if shutil.which(exe) is None:
+                raise ImportError
+            cls.__VLC_INSTANCE = HttpPlayer(exe=exe, port=str(9090), is_darwin=is_darwin)
+        return cls.__VLC_INSTANCE
+
+    @staticmethod
+    def get_play_mode():
+        return HttpPlayer.__PLAY_STREAMS_MODE
+
+    @run_task
+    def play(self, mrl=None):
+        if not self._p or self._p and self._p.poll() is not None:
+            self._p = subprocess.Popen(self._cmd + [mrl], preexec_fn=os.setsid)
+            self._p.communicate()
         else:
-            self._player.set_hwnd(self.get_window_handle(video_widget))
+            self._executor.submit(self.open_command, self.Commands.CLEAR)
+            self._executor.submit(self.open_command, self.Commands.PLAY, mrl)
+
+    def open_command(self, command, url=None):
+        if command is self.Commands.PLAY:
+            url = self.Commands.PLAY.value.format(self._port, url)
+        else:
+            url = command.value.format(self._port)
+
+        try:
+            with urlopen(url, timeout=5) as f:
+                self._state = command
+        except Exception as e:
+            log("{}[open_command, {}] error: {}".format(__class__.__name__, command, e))
+
+    def stop(self):
+        if self._state is self.Commands.PLAY:
+            self._executor.submit(self.open_command, self.Commands.STOP)
+
+    def pause(self):
+        pass
+
+    def set_time(self, time):
+        pass
+
+    @run_task
+    def release(self):
+        if self._p and self._p.poll() is None:
+            import signal
+            # Good explanation here: https://stackoverflow.com/a/4791612
+            os.killpg(os.getpgid(self._p.pid), signal.SIGTERM)
+
+    def is_playing(self):
+        return self._state is self.Commands.PLAY
+
+    def set_full_screen(self, full):
+        pass
 
 
 class Recorder:
@@ -456,9 +208,6 @@ class Recorder:
 
     def __init__(self, settings):
         try:
-            if sys.platform == "win32":
-                os.add_dll_directory(r"C:\Program Files\VideoLAN\VLC")
-
             from app.tools import vlc
             from app.tools.vlc import EventType
         except OSError as e:
@@ -484,7 +233,7 @@ class Recorder:
         path = self._settings.records_path
         os.makedirs(os.path.dirname(path), exist_ok=True)
         d_now = datetime.now().strftime(_DATE_FORMAT)
-        path = "{}{}_{}".format(path, name.replace(" ", "_"), d_now.replace(" ", "_").replace(":", "-"))
+        path = "{}{}_{}".format(path, name.replace(" ", "_"), d_now.replace(" ", "_"))
         cmd = self.get_transcoding_cmd(path) if self._settings.activate_transcoding else self._CMD.format(path)
         media = self._recorder.get_instance().media_new(url, cmd)
         media.get_mrl()

app/tools/picons.py

@@ -1,236 +1,23 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
 import glob
 import os
 import re
 import shutil
-import subprocess
+
 from collections import namedtuple
 from html.parser import HTMLParser
 
-import requests
-
-from app.commons import run_task, log
-from app.settings import SettingsType, IS_WIN
-from .satellites import _HEADERS
+from app.commons import run_task
+from app.settings import SettingsType
 
 _ENIGMA2_PICON_KEY = "{:X}:{:X}:{}"
 _NEUTRINO_PICON_KEY = "{:x}{:04x}{:04x}.png"
 
 Provider = namedtuple("Provider", ["logo", "name", "pos", "url", "on_id", "ssid", "single", "selected"])
-Picon = namedtuple("Picon", ["ref", "ssid"])
-
-
-class PiconsError(Exception):
-    pass
-
-
-class PiconsCzDownloader:
-    """ The main class for loading picons from the https://picon.cz/ source (by Chocholoušek). """
-
-    _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/1.0.10", "Referer": ""}
-    _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$")
-    _FILE_PATTERN = re.compile("\\s+(1_.*\\.png).*")
-
-    def __init__(self, picon_ids=set(), appender=log):
-        self._perm_links = {}
-        self._providers = {}
-        self._provider_logos = {}
-        self._picon_ids = picon_ids
-        self._appender = appender
-
-    def init(self):
-        """ Initializes dict with values: download_id -> perm link and provider data.  """
-        if self._perm_links:
-            return
-
-        self._HEADER["Referer"] = self._PERM_URL
-
-        with requests.get(url=self._PERM_URL, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                logo_map = self.get_logos_map()
-                name_map = self.get_name_map()
-
-                for line in request.iter_lines():
-                    l_id, perm_link = line.decode(encoding="utf-8", errors="ignore").split(maxsplit=1)
-                    self._perm_links[str(l_id)] = str(perm_link)
-                    data = re.match(self._LINK_PATTERN, perm_link)
-                    if data:
-                        sat_pos = data.group(3)
-                        # Logo url.
-                        logo = logo_map.get(data.group(2), None)
-                        l_name = name_map.get(sat_pos, None) or sat_pos.replace(".", "")
-                        logo_url = "{}{}/{}.png".format(self._BASE_LOGO_URL, logo, l_name) if logo else None
-
-                        prv = Provider(None, data.group(1), sat_pos, self._BASE_URL + l_id, l_id, logo_url, None, False)
-                        if sat_pos in self._providers:
-                            self._providers[sat_pos].append(prv)
-                        else:
-                            self._providers[sat_pos] = [prv]
-            else:
-                log("{} [get permalinks] error: {}".format(self.__class__.__name__, request.reason))
-                raise PiconsError(request.reason)
-
-    @property
-    def providers(self):
-        return self._providers
-
-    def get_sat_providers(self, url):
-        return self._providers.get(url, [])
-
-    def download(self, provider, picons_path, picon_ids=None):
-        self._HEADER["Referer"] = provider.url
-        with requests.get(url=provider.url, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                dest = "{}{}.7z".format(picons_path, provider.on_id)
-                self._appender("Downloading: {}\n".format(provider.url))
-                with open(dest, mode="bw") as f:
-                    for data in request.iter_content(chunk_size=1024):
-                        f.write(data)
-                self._appender("Extracting: {}\n".format(provider.on_id))
-                self.extract(dest, picons_path, picon_ids)
-            else:
-                log("{} [download] error: {}".format(self.__class__.__name__, request.reason))
-
-    def extract(self, src, dest, picon_ids=None):
-        """ Extracts 7z archives. """
-        # TODO: think about https://github.com/miurahr/py7zr
-        exe = "7zr"
-        if IS_WIN:
-            exe = "C:\\Program Files\\7-Zip\\7z.exe"
-            if not os.path.isfile(exe):
-                raise PiconsError("7-Zip executable not found!")
-
-        cmd = [exe, "l", src]
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        encoding="utf-8").communicate()
-            if err:
-                log("{} [extract] error: {}".format(self.__class__.__name__, err))
-                raise PiconsError(err)
-        except OSError as e:
-            log("{} [extract] error: {}".format(self.__class__.__name__, e))
-            raise PiconsError(e)
-
-        is_filter = bool(picon_ids)
-        ids = picon_ids or self._picon_ids
-        to_extract = []
-
-        for o in re.finditer(self._FILE_PATTERN, out):
-            p_id = o.group(1)
-            if p_id in ids:
-                to_extract.append(p_id)
-
-        if is_filter and not to_extract:
-            if os.path.isfile(src):
-                os.remove(src)
-            raise PiconsError("No matching picons found!")
-
-        cmd = [exe, "e", src, "-o{}".format(dest), "-y", "-r"]
-        cmd.extend(to_extract)
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        encoding="utf-8").communicate()
-            if err:
-                log("{} [extract] error: {}".format(self.__class__.__name__, err))
-                raise PiconsError(err)
-            else:
-                if os.path.isfile(src):
-                    os.remove(src)
-        except OSError as e:
-            log(e)
-            raise PiconsError(e)
-
-    def get_logo_data(self, url):
-        """ Returns the logo data if present. """
-        return self._provider_logos.get(url, None)
-
-    def get_provider_logo(self, url):
-        """ Retrieves package logo. """
-        # Getting package logo.
-        logo = self._provider_logos.get(url, None)
-        if logo:
-            return logo
-
-        try:
-            with requests.get(url=url, stream=True) as logo_request:
-                if logo_request.reason == "OK":
-                    data = logo_request.content
-                    self._provider_logos[url] = data
-                    return data
-                else:
-                    log("Downloading package logo error: {}".format(logo_request.reason))
-        except requests.exceptions.ConnectionError as e:
-            log("{} error [get provider logo]: {}".format(self.__class__.__name__, e))
-
-    def get_logos_map(self):
-        return {"piconblack": "b50",
-                "picontransparent": "t50",
-                "piconwhite": "w50",
-                "piconmirrorglass": "mr100",
-                "piconnoName": "n100",
-                "piconsrhd": "srhd100",
-                "piconfreezeframe": "ff220",
-                "piconfreezewhite": "fw100",
-                "piconpoolrainbow": "r100",
-                "piconsimpleblack": "s220",
-                "piconjustblack": "jb220",
-                "picondirtypaper": "dp220",
-                "picongray": "g400",
-                "piconmonochrom": "m220",
-                "picontransparentwhite": "tw100",
-                "picontransparentdark": "td220",
-                "piconoled": "o96",
-                "piconblack80": "b50",
-                "piconblack3d": "b50"
-                }
-
-    def get_name_map(self):
-        return {"antiksat": "ANTIK",
-                "digiczsk": "DIGI",
-                "DTTitaly": "picon_trs-it",
-                "dvbtCZSK": "picon_trs",
-                "PolandDTT": "picon_trs-pl",
-                "freeSAT": "UPC DIRECT",
-                "orangesat": "ORANGE TV",
-                "skylink": "M7 GROUP",
-                }
+Picon = namedtuple("Picon", ["ref", "ssid", "v_pid"])
 
 
 class PiconsParser(HTMLParser):
     """ Parser for package html page. (https://www.lyngsat.com/packages/*provider-name*.html) """
-    _BASE_URL = "https://www.lyngsat.com"
 
     def __init__(self, entities=False, separator=' ', single=None):
 
@@ -246,9 +33,9 @@ class PiconsParser(HTMLParser):
         self.picons = []
 
     def handle_starttag(self, tag, attrs):
-        if tag == "td":
+        if tag == 'td':
             self._is_td = True
-        if tag == "th":
+        if tag == 'th':
             self._is_th = True
         if tag == "img":
             self._current_row.append(attrs[0][1])
@@ -259,29 +46,32 @@ class PiconsParser(HTMLParser):
             self._current_cell.append(data.strip())
 
     def handle_endtag(self, tag):
-        if tag == "td":
+        if tag == 'td':
             self._is_td = False
-        elif tag == "th":
+        elif tag == 'th':
             self._is_th = False
 
-        if tag in ("td", "th"):
+        if tag in ('td', 'th'):
             final_cell = self._separator.join(self._current_cell).strip()
             self._current_row.append(final_cell)
             self._current_cell = []
-        elif tag == "tr":
+        elif tag == 'tr':
             row = self._current_row
             ln = len(row)
 
-            if self._single and ln == 4 and row[0].startswith("/logo/"):
-                self.picons.append(Picon(row[0].strip(), "0"))
+            if self._single and ln == 4 and row[0].startswith("../../logo/"):
+                self.picons.append(Picon(row[0].strip("../"), "0", "0"))
             else:
-                if ln > 8:
+                if 9 < ln < 13:
                     url = None
-                    if row[2].startswith("/logo/"):
-                        url = row[2]
+                    if row[0].startswith("../logo/"):
+                        url = row[0]
+                    elif row[1].startswith("../logo/"):
+                        url = row[1]
 
-                    if url and row[0].isdigit():
-                        self.picons.append(Picon(url, row[0]))
+                    ssid = row[-4]
+                    if url and len(ssid) > 2:
+                        self.picons.append(Picon(url, ssid, row[-3]))
 
             self._current_row = []
 
@@ -289,47 +79,34 @@ class PiconsParser(HTMLParser):
         pass
 
     @staticmethod
-    def parse(provider, picons_path, picon_ids, s_type=SettingsType.ENIGMA_2):
-        """ Returns tuple(url, picon file name) list. """
-        req = requests.get(provider.url, timeout=5)
-        if req.status_code == 200:
-            logo_data = req.text
-        else:
-            log("Provider picons downloading error: {} {}".format(provider.url, req.reason))
-            return
-
-        on_id, pos, ssid, single = provider.on_id, provider.pos, provider.ssid, provider.single
-        neg_pos = pos.endswith("W")
-        pos = int("".join(c for c in pos if c.isdigit()))
-        # For negative (West) positions 3600 - numeric position value!!!
-        if neg_pos:
-            pos = 3600 - pos
-
-        parser = PiconsParser(single=provider.single)
-        parser.reset()
-        parser.feed(logo_data)
-        picons = parser.picons
-        picons_data = []
-
-        if picons:
-            for p in picons:
-                try:
-                    if single:
-                        on_id, freq = on_id.strip().split("::")
-                        namespace = "{:X}{:X}".format(int(pos), int(freq))
-                    else:
-                        namespace = "{:X}0000".format(int(pos))
-
-                    if single and not ssid.isdigit():
-                        ssid = "".join(c for c in ssid if c.isdigit()) or "0"
-                    name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type)
-                    p_name = picons_path + (name if name else os.path.basename(p.ref))
-                    picons_data.append(("{}{}".format(PiconsParser._BASE_URL, p.ref), p_name))
-                except (TypeError, ValueError) as e:
-                    msg = "Picons format parse error: {}".format(p) + "\n" + str(e)
-                    log(msg)
-
-        return picons_data
+    def parse(open_path, picons_path, tmp_path, provider, picon_ids, s_type=SettingsType.ENIGMA_2):
+        with open(open_path, encoding="utf-8", errors="replace") as f:
+            on_id, pos, ssid, single = provider.on_id, provider.pos, provider.ssid, provider.single
+            neg_pos = pos.endswith("W")
+            pos = int("".join(c for c in pos if c.isdigit()))
+            # For negative (West) positions 3600 - numeric position value!!!
+            if neg_pos:
+                pos = 3600 - pos
+            parser = PiconsParser(single=single)
+            parser.reset()
+            parser.feed(f.read())
+            picons = parser.picons
+            if picons:
+                os.makedirs(picons_path, exist_ok=True)
+                for p in picons:
+                    try:
+                        if single:
+                            on_id, freq = on_id.strip().split("::")
+                            namespace = "{:X}{:X}".format(int(pos), int(freq))
+                        else:
+                            namespace = "{:X}0000".format(int(pos))
+                        name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type)
+                        p_name = picons_path + (name if name else os.path.basename(p.ref))
+                        shutil.copyfile(tmp_path + "www.lyngsat.com/" + p.ref.lstrip("."), p_name)
+                    except (TypeError, ValueError) as e:
+                        msg = "Picons format parse error: {}".format(p) + "\n" + str(e)
+                        # log(msg)
+                        print(msg)
 
     @staticmethod
     def format(ssid, on_id, namespace, picon_ids, s_type):
@@ -348,8 +125,7 @@ class ProviderParser(HTMLParser):
     _POSITION_PATTERN = re.compile("at\s\d+\..*(?:E|W)']")
     _ONID_TID_PATTERN = re.compile("^\d+-\d+.*")
     _TRANSPONDER_FREQUENCY_PATTERN = re.compile("^\d+ [HVLR]+")
-    _DOMAINS = {"/tvchannels/", "/radiochannels/", "/packages/", "/logo/"}
-    _BASE_URL = "https://www.lyngsat.com"
+    _DOMAINS = {"/tvchannels/", "/radiochannels/", "/packages/"}
 
     def __init__(self, entities=False, separator=' '):
 
@@ -377,17 +153,26 @@ class ProviderParser(HTMLParser):
         if tag == 'tr':
             self._is_th = True
         if tag == "img":
-            if attrs[0][1].startswith("/logo/"):
+            if attrs[0][1].startswith("logo/"):
                 self._current_row.append(attrs[0][1])
         if tag == "a":
             url = attrs[0][1]
             if any(d in url for d in self._DOMAINS):
                 self._current_row.append(url)
+        if tag == "font" and len(attrs) == 1:
+            atr = attrs[0]
+            if len(atr) == 2 and atr[1] == "darkgreen":
+                self._is_onid_tid = True
 
     def handle_data(self, data):
         """ Save content to a cell """
         if self._is_td or self._is_th:
             self._current_cell.append(data.strip())
+        if self._is_onid_tid:
+            m = self._ONID_TID_PATTERN.match(data)
+            if m:
+                self._on_id, tid = m.group().split("-")
+            self._is_onid_tid = False
 
     def handle_endtag(self, tag):
         if tag == 'td':
@@ -400,49 +185,41 @@ class ProviderParser(HTMLParser):
             self._current_row.append(final_cell)
             self._current_cell = []
         elif tag == 'tr':
-            row = self._current_row
+            r = self._current_row
             # Satellite position
             if not self._positon:
-                pos = re.findall(self._POSITION_PATTERN, str(row))
+                pos = re.findall(self._POSITION_PATTERN, str(r))
                 if pos:
                     self._positon = "".join(c for c in str(pos) if c.isdigit() or c in ".EW")
 
-            len_row = len(row)
+            len_row = len(r)
             if len_row > 2:
-                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(row[0])
+                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(r[1])
                 if m:
                     self._freq = m.group().split()[0]
 
-            if len_row > 12:
+            if len_row == 12:
                 # Providers
-                name = row[5]
+                name = r[5]
                 self._prv_names.add(name)
-                m = self._ONID_TID_PATTERN.match(str(row[-5]))
+                m = self._ONID_TID_PATTERN.match(str(r[-2]))
                 if m:
                     on_id, tid = m.group().split("-")
                     if on_id not in self._ids:
-                        self._on_id = on_id
-                        row[-2] = on_id
+                        r[-2] = on_id
                         self._ids.add(on_id)
-                        row[0] = self._positon
+                        r[0] = self._positon
                     if name + on_id not in self._prv_names:
                         self._prv_names.add(name + on_id)
-                        logo_data = None
-                        if row[2].startswith("/logo/"):
-                            req = requests.get(self._BASE_URL + row[2], timeout=5)
-                            if req.status_code == 200:
-                                logo_data = req.content
-                            else:
-                                log("Downloading provider logo error: {}".format(req.reason))
-                        self.rows.append(Provider(logo=logo_data, name=name, pos=self._positon, url=row[6], on_id=on_id,
+                        self.rows.append(Provider(logo=r[2], name=name, pos=self._positon, url=r[6], on_id=on_id,
                                                   ssid=None, single=False, selected=True))
-            elif 6 < len_row < 12:
+            elif 6 < len_row < 10:
                 # Single services
                 name, url, ssid = None, None, None
-                if row[0].startswith("http"):
-                    name, url, ssid = row[1], row[0], row[0]
-                elif row[1].startswith("http"):
-                    name, url, ssid = row[2], row[1], row[0]
+                if r[0].startswith("http"):
+                    name, url, ssid = r[1], r[0], r[4]
+                elif r[1].startswith("http"):
+                    name, url, ssid = r[2], r[1], r[5]
 
                 if name and url:
                     on_id = "{}::{}".format(self._on_id if self._on_id else "1", self._freq)
@@ -458,51 +235,14 @@ class ProviderParser(HTMLParser):
         super().reset()
 
 
-def parse_providers(url):
-    """ Returns a list of providers sorted by logo [single channels after providers]. """
+def parse_providers(open_path):
     parser = ProviderParser()
+    parser.reset()
 
-    request = requests.get(url=url, headers=_HEADERS)
-    if request.status_code == 200:
-        parser.feed(request.text)
-    else:
-        log("Parse providers error [{}]: {}".format(url, request.reason))
+    with open(open_path, encoding="utf-8", errors="replace") as f:
+        parser.feed(f.read())
 
-    def srt(p):
-        if p.logo is None:
-            return 1
-        return 0
-
-    providers = parser.rows
-    providers.sort(key=srt)
-
-    return providers
-
-
-def download_picon(src_url, dest_path, callback):
-    """ Downloads and saves the picon to file.  """
-    err_msg = "Picon download error: {}  [{}]"
-    timeout = (3, 5)  # connect and read timeouts
-
-    if callback:
-        callback("Downloading: {}.\n".format(os.path.basename(dest_path)))
-
-    req = requests.get(src_url, timeout=timeout, stream=True)
-    if req.status_code != 200:
-        err_msg = err_msg.format(src_url, req.reason)
-        log(err_msg)
-        if callback:
-            callback(err_msg + "\n")
-    else:
-        try:
-            with open(dest_path, "wb") as f:
-                for chunk in req:
-                    f.write(chunk)
-        except OSError as e:
-            err_msg = "Saving picon [{}] error: {}".format(dest_path, e)
-            log(err_msg)
-            if callback:
-                callback(err_msg + "\n")
+        return parser.rows
 
 
 @run_task

app/tools/satellites.py

@@ -1,83 +1,31 @@
-""" Module for downloading satellites, transponders ans services from the web.
-
-    Sources: www.flysat.com, www.lyngsat.com.
-    Replaces or updates the current satellites.xml file.
+""" Module for download satellites from internet ("flysat.com")
+    for  replace or update current satellites.xml file.
 """
 import re
+
+import requests
 from enum import Enum
 from html.parser import HTMLParser
 
-import requests
-
 from app.commons import log
 from app.eparser import Satellite, Transponder, is_transponder_valid
-from app.eparser.ecommons import (PLS_MODE, get_key_by_value, FEC, SYSTEM, POLARIZATION, MODULATION, SERVICE_TYPE,
-                                  Service, CAS)
-
-_HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:85.0) Gecko/20100101 Firefox/85.0"}
+from app.eparser.ecommons import PLS_MODE
 
 
 class SatelliteSource(Enum):
     FLYSAT = ("https://www.flysat.com/satlist.php",)
     LYNGSAT = ("https://www.lyngsat.com/asia.html", "https://www.lyngsat.com/europe.html",
                "https://www.lyngsat.com/atlantic.html", "https://www.lyngsat.com/america.html")
-    KINGOFSAT = ("https://en.kingofsat.net/satellites.php",)
 
     @staticmethod
     def get_sources(src):
         return src.value
 
 
-class Cell:
-    """ Cell representation for table parsers. """
-    __slots__ = ["_text", "_url", "_img"]
-
-    def __init__(self, text=None, link=None, img=None):
-        self._text = text
-        self._url = link
-        self._img = img
-
-    def __repr__(self):
-        return "Cell({}, {}, {})".format(self._text, self._url, self._img)
-
-    def __str__(self):
-        return "<Cell(text={}, link={}, img={})>".format(self._text, self._url, self._img)
-
-    def __iter__(self):
-        return (x for x in (self._text, self._url, self._img))
-
-    def __len__(self):
-        return 3
-
-    @property
-    def text(self):
-        return self._text
-
-    @text.setter
-    def text(self, value):
-        self._text = value
-
-    @property
-    def url(self):
-        return self._url
-
-    @url.setter
-    def url(self, value):
-        self._url = value
-
-    @property
-    def img(self):
-        return self._img
-
-    @img.setter
-    def img(self, value):
-        self._img = value
-
-
 class SatellitesParser(HTMLParser):
     """ Parser for satellite html page. """
 
-    POS_PAT = re.compile(r".*?(\d+\.\d°?[EW]).*")
+    _HEADERS = {"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:45.0) Gecko/20100101 Firefox/59.02"}
 
     def __init__(self, source=SatelliteSource.FLYSAT, entities=False, separator=' '):
 
@@ -94,14 +42,12 @@ class SatellitesParser(HTMLParser):
         self._source = source
 
     def handle_starttag(self, tag, attrs):
-        if tag == "td":
+        if tag == 'td':
             self._is_td = True
-        if tag == "tr":
+        if tag == 'tr':
             self._is_th = True
         if tag == "a":
-            for atr in attrs:
-                if atr[0] == "href":
-                    self._current_row.append(atr[1])
+            self._current_row.append(attrs[0][1])
 
     def handle_data(self, data):
         """ Save content to a cell """
@@ -109,16 +55,16 @@ class SatellitesParser(HTMLParser):
             self._current_cell.append(data.strip())
 
     def handle_endtag(self, tag):
-        if tag == "td":
+        if tag == 'td':
             self._is_td = False
-        elif tag == "tr":
+        elif tag == 'tr':
             self._is_th = False
 
-        if tag in ("td", "th"):
+        if tag in ('td', 'th'):
             final_cell = self._separator.join(self._current_cell).strip()
             self._current_row.append(final_cell)
             self._current_cell = []
-        elif tag == "tr":
+        elif tag == 'tr':
             row = self._current_row
             self._rows.append(row)
             self._current_row = []
@@ -134,7 +80,7 @@ class SatellitesParser(HTMLParser):
 
         for src in SatelliteSource.get_sources(self._source):
             try:
-                request = requests.get(url=src, headers=_HEADERS)
+                request = requests.get(url=src, headers=self._HEADERS)
             except requests.exceptions.ConnectionError as e:
                 log(repr(e))
                 return []
@@ -152,27 +98,34 @@ class SatellitesParser(HTMLParser):
 
                 return list(map(get_sat, filter(lambda x: all(x) and len(x) == 5, self._rows)))
             elif self._source is SatelliteSource.LYNGSAT:
+                extra_pattern = re.compile("^https://www\.lyngsat\.com/[\w-]+\.html")
                 base_url = "https://www.lyngsat.com/"
                 sats = []
-                cur_pos = "0"
-                for row in filter(lambda x: 3 < len(x) < 8, self._rows):
-                    if not row[0]:
-                        row = row[1:]
-
-                    pos = self.parse_position(row[1])
-                    if not self.POS_PAT.match(pos):
-                        if len(row) == 4 and row[0].endswith(".html"):
-                            sats.append((row[1], cur_pos, row[-2], base_url + row[0], False))
-                        continue
-
-                    sats.append((row[-3], pos, row[-2], base_url + row[0], False))
-                    cur_pos = pos
+                current_pos = "0"
+                for row in filter(lambda x: len(x) in (5, 7, 8), self._rows):
+                    r_len = len(row)
+                    if r_len == 7:
+                        current_pos = self.parse_position(row[2])
+                        name = row[1].rsplit("/")[-1].rstrip(".html").replace("-", " ")
+                        sats.append((name, current_pos, row[5], base_url + row[1], False))  # [all in one] satellites
+                        sats.append((row[4], current_pos, row[5], base_url + row[3], False))
+                    if r_len == 8:  # for a very limited number of satellites
+                        data = list(filter(None, row))
+                        urls = set()
+                        sat_type = ""
+                        for d in data:
+                            url = re.match(extra_pattern, d)
+                            if url:
+                                urls.add(url.group(0))
+                            if d in ("C", "Ku", "CKu"):
+                                sat_type = d
+                        current_pos = self.parse_position(data[1])
+                        for url in urls:
+                            name = url.rsplit("/")[-1].rstrip(".html").replace("-", " ")
+                            sats.append((name, current_pos, sat_type, base_url + url, False))
+                    elif r_len == 5:
+                        sats.append((row[2], current_pos, row[3], base_url + row[1], False))
                 return sats
-            elif source is SatelliteSource.KINGOFSAT:
-                def get_sat(r):
-                    return r[3], self.parse_position(r[1]), None, r[0], False
-
-                return list(map(get_sat, filter(lambda x: len(x) == 17, self._rows)))
 
     def get_satellite(self, sat):
         pos = sat[1]
@@ -192,29 +145,16 @@ class SatellitesParser(HTMLParser):
     def get_transponders(self, sat_url):
         """ Getting transponders(sorted by frequency). """
         self._rows.clear()
+        url = "https://www.flysat.com/" + sat_url if self._source is SatelliteSource.FLYSAT else sat_url
+        request = requests.get(url=url, headers=self._HEADERS)
+        reason = request.reason
         trs = []
-
-        url = sat_url
-        if self._source is SatelliteSource.FLYSAT:
-            url = "https://www.flysat.com/" + sat_url
-        elif self._source is SatelliteSource.KINGOFSAT:
-            url = "https://en.kingofsat.net/" + sat_url
-
-        try:
-            request = requests.get(url=url, headers=_HEADERS)
-        except requests.exceptions.ConnectionError as e:
-            log("Getting transponders error: {}".format(e))
-        else:
-            if request.status_code == 200:
-                self.feed(request.text)
-                if self._source is SatelliteSource.FLYSAT:
-                    self.get_transponders_for_fly_sat(trs)
-                elif self._source is SatelliteSource.LYNGSAT:
-                    self.get_transponders_for_lyng_sat(trs)
-                elif self._source is SatelliteSource.KINGOFSAT:
-                    self.get_transponders_for_king_of_sat(trs)
-            else:
-                log("SatellitesParser [get transponders] error: {}  {}".format(url, request.reason))
+        if reason == "OK":
+            self.feed(request.text)
+            if self._source is SatelliteSource.FLYSAT:
+                self.get_transponders_for_fly_sat(trs)
+            elif self._source is SatelliteSource.LYNGSAT:
+                self.get_transponders_for_lyng_sat(trs)
 
         return sorted(trs, key=lambda x: int(x.frequency))
 
@@ -270,235 +210,42 @@ class SatellitesParser(HTMLParser):
             trs.extend(n_trs)
 
     def get_transponders_for_lyng_sat(self, trs):
-        """ Parsing transponders for LyngSat. """
+        """ Parsing transponders for LyngSat """
         frq_pol_pattern = re.compile("(\\d{4,5})\\s+([RLHV]).*")
-        sr_fec_pattern = re.compile(r"(DVB-S[2]?)\s+(.+PSK)?.*?(\d+)\s+(\d/\d)\s*(?:T2-MI\s+PLP\s+(\d+))?.*")
+        sr_fec_pattern = re.compile("^(\\d{4,5})-(\\d/\\d)(.+PSK)?(.*)?$")
+        sys_pattern = re.compile("(DVB-S[2]?) ?(PLS+ (Root|Gold|Combo)+ (\\d+))* ?(multistream stream (\\d+))?",
+                                 re.IGNORECASE)
         zeros = "000"
-        pls_mode, pls_code, pls_id = None, None, None
+        pls_modes = {v: k for k, v in PLS_MODE.items()}
 
-        for row in filter(lambda x: len(x) > 8, self._rows):
-            for frq in row[1], row[2], row[3]:
+        for r in filter(lambda x: len(x) > 8, self._rows):
+            for frq in r[1], r[2], r[3]:
                 freq = re.match(frq_pol_pattern, frq)
                 if freq:
                     break
             if not freq:
                 continue
-
             frq, pol = freq.group(1), freq.group(2)
-            srf = " ".join(row[3:5])
-            sr_fec = re.search(sr_fec_pattern, srf)
+            sr_fec = re.match(sr_fec_pattern, r[-3])
             if not sr_fec:
                 continue
-
-            sys, mod, sr, fec = sr_fec.group(1), sr_fec.group(2), sr_fec.group(3), sr_fec.group(4)
+            sr, fec, mod = sr_fec.group(1), sr_fec.group(2), sr_fec.group(3)
             mod = mod.strip() if mod else "Auto"
-            pls_id = sr_fec.group(5)
+
+            res = re.match(sys_pattern, r[-4])
+            if not res:
+                continue
+
+            sys = res.group(1)
+            pls_mode = res.group(3)
+            pls_mode = pls_modes.get(pls_mode.capitalize(), None) if pls_mode else pls_mode
+            pls_code = res.group(4)
+            pls_id = res.group(6)
 
             tr = Transponder(frq + zeros, sr + zeros, pol, fec, sys, mod, pls_mode, pls_code, pls_id)
             if is_transponder_valid(tr):
                 trs.append(tr)
 
-    def get_transponders_for_king_of_sat(self, trs):
-        """ Getting transponders for KingOfSat source.
-
-            Since the *.ini file contains incomplete information, it is not used.
-        """
-        zeros = "000"
-        pat = re.compile(
-            r"(\d+).00\s+([RLHV])\s+(DVB-S[2]?)\s+(?:T2-MI, PLP (\d+)\s+)?(.*PSK).*?(?:Stream\s+(\d+))?\s+(\d+)\s+(\d+/\d+)$")
-
-        for row in filter(lambda r: len(r) == 16 and self.POS_PAT.match(r[0]), self._rows):
-            res = pat.search(" ".join((row[0], row[2], row[3], row[8], row[9], row[10])))
-            if res:
-                freq, sr, pol, fec, sys = res.group(1), res.group(7), res.group(2), res.group(8), res.group(3)
-                mod, pls_id, pls_code = res.group(5), res.group(4), res.group(6)
-
-                tr = Transponder(freq + zeros, sr + zeros, pol, fec, sys, mod, None, pls_code, pls_id)
-                if is_transponder_valid(tr):
-                    trs.append(tr)
-
-
-class ServicesParser(HTMLParser):
-    """ Services parser for LYNGSAT source. """
-
-    def __init__(self, source=SatelliteSource.LYNGSAT, entities=False, separator=' '):
-
-        HTMLParser.__init__(self)
-
-        self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "MPEG-2/SD": "1", "SD": "1", "MPEG-4 SD": "22", "MPEG-4/SD": "22",
-                         "MPEG-4": "22", "HEVC SD": "22", "MPEG-4/HD": "25", "MPEG-4 HD": "25", "MPEG-4 HD 1080": "25",
-                         "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC/HD": "25", "HEVC": "31", "HEVC/UHD": "31",
-                         "HEVC UHD": "31", "HEVC UHD 4K": "31"}
-        self._TR_PAT = re.compile(
-            r".*?(\d+)\s+([RLHV]).*(DVB-S[2]?)/?(.*PSK)?\s(T2-MI)?\s?SR-FEC:\s(\d+)-(\d/\d)\s+.*ONID-TID:\s+(\d+)-(\d+).*")
-        self._POS_PAT = re.compile(r".*?(\d+\.\d°[EW]).*")
-        self._TR = "s {}000:{}000:{}:{}:{}:{}:{}:{}"
-        self._S2_TR = "{}:{}:{}:{}"
-
-        self._parse_html_entities = entities
-        self._separator = separator
-        self._is_td = False
-        self._is_th = False
-        self._current_row = []
-        self._current_cell_text = []
-        self._current_cell = Cell()
-        self._rows = []
-        self._source = source
-
-    def handle_starttag(self, tag, attrs):
-        if tag == "td":
-            self._is_td = True
-        elif tag == "tr":
-            self._is_th = True
-        elif tag == "a" and not self._current_cell.url:
-            self._current_cell.url = attrs[0][1]
-        elif tag == "img":
-            img_link = attrs[0][1]
-            if img_link.startswith("/logo/"):
-                self._current_cell.img = img_link
-
-    def handle_data(self, data):
-        """ Save content to a cell """
-        if self._is_td or self._is_th:
-            self._current_cell_text.append(data.strip())
-
-    def handle_endtag(self, tag):
-        if tag == "td":
-            self._is_td = False
-        elif tag == "tr":
-            self._is_th = False
-
-        if tag in ("td", "th"):
-            final_cell = self._separator.join(self._current_cell_text).strip()
-            self._current_cell.text = final_cell
-            self._current_row.append(self._current_cell)
-            self._current_cell_text = []
-            self._current_cell = Cell()
-        elif tag == "tr":
-            row = self._current_row
-            self._rows.append(row)
-            self._current_row = []
-
-    def error(self, message):
-        log("ServicesParser error: {}".format(message))
-
-    def init_data(self, url):
-        """ Initializes data for the given URL. """
-        if self._source is not SatelliteSource.LYNGSAT:
-            raise ValueError("Unsupported source: {}!".format(self._source.name))
-
-        self._rows.clear()
-        request = requests.get(url=url, headers=_HEADERS)
-        reason = request.reason
-
-        if reason == "OK":
-            self.feed(request.text)
-        else:
-            raise ValueError(reason)
-
-    def get_transponders_links(self, sat_url):
-        """ Returns transponder links. """
-        try:
-            self.init_data(sat_url)
-        except ValueError as e:
-            log(e)
-        else:
-            url = "https://www.lyngsat.com/muxes/"
-            return [row[0] for row in
-                    filter(lambda x: x and len(x) > 8 and x[0].url and x[0].url.startswith(url), self._rows)]
-        return []
-
-    def get_transponder_services(self, tr_url, sat_position=None, use_pids=False):
-        """ Returns services for given transponder.
-
-            @param tr_url: transponder URL.
-            @param sat_position: custom satellite position. Sometimes required to adjust the namespace.
-            @param use_pids: if possible use additional pids [video, audio].
-        """
-        services = []
-        try:
-            self.init_data(tr_url)
-        except ValueError as e:
-            log(e)
-        else:
-            pos, freq, sr, fec, pol, namespace, tid, nid = sat_position or 0, 0, 0, 0, 0, 0, 0, 0
-            sys = "DVB-S"
-            pos_found = False
-            tr = None
-            # Transponder
-            for r in filter(lambda x: x and 6 < len(x) < 9, self._rows):
-                if not pos_found:
-                    pos_tr = re.match(self._POS_PAT, r[0].text)
-                    if not pos_tr:
-                        continue
-
-                    if not sat_position:
-                        pos = int(SatellitesParser.get_position(
-                            "".join(c for c in pos_tr.group(1) if c.isdigit() or c.isalpha())))
-
-                    pos_found = True
-
-                if pos_found:
-                    text = " ".join(c.text for c in r[1:])
-                    td = re.match(self._TR_PAT, text)
-                    if td:
-                        freq, pol = int(td.group(1)), get_key_by_value(POLARIZATION, td.group(2))
-                        if td.group(5):
-                            log("Detected T2-MI transponder!")
-                            continue
-
-                        sys, mod, sr, _fec, = td.group(3), td.group(4), td.group(6), td.group(7)
-                        nid, tid = td.group(8), td.group(9)
-
-                        neg_pos = False  # POS = W
-                        # For negative (West) positions: 3600 - numeric position value!!!
-                        namespace = "{:04x}0000".format(3600 - pos if neg_pos else pos)
-                        inv = 2  # Default
-                        fec = get_key_by_value(FEC, _fec)
-                        sys = get_key_by_value(SYSTEM, sys)
-                        tr_flag = 1
-                        mod = get_key_by_value(MODULATION, mod)
-                        roll_off = 0  # 35% DVB-S2/DVB-S (default)
-                        pilot = 2  # Auto
-                        s2_flags = "" if sys == "DVB-S" else self._S2_TR.format(tr_flag, mod or 0, roll_off, pilot)
-                        nid, tid = int(nid), int(tid)
-                        tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
-
-            if not tr:
-                msg = "ServicesParser error [get transponder services]: {}"
-                er = "Transponder [{}] not found or its type [T2-MI, etc] not supported yet.".format(freq)
-                log(msg.format(er))
-                return []
-
-            # Services
-            for r in filter(lambda x: x and len(x) == 12 and (x[0].text.isdigit()), self._rows):
-                sid, name, s_type, v_pid, a_pid, cas, pkg = r[0].text, r[2].text, r[4].text, r[
-                    5].text.strip(), r[6].text.split(), r[9].text, r[10].text.strip()
-
-                try:
-                    s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
-                    _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))  # str repr
-                    sid = int(sid)
-                    data_id = "{:04x}:{}:{:04x}:{:04x}:{}:0:0".format(sid, namespace, tid, nid, s_type)
-                    fav_id = "{}:{}:{}:{}".format(sid, tid, nid, namespace)
-                    picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(int(s_type), sid, tid, nid, namespace)
-                    # Flags.
-                    flags = "p:{}".format(pkg)
-                    cas = ",".join(get_key_by_value(CAS, c) or "C:0000" for c in cas.split()) if cas else None
-                    if use_pids:
-                        v_pid = "c:00{:04x}".format(int(v_pid)) if v_pid else None
-                        a_pid = ",".join(["c:01{:04x}".format(int(p)) for p in a_pid]) if a_pid else None
-                        flags = ",".join(filter(None, (flags, v_pid, a_pid, cas)))
-                    else:
-                        flags = ",".join(filter(None, (flags, cas)))
-
-                    services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, r[1].img, picon_id,
-                                            sid, freq, sr, pol, fec, sys, pos, data_id, fav_id, tr))
-                except ValueError as e:
-                    log("ServicesParser error [get transponder services]: {}".format(e))
-
-        return services
-
 
 if __name__ == "__main__":
     pass

app/tools/yt.py

@@ -6,12 +6,12 @@ import re
 import shutil
 import sys
 from html.parser import HTMLParser
+from json import JSONDecodeError
 from urllib.error import URLError
 from urllib.parse import unquote
 from urllib.request import Request, urlopen, urlretrieve
 
 from app.commons import log
-from app.settings import SEP
 from app.ui.uicommons import show_notification
 
 _YT_PATTERN = re.compile(r"https://www.youtube.com/.+(?:v=)([\w-]{11}).*")
@@ -43,10 +43,7 @@ class YouTube:
         self._callback = callback
 
         if self._settings.enable_yt_dl:
-            try:
-                self._yt_dl = YouTubeDL.get_instance(self._settings, callback=self._callback)
-            except YouTubeException:
-                pass  # NOP
+            self._yt_dl = YouTubeDL.get_instance(self._settings, callback=self._callback)
 
     @classmethod
     def get_instance(cls, settings, callback=log):
@@ -100,7 +97,7 @@ class YouTube:
             if player_resp:
                 try:
                     resp = json.loads(player_resp)
-                except Exception as e:
+                except JSONDecodeError as e:
                     log("{}: Parsing player response error: {}".format(__class__.__name__, e))
                 else:
                     det = resp.get("videoDetails", None)
@@ -129,21 +126,6 @@ class YouTube:
 
             return None, rsn
 
-    def get_yt_playlist(self, list_id, url=None):
-        """ Returns tuple from the playlist header and list of tuples (title, video id). """
-        if self._settings.enable_yt_dl and url:
-            try:
-                self._yt_dl.update_options({"noplaylist": False, "extract_flat": True})
-                info = self._yt_dl.get_info(url, skip_errors=False)
-                if "url" in info:
-                    info = self._yt_dl.get_info(info.get("url"), skip_errors=False)
-                return info.get("title", ""), [(e.get("title", ""), e.get("id", "")) for e in info.get("entries", [])]
-            finally:
-                # Restoring default options
-                self._yt_dl.update_options({"noplaylist": True, "extract_flat": False})
-
-        return PlayListParser.get_yt_playlist(list_id)
-
 
 class PlayListParser(HTMLParser):
     """ Very simple parser to handle YouTube playlist pages. """
@@ -154,7 +136,6 @@ class PlayListParser(HTMLParser):
         self._header = ""
         self._playlist = []
         self._is_script = False
-        self._scr_start = ('var ytInitialData = ', 'window["ytInitialData"] = ')
 
     def handle_starttag(self, tag, attrs):
         if tag == "script":
@@ -163,14 +144,11 @@ class PlayListParser(HTMLParser):
     def handle_data(self, data):
         if self._is_script:
             data = data.lstrip()
-            if data.startswith(self._scr_start):
-                data = data.split(";")[0]
-                for s in self._scr_start:
-                    data = data.lstrip(s)
-
+            if data.startswith('window["ytInitialData"] = '):
+                data = data.split(";")[0].lstrip('window["ytInitialData"] = ')
                 try:
                     resp = json.loads(data)
-                except YouTubeException as e:
+                except JSONDecodeError as e:
                     log("{}: Parsing data error: {}".format(__class__.__name__, e))
                 else:
                     sb = resp.get("sidebar", None)
@@ -183,7 +161,7 @@ class PlayListParser(HTMLParser):
 
                     ct = resp.get("contents", None)
                     if ct:
-                        for d in [(d.get("title", {}).get("runs", [{}])[0].get("text", ""),
+                        for d in [(d.get("title", {}).get("simpleText", ""),
                                    d.get("videoId", "")) for d in flat("playlistVideoRenderer", ct)]:
                             self._playlist.append(d)
             self._is_script = False
@@ -224,13 +202,12 @@ class YouTubeDL:
     _DownloadError = None
     _LATEST_RELEASE_URL = "https://api.github.com/repos/ytdl-org/youtube-dl/releases/latest"
     _OPTIONS = {"noplaylist": True,  # Single video instead of a playlist [ignoring playlist in URL].
-                "extract_flat": False,  # Do not resolve URLs, return the immediate result.
                 "quiet": True,  # Do not print messages to stdout.
                 "simulate": True,  # Do not download the video files.
                 "cookiefile": "cookies.txt"}  # File name where cookies should be read from and dumped to.
 
     def __init__(self, settings, callback):
-        self._path = settings.default_data_path + "tools{}".format(SEP)
+        self._path = settings.default_data_path + "tools/"
         self._update = settings.enable_yt_dl_update
         self._supported = {"22", "18"}
         self._dl = None
@@ -247,7 +224,7 @@ class YouTubeDL:
         return cls._DL_INSTANCE
 
     def init(self):
-        if not os.path.isfile(self._path + "youtube_dl{}version.py".format(SEP)):
+        if not os.path.isfile(self._path + "youtube_dl/version.py"):
             self.get_latest_release()
 
         if self._path not in sys.path:
@@ -268,7 +245,7 @@ class YouTubeDL:
                 if hasattr(youtube_dl.version, "__version__"):
                     l_ver = self.get_last_release_id()
                     cur_ver = youtube_dl.version.__version__
-                    if l_ver and youtube_dl.version.__version__ < l_ver:
+                    if youtube_dl.version.__version__ < l_ver:
                         msg = "youtube-dl has new release!\nCurrent: {}. Last: {}.".format(cur_ver, l_ver)
                         show_notification(msg)
                         log(msg)
@@ -285,11 +262,8 @@ class YouTubeDL:
     def get_last_release_id():
         """ Getting last release id. """
         url = "https://api.github.com/repos/ytdl-org/youtube-dl/releases/latest"
-        try:
-            with urlopen(url, timeout=10) as resp:
-                return json.loads(resp.read().decode("utf-8")).get("tag_name", "0")
-        except URLError as e:
-            log("YouTubeDLHelper error [get last release id]: {}".format(e))
+        with urlopen(url, timeout=10) as resp:
+            return json.loads(resp.read().decode("utf-8")).get("tag_name", "0")
 
     def get_latest_release(self):
         try:
@@ -300,9 +274,6 @@ class YouTubeDL:
                 r = json.loads(resp.read().decode("utf-8"))
                 zip_url = r.get("zipball_url", None)
                 if zip_url:
-                    if os.path.isdir(self._path):
-                        shutil.rmtree(self._path)
-
                     zip_file = self._path + "yt.zip"
                     os.makedirs(os.path.dirname(self._path), exist_ok=True)
                     f_name, headers = urlretrieve(zip_url, filename=zip_file)
@@ -310,8 +281,14 @@ class YouTubeDL:
                     import zipfile
 
                     with zipfile.ZipFile(f_name) as arch:
+
+                        if os.path.isdir(self._path):
+                            shutil.rmtree(self._path)
+                        else:
+                            os.makedirs(os.path.dirname(self._path), exist_ok=True)
+
                         for info in arch.infolist():
-                            pref, sep, f = info.filename.partition("{}youtube_dl{}".format("/", "/"))
+                            pref, sep, f = info.filename.partition("/youtube_dl/")
                             if sep:
                                 arch.extract(info.filename)
                                 shutil.move(info.filename, "{}{}{}".format(self._path, sep, f))
@@ -320,10 +297,7 @@ class YouTubeDL:
                         show_notification(msg)
                         log(msg)
                         self._callback(msg, False)
-
-                    if os.path.isfile(zip_file):
-                        os.remove(zip_file)
-                    return True
+                        return True
         except URLError as e:
             log("YouTubeDLHelper error: {}".format(e))
             raise YouTubeException(e)
@@ -336,17 +310,8 @@ class YouTubeDL:
             self._callback("Update process. Please wait.", False)
             return {}, ""
 
-        info = self.get_info(url, skip_errors)
-        fmts = info.get("formats", None)
-        if fmts:
-            return {Quality.get(int(fm["format_id"])): fm.get("url", "") for fm in fmts if
-                    fm.get("format_id", "") in self._supported}, info.get("title", "")
-
-        return {}, info.get("title", "")
-
-    def get_info(self, url, skip_errors=False):
         try:
-            return self._dl.extract_info(url, download=False)
+            info = self._dl.extract_info(url, download=False)
         except URLError as e:
             log(str(e))
             raise YouTubeException(e)
@@ -354,13 +319,13 @@ class YouTubeDL:
             log(str(e))
             if not skip_errors:
                 raise YouTubeException(e)
+        else:
+            fmts = info.get("formats", None)
+            if fmts:
+                return {Quality.get(int(fm["format_id"])): fm.get("url", "") for fm in fmts if
+                        fm.get("format_id", "") in self._supported}, info.get("title", "")
 
-    def update_options(self, options):
-        self._dl.params.update(options)
-
-    @property
-    def options(self):
-        return self._dl.params
+            return {}, info.get("title", "")
 
 
 def flat(key, d):

app/ui/app_menu_bar.ui

@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="menu_bar">
-    <submenu>
-      <attribute name="label" translatable="yes">File</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu>
-          <attribute name="label" translatable="yes">Import</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">Bouquet</attribute>
-              <attribute name="action">app.on_import_bouquet</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">Bouquets and services</attribute>
-              <attribute name="action">app.on_import_bouquets</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">Import from Web</attribute>
-          <attribute name="action">app.on_import_from_web</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">New empty configuration</attribute>
-          <attribute name="action">app.on_new_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Open</attribute>
-          <attribute name="action">app.on_data_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Extract...</attribute>
-          <attribute name="action">app.on_archive_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save</attribute>
-          <attribute name="action">app.on_data_save</attribute>
-        </item>
-         <item>
-          <attribute name="label" translatable="yes">Save as</attribute>
-          <attribute name="action">app.on_data_save_as</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">FTP-transfer</attribute>
-          <attribute name="action">app.on_download</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Settings</attribute>
-          <attribute name="action">app.on_settings</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Exit</attribute>
-          <attribute name="action">app.on_close_app</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Edit</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Lock</attribute>
-          <attribute name="action">app.on_locked</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Hide</attribute>
-          <attribute name="action">app.on_hide</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">View</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Search</attribute>
-          <attribute name="action">win.search</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Filter</attribute>
-          <attribute name="action">win.filter</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Tools</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Satellites editor</attribute>
-          <attribute name="action">app.on_satellite_editor_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Picons manager</attribute>
-          <attribute name="action">app.on_picons_manager_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Backups</attribute>
-          <attribute name="action">app.on_backup_tool_show</attribute>
-        </item>
-      </section>
-      <section id="telnet_section">
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">IPTV</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Add IPTV or stream service</attribute>
-        <attribute name="action">app.on_iptv</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Import YouTube playlist</attribute>
-        <attribute name="action">app.on_import_yt_list</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Import m3u</attribute>
-        <attribute name="action">app.on_import_m3u</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Export to m3u</attribute>
-        <attribute name="action">app.on_export_to_m3u</attribute>
-      </item>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">EPG configuration</attribute>
-          <attribute name="action">app.on_epg_list_configuration</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">List configuration</attribute>
-          <attribute name="action">app.on_iptv_list_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Remove all unavailable</attribute>
-          <attribute name="action">app.on_remove_all_unavailable</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">FTP client</attribute>
-      <attribute name="action">app.show_ftp_menu</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Close</attribute>
-        <attribute name="action">app.on_ftp_client_close</attribute>
-      </item>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Help</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">About</attribute>
-          <attribute name="action">app.on_about_app</attribute>
-        </item>
-      </section>
-    </submenu>
-  </menu>
-</interface>

app/ui/backup.py

@@ -8,9 +8,9 @@ from enum import Enum
 
 from app.commons import run_idle
 from app.settings import SettingsType
-from app.ui.dialogs import show_dialog, DialogType, get_builder
+from app.ui.dialogs import show_dialog, DialogType
 from app.ui.main_helper import append_text_to_tview
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey
 
 
 class RestoreType(Enum):
@@ -30,7 +30,10 @@ class BackupDialog:
                     "on_resize": self.on_resize,
                     "on_key_release": self.on_key_release}
 
-        builder = get_builder(UI_RESOURCES_PATH + "backup_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain("demon-editor")
+        builder.add_from_file(UI_RESOURCES_PATH + "backup_dialog.glade")
+        builder.connect_signals(handlers)
 
         self._settings = settings
         self._s_type = settings.setting_type
@@ -56,13 +59,14 @@ class BackupDialog:
     def show(self):
         self._dialog_window.show()
 
-    @run_idle
     def init_data(self):
-        if os.path.isdir(self._backup_path):
-            for file in filter(lambda x: x.endswith(".zip"), os.listdir(self._backup_path)):
-                self._model.append((file.rstrip(".zip"), False))
+        try:
+            files = os.listdir(self._backup_path)
+        except FileNotFoundError as e:
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
         else:
-            os.makedirs(os.path.dirname(self._backup_path), exist_ok=True)
+            for file in filter(lambda x: x.endswith(".zip"), files):
+                self._model.append((file.rstrip(".zip"), False))
 
     def on_restore_bouquets(self, item):
         self.restore(RestoreType.BOUQUETS)
@@ -125,8 +129,6 @@ class BackupDialog:
                         append_text_to_tview(name + "\n", self._text_view)
             except FileNotFoundError as e:
                 self.show_info_message(str(e), Gtk.MessageType.ERROR)
-        else:
-            self._text_view.get_buffer().set_text("")
 
     def restore(self, restore_type):
         model, paths = self._main_view.get_selection().get_selected_rows()
@@ -173,7 +175,7 @@ class BackupDialog:
         if not KeyboardKey.value_exist(key_code):
             return
         key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
+        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK
 
         if key is KeyboardKey.DELETE:
             self.on_remove(view)

app/ui/backup_dialog.glade

@@ -33,12 +33,6 @@ Author: Dmitriy Yefremov
   <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
   <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="details_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-important-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="main_list_store">
     <columns>
       <!-- column-name date -->
@@ -47,88 +41,133 @@ Author: Dmitriy Yefremov
       <column type="gboolean"/>
     </columns>
   </object>
-  <object class="GtkMenu" id="popup_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="restore_bouquets_popup_menu_item">
-        <property name="label" translatable="yes">Restore bouquets</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_restore_bouquets" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="restore_all_popup_menu_item">
-        <property name="label" translatable="yes">Restore all</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_restore_all" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="popup_menu_separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="remove_popup_menu_item">
-        <property name="label">gtk-remove</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_remove" swapped="no"/>
-        <accelerator key="Delete" signal="activate"/>
-      </object>
-    </child>
-  </object>
-  <object class="GtkImage" id="remove_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">user-trash-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="restore_all_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-select-all-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="restore_bouquets_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkWindow" id="dialog_window">
     <property name="width_request">560</property>
     <property name="height_request">320</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Backups</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">document-revert</property>
+    <property name="gravity">center</property>
     <signal name="check-resize" handler="on_resize" swapped="no"/>
-    <child>
-      <placeholder/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">Backups</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkBox" id="header_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="restore_bouquets_header_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Restore bouquets</property>
+                <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="restore_bouquets_header_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">document-revert</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="restore_all_header_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Restore all</property>
+                <signal name="clicked" handler="on_restore_all" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="restore_all_header_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">edit-select-all</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="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="remove_header_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Remove</property>
+                <signal name="clicked" handler="on_remove" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="remove_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">user-trash</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="info_check_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Details</property>
+            <property name="draw_indicator">False</property>
+            <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="info_check_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-dialog-info</property>
+              </object>
+            </child>
+            <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
     </child>
     <child>
       <object class="GtkBox" id="main_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">1</property>
-        <property name="margin_right">1</property>
-        <property name="margin_top">1</property>
-        <property name="margin_bottom">1</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
         <child>
           <object class="GtkPaned" id="main_paned">
             <property name="visible">True</property>
@@ -212,106 +251,6 @@ Author: Dmitriy Yefremov
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <child>
-              <object class="GtkButtonBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
-                <property name="layout_style">expand</property>
-                <child>
-                  <object class="GtkButton" id="restore_bouquets_header_button">
-                    <property name="label" translatable="yes">Restore bouquets</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_bouquets_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="restore_all_header_button">
-                    <property name="label" translatable="yes">Restore all</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_all_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_all" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="remove_header_button">
-                    <property name="label" translatable="yes">Remove</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">remove_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_remove" swapped="no"/>
-                    <accelerator key="Delete" signal="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="info_check_button">
-                <property name="label" translatable="yes">Details</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="valign">center</property>
-                <property name="image">details_image</property>
-                <property name="always_show_image">True</property>
-                <property name="draw_indicator">False</property>
-                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
-                <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkInfoBar" id="info_bar">
             <property name="can_focus">False</property>
@@ -362,4 +301,57 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="restore_popup_menu_item_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-revert-to-saved</property>
+  </object>
+  <object class="GtkImage" id="restore_popup_menu_item_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-select-all</property>
+  </object>
+  <object class="GtkMenu" id="popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="restore_bouquets_popup_menu_item">
+        <property name="label" translatable="yes">Restore bouquets</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">restore_popup_menu_item_image</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_restore_bouquets" swapped="no"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="restore_all_popup_menu_item">
+        <property name="label" translatable="yes">Restore all</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="image">restore_popup_menu_item_image2</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_restore_all" swapped="no"/>
+        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="popup_menu_separator">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="remove_popup_menu_item">
+        <property name="label">gtk-remove</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <signal name="activate" handler="on_remove" swapped="no"/>
+        <accelerator key="Delete" signal="activate"/>
+      </object>
+    </child>
+  </object>
 </interface>

app/ui/control.py

@@ -1,827 +0,0 @@
-""" Receiver control module via HTTP API. """
-import os
-from datetime import datetime
-from enum import Enum
-from urllib.parse import quote
-
-from gi.repository import GLib
-
-from app.settings import IS_WIN
-from .dialogs import get_builder
-from .dialogs import show_dialog, DialogType, get_message
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column
-from ..commons import run_task, run_with_delay, log, run_idle
-from ..connections import HttpAPI, UtfFTP
-from ..eparser.ecommons import BqServiceType
-
-
-class ControlBox(Gtk.HBox):
-    _TIME_STR = "%Y-%m-%d %H:%M"
-
-    class Tool(Enum):
-        """ The currently displayed tool. """
-        REMOTE = "control"
-        EPG = "epg"
-        TIMERS = "timers"
-        TIMER = "timer"
-        RECORDINGS = "recordings"
-
-    class EpgRow(Gtk.ListBoxRow):
-        def __init__(self, event: dict, **properties):
-            super().__init__(**properties)
-
-            self._event_data = event
-            h_box = Gtk.HBox()
-            h_box.set_orientation(Gtk.Orientation.VERTICAL)
-
-            self._title = event.get("e2eventtitle", "")
-            title_label = Gtk.Label(self._title)
-
-            self._desc = event.get("e2eventdescription", "")
-            description = Gtk.Label()
-            description.set_markup("<i>{}</i>".format(self._desc))
-            description.set_line_wrap(True)
-            description.set_max_width_chars(25)
-
-            start = int(event.get("e2eventstart", "0"))
-            start_time = datetime.fromtimestamp(start)
-            end_time = datetime.fromtimestamp(start + int(event.get("e2eventduration", "0")))
-            time_label = Gtk.Label()
-            time_label.set_margin_top(5)
-            self._time_header = "{} - {}".format(start_time.strftime("%A, %H:%M"), end_time.strftime("%H:%M"))
-            time_label.set_markup("<b>{}</b>".format(self._time_header))
-
-            h_box.add(time_label)
-            h_box.add(title_label)
-            h_box.add(description)
-            sep = Gtk.Separator()
-            sep.set_margin_top(5)
-            h_box.add(sep)
-            h_box.set_spacing(5)
-
-            self.add(h_box)
-            self.show_all()
-
-        @property
-        def event_data(self):
-            return self._event_data or {}
-
-        @property
-        def title(self):
-            return self._title or ""
-
-        @property
-        def desc(self):
-            return self._desc or ""
-
-        @property
-        def time_header(self):
-            return self._time_header or ""
-
-    class TimerRow(Gtk.ListBoxRow):
-
-        _UI_PATH = UI_RESOURCES_PATH + "timer_row.glade"
-
-        def __init__(self, timer, **properties):
-            super().__init__(**properties)
-
-            self._timer = timer
-
-            builder = get_builder(self._UI_PATH, None, use_str=True)
-            row_box = builder.get_object("timer_row_box")
-            name_label = builder.get_object("timer_name_label")
-            description_label = builder.get_object("timer_description_label")
-            service_name_label = builder.get_object("timer_service_name_label")
-            time_label = builder.get_object("timer_time_label")
-
-            name_label.set_text(timer.get("e2name", "") or "")
-            description_label.set_text(timer.get("e2description", "") or "")
-            service_name_label.set_text(timer.get("e2servicename", "") or "")
-            # Time
-            start_time = datetime.fromtimestamp(int(timer.get("e2timebegin", "0")))
-            end_time = datetime.fromtimestamp(int(timer.get("e2timeend", "0")))
-            time_label.set_text("{} - {}".format(start_time.strftime("%A, %H:%M"), end_time.strftime("%H:%M")))
-
-            self.add(row_box)
-            self.show()
-
-        @property
-        def timer(self):
-            return self._timer
-
-    class TimerAction(Enum):
-        ADD = 0
-        EVENT = 1
-        CHANGE = 2
-
-    class RecordingsRow(Gtk.ListBoxRow):
-        def __init__(self, movie: dict, **properties):
-            super().__init__(**properties)
-
-            self._movie = movie
-            h_box = Gtk.HBox()
-            h_box.set_orientation(Gtk.Orientation.VERTICAL)
-
-            self._service = movie.get("e2servicename")
-            service_label = Gtk.Label()
-            service_label.set_markup("<b>{}</b>".format(self._service))
-
-            self._title = movie.get("e2title", "")
-            title_label = Gtk.Label(self._title)
-
-            self._desc = movie.get("e2description", "")
-            description = Gtk.Label()
-            description.set_markup("<i>{}</i>".format(self._desc))
-            description.set_line_wrap(True)
-            description.set_max_width_chars(25)
-
-            start_time = datetime.fromtimestamp(int(movie.get("e2time", "0")))
-            start_time_label = Gtk.Label()
-            start_time_label.set_margin_top(5)
-            start_time_label.set_markup("<b>{}</b>".format(start_time.strftime("%A, %H:%M")))
-
-            time_label = Gtk.Label()
-            time_label.set_margin_top(5)
-            time_label.set_markup("<b>{}</b>".format(movie.get("e2length", "0")))
-
-            info_box = Gtk.HBox()
-            info_box.set_orientation(Gtk.Orientation.HORIZONTAL)
-            info_box.set_spacing(10)
-            info_box.pack_start(start_time_label, False, True, 5)
-            info_box.pack_end(time_label, False, True, 5)
-
-            h_box.add(service_label)
-            h_box.add(title_label)
-            h_box.add(description)
-            h_box.add(info_box)
-            sep = Gtk.Separator()
-            sep.set_margin_top(5)
-            h_box.add(sep)
-            h_box.set_spacing(5)
-
-            self.set_tooltip_text(movie.get("e2filename", ""))
-            self.add(h_box)
-            self.show_all()
-
-        @property
-        def movie(self):
-            return self._movie
-
-        @property
-        def service(self):
-            return self._service or ""
-
-        @property
-        def title(self):
-            return self._title or ""
-
-        @property
-        def desc(self):
-            return self._desc or ""
-
-        @property
-        def file(self):
-            return self._movie.get("e2filename", "")
-
-    def __init__(self, app, http_api, settings, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self._http_api = http_api
-        self._settings = settings
-        self._update_epg = False
-        self._app = app
-        self._last_tool = self.Tool.REMOTE
-        self._timer_action = self.TimerAction.ADD
-        self._current_timer = {}
-
-        handlers = {"on_visible_tool": self.on_visible_tool,
-                    "on_volume_changed": self.on_volume_changed,
-                    "on_epg_press": self.on_epg_press,
-                    "on_epg_filter_changed": self.on_epg_filter_changed,
-                    "on_timers_press": self.on_timers_press,
-                    "on_timers_drag_data_received": self.on_timers_drag_data_received,
-                    "on_recordings_press": self.on_recordings_press,
-                    "on_recording_filter_changed": self.on_recording_filter_changed,
-                    "on_recordings_dir_changed": self.on_recordings_dir_changed}
-
-        builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers)
-
-        self.add(builder.get_object("main_box_frame"))
-        self._stack = builder.get_object("stack")
-        self._screenshot_image = builder.get_object("screenshot_image")
-        self._screenshot_button_box = builder.get_object("screenshot_button_box")
-        self._screenshot_check_button = builder.get_object("screenshot_check_button")
-        self._screenshot_check_button.bind_property("active", self._screenshot_image, "visible")
-        self._snr_value_label = builder.get_object("snr_value_label")
-        self._ber_value_label = builder.get_object("ber_value_label")
-        self._agc_value_label = builder.get_object("agc_value_label")
-        self._volume_button = builder.get_object("volume_button")
-        self._epg_list_box = builder.get_object("epg_list_box")
-        self._epg_list_box.set_filter_func(self.epg_filter_function)
-        self._epg_filter_entry = builder.get_object("epg_filter_entry")
-        self._timers_list_box = builder.get_object("timers_list_box")
-        self._app._control_revealer.bind_property("visible", self, "visible")
-        # Timers
-        self._timer_remove_button = builder.get_object("timer_remove_button")
-        self._timer_remove_button.bind_property("visible", builder.get_object("timer_edit_button"), "visible")
-        # Timer
-        self._timer_name_entry = builder.get_object("timer_name_entry")
-        self._timer_desc_entry = builder.get_object("timer_desc_entry")
-        self._timer_service_entry = builder.get_object("timer_service_entry")
-        self._timer_service_ref_entry = builder.get_object("timer_service_ref_entry")
-        self._timer_event_id_entry = builder.get_object("timer_event_id_entry")
-        self._timer_begins_entry = builder.get_object("timer_begins_entry")
-        self._timer_ends_entry = builder.get_object("timer_ends_entry")
-        self._timer_begins_calendar = builder.get_object("timer_begins_calendar")
-        self._timer_begins_hr_button = builder.get_object("timer_begins_hr_button")
-        self._timer_begins_min_button = builder.get_object("timer_begins_min_button")
-        self._timer_ends_calendar = builder.get_object("timer_ends_calendar")
-        self._timer_ends_hr_button = builder.get_object("timer_ends_hr_button")
-        self._timer_ends_min_button = builder.get_object("timer_ends_min_button")
-        self._timer_enabled_switch = builder.get_object("timer_enabled_switch")
-        self._timer_action_combo_box = builder.get_object("timer_action_combo_box")
-        self._timer_after_combo_box = builder.get_object("timer_after_combo_box")
-        self._timer_mo_check_button = builder.get_object("timer_mo_check_button")
-        self._timer_tu_check_button = builder.get_object("timer_tu_check_button")
-        self._timer_we_check_button = builder.get_object("timer_we_check_button")
-        self._timer_th_check_button = builder.get_object("timer_th_check_button")
-        self._timer_fr_check_button = builder.get_object("timer_fr_check_button")
-        self._timer_sa_check_button = builder.get_object("timer_sa_check_button")
-        self._timer_su_check_button = builder.get_object("timer_su_check_button")
-        self._timer_location_switch = builder.get_object("timer_location_switch")
-        self._timer_location_entry = builder.get_object("timer_location_entry")
-        self._timer_location_switch.bind_property("active", self._timer_location_entry, "sensitive")
-        # Disable DnD for timer entries.
-        self._timer_name_entry.drag_dest_unset()
-        self._timer_desc_entry.drag_dest_unset()
-        self._timer_service_entry.drag_dest_unset()
-        # DnD initialization for the timer list.
-        self._timers_list_box.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.DEFAULT | Gdk.DragAction.COPY)
-        self._timers_list_box.drag_dest_add_text_targets()
-        # Recordings.
-        self._recordings_list_box = builder.get_object("recordings_list_box")
-        self._recordings_list_box.set_filter_func(self.recording_filter_function)
-        self._recordings_filter_entry = builder.get_object("recordings_filter_entry")
-        self._recordings_dir_box = builder.get_object("recordings_dir_box")
-
-        self.init_actions(app)
-        self.connect("hide", self.on_hide)
-        self.show()
-
-    def init_actions(self, app):
-        # Remote controller actions
-        app.set_action("on_up", lambda a, v: self.on_remote_action(HttpAPI.Remote.UP))
-        app.set_action("on_down", lambda a, v: self.on_remote_action(HttpAPI.Remote.DOWN))
-        app.set_action("on_left", lambda a, v: self.on_remote_action(HttpAPI.Remote.LEFT))
-        app.set_action("on_right", lambda a, v: self.on_remote_action(HttpAPI.Remote.RIGHT))
-        app.set_action("on_ok", lambda a, v: self.on_remote_action(HttpAPI.Remote.OK))
-        app.set_action("on_menu", lambda a, v: self.on_remote_action(HttpAPI.Remote.MENU))
-        app.set_action("on_exit", lambda a, v: self.on_remote_action(HttpAPI.Remote.EXIT))
-        app.set_action("on_red", lambda a, v: self.on_remote_action(HttpAPI.Remote.RED))
-        app.set_action("on_green", lambda a, v: self.on_remote_action(HttpAPI.Remote.GREEN))
-        app.set_action("on_yellow", lambda a, v: self.on_remote_action(HttpAPI.Remote.YELLOW))
-        app.set_action("on_blue", lambda a, v: self.on_remote_action(HttpAPI.Remote.BLUE))
-        # Power
-        app.set_action("on_standby", lambda a, v: self.on_power_action(HttpAPI.Power.STANDBY))
-        app.set_action("on_wake_up", lambda a, v: self.on_power_action(HttpAPI.Power.WAKEUP))
-        app.set_action("on_reboot", lambda a, v: self.on_power_action(HttpAPI.Power.REBOOT))
-        app.set_action("on_restart_gui", lambda a, v: self.on_power_action(HttpAPI.Power.RESTART_GUI))
-        app.set_action("on_shutdown", lambda a, v: self.on_power_action(HttpAPI.Power.DEEP_STANDBY))
-        # Screenshots
-        app.set_action("on_screenshot_all", self.on_screenshot_all)
-        app.set_action("on_screenshot_video", self.on_screenshot_video)
-        app.set_action("on_screenshot_osd", self.on_screenshot_osd)
-        # Timers
-        app.set_action("on_timer_add", self.on_timer_add)
-        app.set_action("on_timer_add_from_event", self.on_timer_add_from_event)
-        app.set_action("on_timer_remove", self.on_timer_remove)
-        app.set_action("on_timer_edit", self.on_timer_edit)
-        app.set_action("on_timer_save", self.on_timer_save)
-        app.set_action("on_timer_cancel", self.on_timer_cancel)
-        app.set_action("on_timer_begins_set", self.on_timer_begins_set)
-        app.set_action("on_timer_ends_set", self.on_timer_ends_set)
-        # Recordings
-        app.set_action("on_recording_remove", self.on_recording_remove)
-
-    @property
-    def update_epg(self):
-        return self._update_epg
-
-    def on_visible_tool(self, stack, param):
-        tool = self.Tool(stack.get_visible_child_name())
-        self._update_epg = tool is self.Tool.EPG
-
-        if tool is self.Tool.TIMERS:
-            self.update_timer_list()
-
-        if tool is self.Tool.RECORDINGS:
-            self.update_recordings_list()
-
-        if tool is not self.Tool.TIMER:
-            self._last_tool = tool
-
-    def on_hide(self, item):
-        self._update_epg = False
-
-    # ***************** Remote controller ********************* #
-
-    def on_remote(self, action, state=False):
-        """ Shows/Hides [R key] remote controller. """
-        action.set_state(state)
-        self._remote_revealer.set_visible(state)
-        self._remote_revealer.set_reveal_child(state)
-
-        if state:
-            self._http_api.send(HttpAPI.Request.VOL, "state", self.update_volume)
-
-    def on_remote_action(self, action):
-        self._http_api.send(HttpAPI.Request.REMOTE, action, self.on_response)
-
-    @run_with_delay(0.5)
-    def on_volume_changed(self, button, value):
-        self._http_api.send(HttpAPI.Request.VOL, "{:.0f}".format(value), self.on_response)
-
-    def update_volume(self, vol):
-        if "error_code" in vol:
-            return
-
-        GLib.idle_add(self._volume_button.set_value, int(vol.get("e2current", "0")))
-
-    def on_response(self, resp):
-        if "error_code" in resp:
-            return
-
-        if self._screenshot_check_button.get_active():
-            ref = "mode=all" if self._http_api.is_owif else "d="
-            self._http_api.send(HttpAPI.Request.GRUB, ref, self.update_screenshot)
-
-    @run_task
-    def update_screenshot(self, data):
-        if "error_code" in data:
-            return
-
-        data = data.get("img_data", None)
-        if data:
-            from gi.repository import GdkPixbuf
-
-            loader = GdkPixbuf.PixbufLoader.new_with_type("jpeg")
-            loader.set_size(280, 165)
-            try:
-                loader.write(data)
-                pix = loader.get_pixbuf()
-            except GLib.Error:
-                pass  # NOP
-            else:
-                GLib.idle_add(self._screenshot_image.set_from_pixbuf, pix)
-            finally:
-                loader.close()
-
-    def on_screenshot_all(self, action, value=None):
-        self._http_api.send(HttpAPI.Request.GRUB, "mode=all" if self._http_api.is_owif else "d=",
-                            self.on_screenshot)
-
-    def on_screenshot_video(self, action, value=None):
-        self._http_api.send(HttpAPI.Request.GRUB, "mode=video" if self._http_api.is_owif else "v=",
-                            self.on_screenshot)
-
-    def on_screenshot_osd(self, action, value=None):
-        self._http_api.send(HttpAPI.Request.GRUB, "mode=osd" if self._http_api.is_owif else "o=",
-                            self.on_screenshot)
-
-    @run_task
-    def on_screenshot(self, data):
-        if "error_code" in data:
-            return
-
-        img = data.get("img_data", None)
-        if img:
-            GLib.idle_add(self._screenshot_button_box.set_sensitive, IS_WIN)
-            path = os.path.expanduser("~/Desktop") if IS_WIN else None
-
-            try:
-                import tempfile
-                import subprocess
-
-                with tempfile.NamedTemporaryFile(mode="wb", suffix=".jpg", dir=path, delete=not IS_WIN) as tf:
-                    tf.write(img)
-                    f_name = tf.name
-                subprocess.Popen([f_name], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).communicate()
-            finally:
-                GLib.idle_add(self._screenshot_button_box.set_sensitive, True)
-
-    def on_power_action(self, action):
-        self._http_api.send(HttpAPI.Request.POWER, action, lambda resp: log("Power status changed..."))
-
-    def update_signal(self, sig):
-        self._snr_value_label.set_text(sig.get("e2snrdb", "0 dB").strip())
-        self._ber_value_label.set_text(str(sig.get("e2ber", None) or "0").strip())
-        self._agc_value_label.set_text(sig.get("e2acg", "0 %").strip())
-
-    # ************************ EPG **************************** #
-
-    def on_service_changed(self, ref):
-        self._app._wait_dialog.show()
-        self._http_api.send(HttpAPI.Request.EPG, quote(ref), self.update_epg_data)
-
-    @run_idle
-    def update_epg_data(self, epg):
-        list(map(self._epg_list_box.remove, (r for r in self._epg_list_box)))
-        list(map(lambda e: self._epg_list_box.add(self.EpgRow(e)), epg.get("event_list", [])))
-        self._app._wait_dialog.hide()
-
-    def on_epg_press(self, list_box, event):
-        if event.get_event_type() == Gdk.EventType.DOUBLE_BUTTON_PRESS and len(list_box) > 0:
-            row = list_box.get_selected_row()
-            if row:
-                self.set_timer_from_event_data(row.event_data)
-
-    def on_epg_filter_changed(self, entry):
-        self._epg_list_box.invalidate_filter()
-
-    def epg_filter_function(self, row):
-        txt = self._epg_filter_entry.get_text().upper()
-        return any((not txt, txt in row.time_header.upper(), txt in row.title.upper(), txt in row.desc.upper()))
-
-    def on_timer_add_from_event(self, action, value=None):
-        rows = self._epg_list_box.get_selected_rows()
-        if not rows:
-            self._app.show_error_dialog("No selected item!")
-            return
-
-        refs = []
-        for row in rows:
-            event = row.event_data
-            ref = "timeraddbyeventid?sRef={}&eventid={}&justplay=0".format(event.get("e2eventservicereference", ""),
-                                                                           event.get("e2eventid", ""))
-            refs.append(ref)
-
-        gen = self.write_timers_list(refs)
-        GLib.idle_add(lambda: next(gen, False))
-
-    def write_timers_list(self, refs):
-        self._app._wait_dialog.show()
-        tasks = list(refs)
-        for ref in refs:
-            self._http_api.send(HttpAPI.Request.TIMER, ref, lambda x: tasks.pop())
-            yield True
-
-        while tasks:
-            yield True
-
-        self._stack.set_visible_child_name(self.Tool.TIMERS.value)
-
-    # *********************** Timers *************************** #
-
-    def on_timers_press(self, list_box, event):
-        if event.get_event_type() == Gdk.EventType.DOUBLE_BUTTON_PRESS and len(list_box) > 0:
-            self.on_timer_edit()
-
-    def update_timer_list(self):
-        self._app._wait_dialog.show()
-        self._http_api.send(HttpAPI.Request.TIMER_LIST, "", self.update_timers_data)
-
-    @run_idle
-    def update_timers_data(self, timers):
-        list(map(self._timers_list_box.remove, (r for r in self._timers_list_box)))
-        list(map(lambda t: self._timers_list_box.add(self.TimerRow(t)), timers.get("timer_list", [])))
-        self._timer_remove_button.set_visible(len(self._timers_list_box))
-        self._app._wait_dialog.hide()
-
-    def on_timer_add(self, action=None, value=None):
-        self._timer_action = self.TimerAction.ADD
-        date = datetime.now()
-        self.set_begins_date(date)
-        self.set_ends_date(date)
-        self._timer_event_id_entry.set_text("")
-        self._timer_location_switch.set_active(False)
-        self.set_repetition_flags(0)
-        self._stack.set_visible_child_name(self.Tool.TIMER.value)
-
-    def on_timer_remove(self, action, value=None):
-        rows = self._timers_list_box.get_selected_rows()
-        if not rows or show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
-            return
-
-        refs = {}
-        for row in rows:
-            timer = row.timer
-            ref = "timerdelete?sRef={}&begin={}&end={}".format(quote(timer.get("e2servicereference", "")),
-                                                               timer.get("e2timebegin", ""),
-                                                               timer.get("e2timeend", ""))
-            refs[ref] = row
-
-        self._app._wait_dialog.show("Deleting data...")
-        gen = self.remove_timers(refs)
-        GLib.idle_add(lambda: next(gen, False))
-
-    def remove_timers(self, refs):
-        tasks = list(refs)
-        removed = set()
-        for ref in refs:
-            yield from self.remove_timer(ref, removed, tasks)
-
-        while tasks:
-            yield True
-
-        list(map(self._timers_list_box.remove, (refs[ref] for ref in refs if ref in removed)))
-        self._app._wait_dialog.hide()
-        self._timer_remove_button.set_visible(len(self._timers_list_box))
-        yield True
-
-    def remove_timer(self, ref, removed, tasks=None):
-        def callback(resp):
-            if resp.get("e2state", "") == "True":
-                log(resp.get("e2statetext", ""))
-                removed.add(ref)
-            else:
-                log(resp.get("e2statetext", None) or "Timer deletion error.")
-            if tasks:
-                tasks.pop()
-
-        self._http_api.send(HttpAPI.Request.TIMER, ref, callback)
-        yield True
-
-    def on_timer_edit(self, action=None, value=None):
-        row = self._timers_list_box.get_selected_row()
-        if row:
-            self._timer_action = self.TimerAction.CHANGE
-
-            timer = row.timer
-            self._current_timer = timer
-            self._timer_name_entry.set_text(timer.get("e2name", ""))
-            self._timer_desc_entry.set_text(timer.get("e2description", "") or "")
-            self._timer_service_entry.set_text(timer.get("e2servicename", "") or "")
-            self._timer_service_ref_entry.set_text(timer.get("e2servicereference", ""))
-            self._timer_event_id_entry.set_text(timer.get("e2eit", ""))
-            self._timer_enabled_switch.set_active((timer.get("e2disabled", "0") == "0"))
-            self._timer_action_combo_box.set_active_id(timer.get("e2justplay", "0"))
-            self._timer_after_combo_box.set_active_id(timer.get("e2afterevent", "0"))
-            self.set_time_data(int(timer.get("e2timebegin", "0")), int(timer.get("e2timeend", "0")))
-            location = timer.get("e2location", "")
-            self._timer_location_entry.set_text("" if location == "None" else location)
-            # Days
-            self.set_repetition_flags(int(timer.get("e2repeated", "0")))
-            self._stack.set_visible_child_name(self.Tool.TIMER.value)
-
-    def on_timer_save(self, action, value=None):
-        args = []
-        t_data = self.get_timer_data()
-        s_ref = quote(t_data.get("sRef", ""))
-
-        if self._timer_action is self.TimerAction.EVENT:
-            args.append("timeraddbyeventid?sRef={}".format(s_ref))
-            args.append("eventid={}".format(t_data.get("eit", "0")))
-            args.append("justplay={}".format(t_data.get("justplay", "")))
-            args.append("tags={}".format(""))
-        else:
-            if self._timer_action is self.TimerAction.ADD:
-                args.append("timeradd?sRef={}".format(s_ref))
-                args.append("deleteOldOnSave={}".format(0))
-            elif self._timer_action is self.TimerAction.CHANGE:
-                args.append("timerchange?sRef={}".format(s_ref))
-                args.append("channelOld={}".format(s_ref))
-                args.append("beginOld={}".format(self._current_timer.get("e2timebegin", "0")))
-                args.append("endOld={}".format(self._current_timer.get("e2timeend", "0")))
-                args.append("deleteOldOnSave={}".format(1))
-
-            args.append("begin={}".format(t_data.get("begin", "")))
-            args.append("end={}".format(t_data.get("end", "")))
-            args.append("name={}".format(quote(t_data.get("name", ""))))
-            args.append("description={}".format(quote(t_data.get("description", ""))))
-            args.append("tags={}".format(""))
-            args.append("eit={}".format("0"))
-            args.append("disabled={}".format(t_data.get("disabled", "1")))
-            args.append("justplay={}".format(t_data.get("justplay", "1")))
-            args.append("afterevent={}".format(t_data.get("afterevent", "0")))
-            args.append("repeated={}".format(self.get_repetition_flags()))
-
-            if self._timer_location_switch.get_active():
-                args.append("dirname={}".format(self._timer_location_entry.get_text()))
-
-        self._http_api.send(HttpAPI.Request.TIMER, "&".join(args), self.timer_add_edit_callback)
-
-    @run_idle
-    def timer_add_edit_callback(self, resp):
-        if "error_code" in resp:
-            msg = "Error getting timer status.\n{}".format(resp.get("error_code"))
-            self._app.show_error_dialog(msg)
-            log(msg)
-            return
-
-        state = resp.get("e2state", None)
-        if state == "False":
-            msg = resp.get("e2statetext", "")
-            self._app.show_error_dialog(msg)
-            log(msg)
-        if state == "True":
-            log(resp.get("e2statetext", ""))
-            self._stack.set_visible_child_name(self._last_tool.value)
-        else:
-            log("Error getting timer status. No response!")
-
-    def on_timer_cancel(self, action, value=None):
-        self._stack.set_visible_child_name(self._last_tool.value)
-
-    def on_timer_begins_set(self, action, value=None):
-        self.set_begins_date(self.get_begins_date())
-
-    def on_timer_ends_set(self, action, value=None):
-        self.set_ends_date(self.get_ends_date())
-
-    def get_begins_date(self):
-        date = self._timer_begins_calendar.get_date()
-        return datetime(year=date.year, month=date.month + 1, day=date.day,
-                        hour=int(self._timer_begins_hr_button.get_value()),
-                        minute=int(self._timer_begins_min_button.get_value()))
-
-    def set_begins_date(self, date):
-        hour = date.hour
-        minute = date.minute
-        self._timer_begins_hr_button.set_value(hour)
-        self._timer_begins_min_button.set_value(minute)
-        self._timer_begins_calendar.select_day(date.day)
-        self._timer_begins_calendar.select_month(date.month - 1, date.year)
-        self._timer_begins_entry.set_text("{}-{}-{} {}:{:02d}".format(date.year, date.month, date.day, hour, minute))
-
-    def get_ends_date(self):
-        date = self._timer_ends_calendar.get_date()
-        return datetime(year=date.year, month=date.month + 1, day=date.day,
-                        hour=int(self._timer_ends_hr_button.get_value()),
-                        minute=int(self._timer_ends_min_button.get_value()))
-
-    def set_ends_date(self, date):
-        hour = date.hour
-        minute = date.minute
-        self._timer_ends_hr_button.set_value(hour)
-        self._timer_ends_min_button.set_value(minute)
-        self._timer_ends_calendar.select_day(date.day)
-        self._timer_ends_calendar.select_month(date.month - 1, date.year)
-        self._timer_ends_entry.set_text("{}-{}-{} {}:{:02d}".format(date.year, date.month, date.day, hour, minute))
-
-    def set_timer_from_event_data(self, timer):
-        self._stack.set_visible_child_name(self.Tool.TIMER.value)
-        self._timer_action = self.TimerAction.EVENT
-        self._timer_name_entry.set_text(timer.get("e2eventtitle", ""))
-        self._timer_desc_entry.set_text(timer.get("e2eventdescription", ""))
-        self._timer_service_entry.set_text(timer.get("e2eventservicename", ""))
-        self._timer_service_ref_entry.set_text(timer.get("e2eventservicereference", ""))
-        self._timer_event_id_entry.set_text(timer.get("e2eventid", ""))
-        self._timer_action_combo_box.set_active_id("1")
-        self._timer_after_combo_box.set_active_id("3")
-        start_time = int(timer.get("e2eventstart", "0"))
-        self.set_time_data(start_time, start_time + int(timer.get("e2eventduration", "0")))
-
-    def set_time_data(self, start_time, end_time):
-        """ Sets values for time widgets. """
-        ev_time_start = datetime.fromtimestamp(start_time) or datetime.now()
-        ev_time_end = datetime.fromtimestamp(end_time) or datetime.now()
-        self._timer_begins_entry.set_text(ev_time_start.strftime(self._TIME_STR))
-        self._timer_ends_entry.set_text(ev_time_end.strftime(self._TIME_STR))
-        self._timer_begins_calendar.select_day(ev_time_start.day)
-        self._timer_begins_calendar.select_month(ev_time_start.month - 1, ev_time_start.year)
-        self._timer_ends_calendar.select_day(ev_time_end.day)
-        self._timer_ends_calendar.select_month(ev_time_end.month - 1, ev_time_end.year)
-        self._timer_begins_hr_button.set_value(ev_time_start.hour)
-        self._timer_begins_min_button.set_value(ev_time_start.minute)
-        self._timer_ends_hr_button.set_value(ev_time_end.hour)
-        self._timer_ends_min_button.set_value(ev_time_end.minute)
-
-    def get_timer_data(self):
-        """ Returns timer data as a dict. """
-        return {"sRef": self._timer_service_ref_entry.get_text(),
-                "begin": int(datetime.strptime(self._timer_begins_entry.get_text(), self._TIME_STR).timestamp()),
-                "end": int(datetime.strptime(self._timer_ends_entry.get_text(), self._TIME_STR).timestamp()),
-                "name": self._timer_name_entry.get_text(),
-                "description": self._timer_desc_entry.get_text(),
-                "dirname": "",
-                "eit": self._timer_event_id_entry.get_text(),
-                "disabled": int(not self._timer_enabled_switch.get_active()),
-                "justplay": self._timer_action_combo_box.get_active_id(),
-                "afterevent": self._timer_after_combo_box.get_active_id(),
-                "repeated": self.get_repetition_flags()}
-
-    def get_repetition_flags(self):
-        """ Returns flags for repetition. """
-        day_flags = 0
-        for i, box in enumerate((self._timer_mo_check_button,
-                                 self._timer_tu_check_button,
-                                 self._timer_we_check_button,
-                                 self._timer_th_check_button,
-                                 self._timer_fr_check_button,
-                                 self._timer_sa_check_button,
-                                 self._timer_su_check_button)):
-
-            if box.get_active():
-                day_flags = day_flags | (1 << i)
-
-        return day_flags
-
-    def set_repetition_flags(self, flags):
-        for i, box in enumerate((self._timer_mo_check_button,
-                                 self._timer_tu_check_button,
-                                 self._timer_we_check_button,
-                                 self._timer_th_check_button,
-                                 self._timer_fr_check_button,
-                                 self._timer_sa_check_button,
-                                 self._timer_su_check_button)):
-            box.set_active(flags & 1 == 1)
-            flags = flags >> 1
-
-    # ***************** Drag-and-drop ********************* #
-
-    def on_timers_drag_data_received(self, box, context, x, y, data, info, time):
-        txt = data.get_text()
-        if txt:
-            itr_str, sep, source = txt.partition(self._app.DRAG_SEP)
-            if not source:
-                return
-
-            itrs = itr_str.split(",")
-            if len(itrs) > 1:
-                self._app.show_error_dialog("Please, select only one item!")
-                return
-
-            fav_id = None
-            if source == self._app.FAV_MODEL_NAME:
-                model = self._app.fav_view.get_model()
-                fav_id = model.get_value(model.get_iter_from_string(itrs[0]), Column.FAV_ID)
-            elif source == self._app.SERVICE_MODEL_NAME:
-                model = self._app.services_view.get_model()
-                fav_id = model.get_value(model.get_iter_from_string(itrs[0]), Column.SRV_FAV_ID)
-
-            service = self._app.current_services.get(fav_id, None)
-            if service:
-                if service.service_type == BqServiceType.ALT.name:
-                    msg = "Alternative service.\n\n {}".format(get_message("Not implemented yet!"))
-                    show_dialog(DialogType.ERROR, transient=self._app._main_window, text=msg)
-                    context.finish(False, False, time)
-                    return
-
-                self._timer_name_entry.set_text(service.service)
-                self._timer_service_entry.set_text(service.service)
-                self._timer_service_ref_entry.set_text(service.picon_id.rstrip(".png").replace("_", ":"))
-                self.on_timer_add()
-            context.finish(True, False, time)
-
-    # *********************** Recordings *************************** #
-
-    def on_recordings_press(self, list_box, event):
-        if event.get_event_type() == Gdk.EventType.DOUBLE_BUTTON_PRESS and len(list_box) > 0:
-            row = list_box.get_selected_row()
-            if row:
-                self._http_api.send(HttpAPI.Request.STREAM_TS,
-                                    row.movie.get("e2filename", ""),
-                                    self.on_play_recording)
-
-    def on_recording_filter_changed(self, entry):
-        self._recordings_list_box.invalidate_filter()
-
-    def recording_filter_function(self, row):
-        txt = self._recordings_filter_entry.get_text().upper()
-        return any((not txt, txt in row.service.upper(), txt in row.title.upper(), txt in row.desc.upper()))
-
-    def on_recording_remove(self, action, value=None):
-        """ Removes recordings via FTP. """
-        if show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
-            return
-
-        rows = self._recordings_list_box.get_selected_rows()
-        if rows:
-            settings = self._app._settings
-
-            with UtfFTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
-                ftp.encoding = "utf-8"
-                for r in rows:
-                    resp = ftp.delete_file(r.file)
-                    if resp.startswith("2"):
-                        GLib.idle_add(self._recordings_list_box.remove, r)
-                    else:
-                        show_dialog(DialogType.ERROR, transient=self._app._main_window, text=resp)
-                        break
-
-    def on_recordings_dir_changed(self, box: Gtk.ComboBoxText):
-        self._http_api.send(HttpAPI.Request.RECORDINGS, quote(box.get_active_id()), self.update_recordings_data)
-
-    def update_recordings_list(self):
-        if not len(self._recordings_dir_box.get_model()):
-            self._http_api.send(HttpAPI.Request.REC_CURRENT, "", self.update_current_rec_dir)
-
-    def update_current_rec_dir(self, current):
-        cur = current.get("e2location", None)
-        if cur:
-            self._recordings_dir_box.append(cur, cur)
-            self._http_api.send(HttpAPI.Request.REC_DIRS, "", self.update_rec_dirs)
-
-    def update_rec_dirs(self, dirs):
-        for d in dirs.get("rec_dirs", []):
-            self._recordings_dir_box.append(d, d)
-
-    @run_idle
-    def update_recordings_data(self, recordings):
-        list(map(self._recordings_list_box.remove, (r for r in self._recordings_list_box)))
-        list(map(lambda r: self._recordings_list_box.add(self.RecordingsRow(r)), recordings.get("recordings", [])))
-
-    def on_play_recording(self, m3u):
-        url = self._app.get_url_from_m3u(m3u)
-        if url:
-            self._app.play(url)

app/ui/dialogs.glade

@@ -3,7 +3,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2020 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
@@ -30,8 +30,8 @@ Author: Dmitriy Yefremov
   <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
+  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkAboutDialog" id="about_dialog">
     <property name="can_focus">False</property>
@@ -40,18 +40,17 @@ 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">1.0.10 Alpha</property>
-    <property name="copyright">2018-2021 Dmitriy Yefremov
-    </property>
-    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor for MS Windows.
-      (Experimental)</property>
-    <property name="website">https://github.com/DYefremov/DemonEditor/tree/experimental-win</property>
+    <property name="version">1.0.0 Alpha</property>
+    <property name="copyright">2018-2020 Dmitriy Yefremov
+</property>
+    <property name="comments" translatable="yes">Enigma2 channel and satellites list editor for GNU/Linux</property>
+    <property name="website">https://dyefremov.github.io/DemonEditor/</property>
     <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
-      Подробнее в &lt;a href="http://opensource.org/licenses/mit-license.php"&gt;The MIT License (MIT)&lt;/a&gt;.</property>
+Подробнее в &lt;a href="http://opensource.org/licenses/mit-license.php"&gt;The MIT License (MIT)&lt;/a&gt;.</property>
     <property name="authors">Dmitriy Yefremov
-    </property>
+</property>
     <property name="translator_credits" translatable="yes">translator-credits</property>
-    <property name="artists">Program logo: &lt;a href="http://ihad.tv"&gt;mfgeg&lt;/a&gt;</property>
+    <property name="artists">Program logo: &lt;a href="http://ihad.tv"&gt; mfgeg&lt;/a&gt;</property>
     <property name="logo_icon_name">demon-editor</property>
     <property name="wrap_license">True</property>
     <property name="license_type">mit-x11</property>
@@ -66,9 +65,7 @@ Author: Dmitriy Yefremov
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="aboutdialog_action_area">
             <property name="can_focus">False</property>
-            <property name="margin_left">50</property>
-            <property name="margin_right">50</property>
-            <property name="layout_style">expand</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -89,62 +86,36 @@ Author: Dmitriy Yefremov
     <property name="window_position">center</property>
     <property name="default_width">320</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">utility</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <child type="titlebar">
-      <placeholder/>
+    <property name="gravity">center</property>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_cancel_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="input_dialog_ok_button">
+        <property name="label">gtk-ok</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <accelerator key="Return" signal="activate"/>
+      </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
-        <property name="margin_left">5</property>
-        <property name="margin_right">5</property>
-        <property name="margin_top">4</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="input_dialog_cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="input_dialog_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="width_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-                <accelerator key="Return" signal="activate"/>
-              </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">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkEntry" id="input_entry">
             <property name="visible">True</property>
@@ -153,7 +124,7 @@ Author: Dmitriy Yefremov
             <property name="margin_right">2</property>
             <property name="margin_top">2</property>
             <property name="margin_bottom">2</property>
-
+            <property name="primary_icon_stock">gtk-edit</property>
             <property name="primary_icon_activatable">False</property>
             <property name="secondary_icon_activatable">False</property>
             <property name="secondary_icon_sensitive">False</property>
@@ -161,7 +132,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -171,7 +142,7 @@ Author: Dmitriy Yefremov
       <action-widget response="ok">input_dialog_ok_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="wait_dialog">
+  <object class="GtkDialog" id="wait_dialog">
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -182,45 +153,69 @@ Author: Dmitriy Yefremov
     <property name="skip_pager_hint">True</property>
     <property name="decorated">False</property>
     <child>
-      <object class="GtkBox" id="wait_dialog_box">
-        <property name="width_request">100</property>
-        <property name="visible">True</property>
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="wait_dialog_vbox">
+        <property name="width_request">120</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSpinner" id="spinner">
-            <property name="width_request">150</property>
-            <property name="height_request">45</property>
-            <property name="visible">True</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="can_focus">False</property>
-            <property name="active">True</property>
+            <property name="opacity">0</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="wait_dialog_label">
+          <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="label" translatable="yes">Loading data...</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkSpinner" id="spinner">
+                <property name="width_request">150</property>
+                <property name="height_request">45</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">True</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="wait_dialog_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">10</property>
+                <property name="margin_right">10</property>
+                <property name="label" translatable="yes">Loading data...</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <style>
+          <class name="app-notification"/>
+        </style>
       </object>
-    </child>                          <!-- NOP -->
-    <style>
-      <class name="app-notification"/>
-    </style>
+    </child>
   </object>
 </interface>

app/ui/dialogs.py

@@ -1,40 +1,9 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
 """ Common module for showing dialogs """
-import gettext
+import locale
 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
 from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN, IS_GNOME_SESSION
 
 
@@ -47,11 +16,12 @@ class Dialog(Enum):
         <property name="use-header-bar">{use_header}</property>
         <property name="can_focus">False</property>
         <property name="modal">True</property>
-        <property name="width_request">250</property>
+        <property name="default_width">320</property>
         <property name="destroy_with_parent">True</property>
         <property name="type_hint">dialog</property>
         <property name="skip_taskbar_hint">True</property>
         <property name="skip_pager_hint">True</property>
+        <property name="gravity">center</property>
         <property name="message_type">{message_type}</property>
         <property name="buttons">{buttons_type}</property>
       </object>
@@ -102,13 +72,12 @@ class WaitDialog:
         self._dialog.destroy()
 
 
-def show_dialog(dialog_type, transient, text=None, settings=None, action_type=None, file_filter=None, buttons=None,
-                title=None, create_dir=False):
-    """ Shows dialogs by name. """
+def show_dialog(dialog_type: DialogType, transient, text=None, settings=None, action_type=None, file_filter=None):
+    """ Shows dialogs by name """
     if dialog_type in (DialogType.INFO, DialogType.ERROR):
         return get_message_dialog(transient, dialog_type, Gtk.ButtonsType.OK, text)
     elif dialog_type is DialogType.CHOOSER and settings:
-        return get_file_chooser_dialog(transient, text, settings, action_type, file_filter, buttons, title, create_dir)
+        return get_file_chooser_dialog(transient, text, settings, action_type, file_filter)
     elif dialog_type is DialogType.INPUT:
         return get_input_dialog(transient, text)
     elif dialog_type is DialogType.QUESTION:
@@ -118,7 +87,7 @@ def show_dialog(dialog_type, transient, text=None, settings=None, action_type=No
         return get_about_dialog(transient)
 
 
-def get_chooser_dialog(transient, settings, name, patterns, title=None):
+def get_chooser_dialog(transient, settings, name, patterns):
     file_filter = Gtk.FileFilter()
     file_filter.set_name(name)
     for p in patterns:
@@ -128,30 +97,26 @@ def get_chooser_dialog(transient, settings, name, patterns, title=None):
                        transient=transient,
                        settings=settings,
                        action_type=Gtk.FileChooserAction.OPEN,
-                       file_filter=file_filter,
-                       title=title)
+                       file_filter=file_filter)
 
 
-def get_file_chooser_dialog(transient, text, settings, action_type, file_filter, buttons=None, title=None, dirs=False):
-    text = get_message(text) if text else ""
-    action_type = Gtk.FileChooserAction.SELECT_FOLDER if action_type is None else action_type
-    buttons = buttons or (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
-    dialog = Gtk.FileChooserDialog(text, transient, action_type, buttons, use_header_bar=IS_GNOME_SESSION)
-    dialog.set_title(get_message(title) if title else "")
-    dialog.set_create_folders(dirs)
-
+def get_file_chooser_dialog(transient, text, settings, action_type, file_filter):
+    dialog = Gtk.FileChooserDialog(get_message(text) if text else "", transient,
+                                   action_type if action_type is not None else Gtk.FileChooserAction.SELECT_FOLDER,
+                                   (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK),
+                                   use_header_bar=IS_GNOME_SESSION)
     if file_filter is not None:
         dialog.add_filter(file_filter)
 
-    dialog.set_current_folder(settings.data_local_path)
+    path = settings.data_local_path
+    dialog.set_current_folder(path)
     response = dialog.run()
-
-    if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
-        path = Path(dialog.get_filename() or dialog.get_current_folder())
-        if path.is_dir():
-            response = "{}{}".format(path.resolve(), SEP)
-        elif path.is_file():
-            response = str(path.resolve())
+    if response == Gtk.ResponseType.OK:
+        if dialog.get_filename():
+            path = dialog.get_filename()
+            if action_type is not Gtk.FileChooserAction.OPEN:
+                path = path + "/"
+            response = path
     dialog.destroy()
 
     return response
@@ -205,52 +170,13 @@ def get_dialog_from_xml(dialog_type, transient, use_header=0, title=""):
 
 def get_message(message):
     """ returns translated message """
-    return gettext.dgettext(TEXT_DOMAIN, message)
+    return locale.dgettext(TEXT_DOMAIN, message)
 
 
 @lru_cache(maxsize=5)
-def get_dialogs_string(path, tag="property"):
-    if IS_WIN:
-        return translate_xml(path, tag)
-    else:
-        with open(path, "r", encoding="utf-8") as f:
-            return "".join(f)
-
-
-def get_builder(path, handlers=None, use_str=False, objects=None, tag="property"):
-    """ Creates and returns a Gtk.Builder instance. """
-    builder = Gtk.Builder()
-    builder.set_translation_domain(TEXT_DOMAIN)
-
-    if use_str:
-        if objects:
-            builder.add_objects_from_string(get_dialogs_string(path, tag).format(use_header=IS_GNOME_SESSION), objects)
-        else:
-            builder.add_from_string(get_dialogs_string(path, tag).format(use_header=IS_GNOME_SESSION))
-    else:
-        if objects:
-            builder.add_objects_from_string(get_dialogs_string(path, tag), objects)
-        else:
-            builder.add_from_string(get_dialogs_string(path, tag))
-
-    builder.connect_signals(handlers or {})
-
-    return builder
-
-
-def translate_xml(path, tag="property"):
-    """
-        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":
-            e.text = get_message(e.text)
-
-    return ET.tostring(root, encoding="unicode", method="xml")
+def get_dialogs_string(path):
+    with open(path, "r") as f:
+        return "".join(f)
 
 
 if __name__ == "__main__":

app/ui/download_dialog.glade

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.22.1 
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2020 Dmitriy Yefremov
+Copyright (c) 2018 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
@@ -30,55 +30,248 @@ Author: Dmitriy Yefremov
   <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
-  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
+  <!-- interface-copyright 2018 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="download_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-receive-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="send_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-transmit-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkWindow" id="download_dialog_window">
-    <property name="width_request">550</property>
+    <property name="width_request">500</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">FTP-transfer</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="icon_name">mail-send-receive</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="gravity">center</property>
     <child type="titlebar">
-      <placeholder/>
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">FTP-transfer</property>
+        <property name="spacing">5</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkBox" id="header_left_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="receive_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Receive</property>
+                <signal name="clicked" handler="on_receive" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="receive_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-goto-bottom</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="send_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Send</property>
+                <signal name="clicked" handler="on_send" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="send_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-goto-top</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="options_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Options</property>
+            <signal name="clicked" handler="on_settings" swapped="no"/>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-properties</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
     </child>
     <child>
       <object class="GtkBox" id="main_dialog_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">1</property>
+        <property name="margin_right">1</property>
+        <property name="margin_bottom">1</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkBox" id="selection_data_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="margin_top">10</property>
+            <property name="margin_bottom">5</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="all_radio_button">
+                <property name="label" translatable="yes">All</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">satellites_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="bouquets_radio_button">
+                <property name="label" translatable="yes">Bouquets</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">satellites_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="satellites_radio_button">
+                <property name="label" translatable="yes">Satellites</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">all_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="webtv_radio_button">
+                <property name="label" translatable="yes">WebTV</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">all_radio_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</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">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Profile:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="profile_combo_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="focus_on_click">False</property>
+                <property name="active">0</property>
+                <property name="has_frame">False</property>
+                <signal name="changed" handler="on_profile_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkFrame" id="main_settings_box_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">5</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="label_xalign">0.019999999552965164</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkBox" id="main_settings_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">10</property>
-                <property name="margin_right">10</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>
@@ -231,97 +424,149 @@ Author: Dmitriy Yefremov
           </packing>
         </child>
         <child>
-          <object class="GtkFrame">
+          <object class="GtkFrame" id="settings_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="label_xalign">0</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="label_xalign">0.019999999552965164</property>
             <property name="shadow_type">in</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkGrid" id="settings_grid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="row_spacing">2</property>
+                <property name="column_spacing">2</property>
                 <child>
-                  <object class="GtkBox" id="selection_data_box">
+                  <object class="GtkLabel" id="login_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="margin_top">10</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="label10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="all_radio_button">
-                        <property name="label" translatable="yes">All</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">satellites_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="bouquets_radio_button">
-                        <property name="label" translatable="yes">Bouquets</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">satellites_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="satellites_radio_button">
-                        <property name="label" translatable="yes">Satellites</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">all_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="webtv_radio_button">
-                        <property name="label" translatable="yes">WebTV</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">all_radio_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Login:</property>
+                    <property name="xalign">0.10000000149011612</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="login_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="text">root</property>
+                    <property name="caps_lock_warning">False</property>
+                    <property name="primary_icon_name">avatar-default-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="password_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Password:</property>
+                    <property name="xalign">0.10000000149011612</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="password_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="text">root</property>
+                    <property name="primary_icon_name">emblem-readonly</property>
+                    <property name="input_purpose">password</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="port_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Port:</property>
+                    <property name="xalign">0.10000000149011612</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="port_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="width_chars">8</property>
+                    <property name="max_width_chars">8</property>
+                    <property name="text" translatable="yes">21</property>
+                    <property name="caps_lock_warning">False</property>
+                    <property name="primary_icon_name">network-workgroup-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="timeout_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="width_chars">8</property>
+                    <property name="max_width_chars">8</property>
+                    <property name="caps_lock_warning">False</property>
+                    <property name="primary_icon_name">alarm-symbolic</property>
+                    <property name="input_purpose">digits</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="timeout_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Timeout:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkBox" id="settings_buttons_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkRadioButton" id="ftp_radio_button">
+                    <property name="label" translatable="yes">FTP</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">False</property>
+                    <property name="group">telnet_radio_button</property>
+                    <signal name="toggled" handler="on_settings_button" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -330,55 +575,14 @@ Author: Dmitriy Yefremov
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkRadioButton" id="http_radio_button">
+                    <property name="label" translatable="yes">HTTP</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Profile:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="profile_combo_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="focus_on_click">False</property>
-                        <property name="active">0</property>
-                        <property name="has_frame">False</property>
-                        <signal name="changed" handler="on_profile_changed" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="options_button">
-                        <property name="label" translatable="yes">Options</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Options</property>
-                        <signal name="clicked" handler="on_settings" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">False</property>
+                    <property name="group">telnet_radio_button</property>
+                    <signal name="toggled" handler="on_settings_button" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -386,70 +590,32 @@ Author: Dmitriy Yefremov
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkRadioButton" id="telnet_radio_button">
+                    <property name="label" translatable="yes">Telnet</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">False</property>
+                    <property name="group">ftp_radio_button</property>
+                    <signal name="toggled" handler="on_settings_button" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <style>
+                  <class name="group"/>
+                </style>
               </object>
             </child>
-            <child type="label_item">
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButtonBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="margin_left">20</property>
-            <property name="margin_right">20</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">10</property>
-            <property name="homogeneous">True</property>
-            <property name="layout_style">expand</property>
-            <child>
-              <object class="GtkButton" id="receive_button">
-                <property name="label" translatable="yes">Receive</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Receive</property>
-                <property name="valign">center</property>
-                <property name="image">download_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_receive" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="send_button">
-                <property name="label" translatable="yes">Send</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Send</property>
-                <property name="valign">center</property>
-                <property name="image">send_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_send" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">6</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -488,7 +654,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">7</property>
+            <property name="position">4</property>
           </packing>
         </child>
         <child>
@@ -544,10 +710,20 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">8</property>
+            <property name="position">5</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="settings_size_group">
+    <widgets>
+      <widget name="ftp_radio_button"/>
+      <widget name="http_radio_button"/>
+      <widget name="telnet_radio_button"/>
+    </widgets>
+  </object>
 </interface>

app/ui/download_dialog.py

@@ -8,7 +8,7 @@ from app.settings import SettingsType
 from app.ui.backup import backup_data, restore_data
 from app.ui.main_helper import append_text_to_tview
 from app.ui.settings_dialog import show_settings_dialog
-from .dialogs import show_dialog, DialogType, get_message, get_builder
+from .dialogs import show_dialog, DialogType, get_message
 from .uicommons import Gtk, UI_RESOURCES_PATH
 
 
@@ -21,14 +21,18 @@ class DownloadDialog:
 
         handlers = {"on_receive": self.on_receive,
                     "on_send": self.on_send,
+                    "on_settings_button": self.on_settings_button,
                     "on_settings": self.on_settings,
                     "on_profile_changed": self.on_profile_changed,
                     "on_use_http_state_set": self.on_use_http_state_set,
                     "on_remove_unused_bouquets_toggled": self.on_remove_unused_bouquets_toggled,
                     "on_info_bar_close": self.on_info_bar_close}
 
-        builder = get_builder(UI_RESOURCES_PATH + "download_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "download_dialog.glade")
+        builder.connect_signals(handlers)
 
+        self._current_property = "FTP"
         self._dialog_window = builder.get_object("download_dialog_window")
         self._dialog_window.set_transient_for(transient)
         self._info_bar = builder.get_object("info_bar")
@@ -42,6 +46,12 @@ class DownloadDialog:
         self._bouquets_radio_button = builder.get_object("bouquets_radio_button")
         self._satellites_radio_button = builder.get_object("satellites_radio_button")
         self._webtv_radio_button = builder.get_object("webtv_radio_button")
+        self._login_entry = builder.get_object("login_entry")
+        self._password_entry = builder.get_object("password_entry")
+        self._host_entry = builder.get_object("host_entry")
+        self._port_entry = builder.get_object("port_entry")
+        self._timeout_entry = builder.get_object("timeout_entry")
+        self._settings_buttons_box = builder.get_object("settings_buttons_box")
         self._use_http_switch = builder.get_object("use_http_switch")
         self._http_radio_button = builder.get_object("http_radio_button")
         self._use_http_box = builder.get_object("use_http_box")
@@ -61,6 +71,7 @@ class DownloadDialog:
         self._data_path_entry.set_text(self._settings.data_local_path)
         is_enigma = self._s_type is SettingsType.ENIGMA_2
         self._webtv_radio_button.set_visible(not is_enigma)
+        self._http_radio_button.set_visible(is_enigma)
         self._use_http_box.set_visible(is_enigma)
         self._use_http_switch.set_active(is_enigma and self._settings.use_http)
         self._remove_unused_check_button.set_active(self._settings.remove_unused_bouquets)
@@ -93,6 +104,26 @@ class DownloadDialog:
     def destroy(self):
         self._dialog_window.destroy()
 
+    def on_settings_button(self, button):
+        if button.get_active():
+            label = button.get_label()
+            if label == "Telnet":
+                self._login_entry.set_text(self._settings.telnet_user)
+                self._password_entry.set_text(self._settings.telnet_password)
+                self._port_entry.set_text(self._settings.telnet_port)
+                self._timeout_entry.set_text(str(self._settings.telnet_timeout))
+            elif label == "HTTP":
+                self._login_entry.set_text(self._settings.http_user)
+                self._password_entry.set_text(self._settings.http_password)
+                self._port_entry.set_text(self._settings.http_port)
+                self._timeout_entry.set_text(str(self._settings.http_timeout))
+            elif label == "FTP":
+                self._login_entry.set_text(self._settings.user)
+                self._password_entry.set_text(self._settings.password)
+                self._port_entry.set_text(self._settings.port)
+                self._timeout_entry.set_text("")
+            self._current_property = label
+
     def on_settings(self, item):
         response = show_settings_dialog(self._dialog_window, self._settings)
         if response != Gtk.ResponseType.CANCEL:
@@ -101,6 +132,11 @@ class DownloadDialog:
             gen = self._update_settings_callback()
             GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
+            for button in self._settings_buttons_box.get_children():
+                if button.get_active():
+                    self.on_settings_button(button)
+                    break
+
     def on_profile_changed(self, box):
         active = box.get_active_text()
         if active in self._settings.profiles:

app/ui/epg_dialog.glade

@@ -33,18 +33,6 @@ Author: Dmitriy Yefremov
   <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
   <!-- interface-copyright  2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="apply_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-save-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="auto_config_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-select-all-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="bouquet_list_store">
     <columns>
       <!-- column-name num -->
@@ -91,12 +79,6 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="filter_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-find-replace-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkImage" id="insert_link_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -148,12 +130,6 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="save_to_xml_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-save-as-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="services_list_store">
     <columns>
       <!-- column-name service -->
@@ -336,7 +312,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkEntry" id="url_to_xml_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="primary_icon_name">network-transmit-receive-symbolic</property>
+                        <property name="primary_icon_stock">gtk-connect</property>
                         <property name="primary_icon_activatable">False</property>
                       </object>
                       <packing>
@@ -436,8 +412,8 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="text" translatable="yes">/data/epg/</property>
-
-                    <property name="secondary_icon_name">folder-open-symbolic</property>
+                    <property name="primary_icon_stock">gtk-edit</property>
+                    <property name="secondary_icon_stock">gtk-directory</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_tooltip_text" translatable="yes">Select</property>
                     <signal name="icon-press" handler="on_field_icon_press" swapped="no"/>
@@ -466,7 +442,7 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="text" translatable="yes">/etc/enigma2/</property>
-
+                    <property name="primary_icon_stock">gtk-edit</property>
                     <property name="primary_icon_activatable">False</property>
                   </object>
                   <packing>
@@ -583,103 +559,58 @@ Author: Dmitriy Yefremov
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="update_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-synchronizing-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkWindow" id="epg_dialog_window">
     <property name="width_request">480</property>
     <property name="height_request">320</property>
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">EPG</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">480</property>
-    <property name="default_height">320</property>
+    <property name="default_height">240</property>
     <property name="destroy_with_parent">True</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="icon_name">gtk-index</property>
     <property name="skip_pager_hint">True</property>
+    <property name="gravity">center</property>
     <signal name="check-resize" handler="on_resize" swapped="no"/>
     <signal name="delete-event" handler="on_close_dialog" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="main_box">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">1</property>
-        <property name="margin_right">1</property>
-        <property name="margin_bottom">1</property>
-        <property name="orientation">vertical</property>
+        <property name="title" translatable="yes">EPG</property>
+        <property name="subtitle" translatable="yes">List configuration</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
         <child>
-          <object class="GtkBox" id="main_actions_box">
+          <object class="GtkBox" id="left_header_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <property name="margin_top">10</property>
-            <property name="margin_bottom">10</property>
-            <property name="spacing">10</property>
+            <property name="spacing">2</property>
             <child>
-              <object class="GtkButtonBox" id="left_action_box">
+              <object class="GtkButton" id="apply_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Apply</property>
+                <signal name="clicked" handler="on_apply" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="apply_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-apply</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="GtkSeparator">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="layout_style">expand</property>
-                <child>
-                  <object class="GtkButton" id="apply_button">
-                    <property name="label" translatable="yes">Apply</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Apply</property>
-                    <property name="image">apply_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_apply" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="update_button">
-                    <property name="label" translatable="yes">Update</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Update</property>
-                    <property name="image">update_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_update" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToggleButton" id="filter_button">
-                    <property name="label" translatable="yes">Filter</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Filter</property>
-                    <property name="image">filter_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                    <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
-                  </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>
@@ -687,11 +618,20 @@ Author: Dmitriy Yefremov
                 <property name="position">1</property>
               </packing>
             </child>
-            <child type="center">
-              <object class="GtkLabel" id="list_label">
+            <child>
+              <object class="GtkButton" id="update_button">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">List configuration</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Update</property>
+                <signal name="clicked" handler="on_update" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="update_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-refresh</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -700,106 +640,111 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkButtonBox" id="right_action_box">
+              <object class="GtkToggleButton" id="filter_button">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="layout_style">expand</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Filter</property>
+                <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
                 <child>
-                  <object class="GtkButton" id="auto_config_button">
-                    <property name="label" translatable="yes">Auto</property>
+                  <object class="GtkImage" id="filter_button_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Auto configuration by service names.</property>
-                    <property name="image">auto_config_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_auto_configuration" swapped="no"/>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-spell-check</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
+                <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="right_header_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkButton" id="auto_config_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Auto configuration by service names.</property>
+                <signal name="clicked" handler="on_auto_configuration" swapped="no"/>
                 <child>
-                  <object class="GtkButton" id="save_to_xml_button">
-                    <property name="label" translatable="yes">Save</property>
+                  <object class="GtkImage" id="auto_config_button_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Save list to xml.</property>
-                    <property name="image">save_to_xml_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_save_to_xml" swapped="no"/>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-find-and-replace</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuButton" id="options_menu_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="direction">none</property>
-                    <property name="popover">options_popover</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="options_button_image">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Options</property>
-                            <property name="icon_name">applications-system-symbolic</property>
-                            <property name="icon_size">1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Options</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="save_to_xml_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Save list to xml.</property>
+                <signal name="clicked" handler="on_save_to_xml" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="save_to_xml_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-save-as</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="GtkMenuButton" id="options_menu_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="direction">none</property>
+                <property name="popover">options_popover</property>
+                <child>
+                  <object class="GtkImage" id="options_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Options</property>
+                    <property name="stock">gtk-properties</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkSearchBar" id="filter_bar">
             <property name="visible">True</property>
@@ -808,7 +753,7 @@ Author: Dmitriy Yefremov
               <object class="GtkSearchEntry" id="filter_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="primary_icon_name">edit-find-replace-symbolic</property>
+                <property name="primary_icon_name">tools-check-spelling</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">False</property>
                 <signal name="search-changed" handler="on_filter_changed" swapped="no"/>
@@ -917,14 +862,13 @@ Author: Dmitriy Yefremov
                     <property name="height_request">24</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_left">2</property>
                     <property name="spacing">2</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">document-properties-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="stock">gtk-properties</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -946,7 +890,6 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkBox" id="source_info_box">
-                        <property name="height_request">26</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
@@ -1200,17 +1143,16 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkBox" id="bouquet_info_bar_box">
-                    <property name="height_request">26</property>
+                    <property name="height_request">24</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_left">2</property>
                     <property name="spacing">2</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">document-properties-symbolic</property>
-                        <property name="icon_size">1</property>
+                        <property name="stock">gtk-properties</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1247,9 +1189,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">2</property>
                         <property name="stock">gtk-index</property>
-                        <property name="icon_size">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>

app/ui/epg_dialog.py

@@ -9,13 +9,13 @@ from urllib.error import HTTPError, URLError
 
 from gi.repository import GLib
 
-from app.commons import run_idle, run_task
+from app.commons import run_idle
 from app.connections import download_data, DownloadType
 from app.eparser.ecommons import BouquetService, BqServiceType
 from app.tools.epg import EPG, ChannelsParser
-from app.ui.dialogs import get_message, show_dialog, DialogType, get_builder
+from app.ui.dialogs import get_message, show_dialog, DialogType
 from .main_helper import on_popup_menu, update_entry_data
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, Column, EPG_ICON, KeyboardKey
 
 
 class RefsSource(Enum):
@@ -67,7 +67,10 @@ class EpgDialog:
         self._show_tooltips = True
         self._download_xml_is_active = False
 
-        builder = get_builder(UI_RESOURCES_PATH + "epg_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_from_file(UI_RESOURCES_PATH + "epg_dialog.glade")
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("epg_dialog_window")
         self._dialog.set_transient_for(transient)
@@ -183,7 +186,7 @@ class EpgDialog:
 
     def init_bouquet_data(self):
         for r in self._ex_fav_model:
-            row = list(r[:])
+            row = [*r[:]]
             fav_id = r[Column.FAV_ID]
             self._services[fav_id] = self._ex_services[fav_id].fav_id
             yield self._bouquet_model.append(row)
@@ -276,7 +279,7 @@ class EpgDialog:
         if not KeyboardKey.value_exist(key_code):
             return
         key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
+        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK
 
         if ctrl and key is KeyboardKey.C:
             self.on_copy_ref()
@@ -536,7 +539,6 @@ class EpgDialog:
 
     # ***************** Downloads *********************#
 
-    @run_task
     def download_epg_from_stb(self):
         """ Download the epg.dat file via ftp from the receiver. """
         download_data(settings=self._settings, download_type=DownloadType.EPG, callback=print)

app/ui/ftp.glade

@@ -1,656 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
-
-The MIT License (MIT)
-
-Copyright (c) 2018-2020 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
-
--->
-<interface domain="demon-editor">
-  <requires lib="gtk+" version="3.16"/>
-  <!-- interface-css-provider-path style.css -->
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellite list editor for GNU/Linux. -->
-  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkListStore" id="bookmarks_list_store">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name url -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkImage" id="file_create_folder_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">folder-new</property>
-  </object>
-  <object class="GtkListStore" id="file_list_store">
-    <columns>
-      <!-- column-name icon -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name size -->
-      <column type="gchararray"/>
-      <!-- column-name date -->
-      <column type="gchararray"/>
-      <!-- column-name type -->
-      <column type="gchararray"/>
-      <!-- column-name extra -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkImage" id="ftp_create_folder_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">folder-new</property>
-  </object>
-  <object class="GtkListStore" id="ftp_list_store">
-    <columns>
-      <!-- column-name icon -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name size -->
-      <column type="gchararray"/>
-      <!-- column-name date -->
-      <column type="gchararray"/>
-      <!-- column-name attr -->
-      <column type="gchararray"/>
-      <!-- column-name extra -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkFrame" id="main_frame">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_left">1</property>
-    <property name="margin_right">1</property>
-    <property name="margin_bottom">1</property>
-    <property name="label_xalign">0</property>
-    <property name="shadow_type">in</property>
-    <child>
-      <object class="GtkBox" id="main_ftp_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkBox" id="ftp_button_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</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="spacing">2</property>
-            <child>
-              <object class="GtkButton" id="connect_button">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Connect</property>
-                <signal name="clicked" handler="on_connect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="connect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-connect</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="disconnect_button">
-                <property name="can_focus">False</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Disconnect</property>
-                <signal name="clicked" handler="on_disconnect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="disconnect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-disconnect</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="GtkComboBox" id="bookmark_button">
-                <property name="can_focus">False</property>
-                <property name="model">bookmarks_list_store</property>
-                <property name="id_column">0</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>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkPaned" id="paned">
-            <property name="width_request">320</property>
-            <property name="height_request">240</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</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="wide_handle">True</property>
-            <child>
-              <object class="GtkBox" id="ftp_bpx">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">2</property>
-                <child>
-                  <object class="GtkBox" id="ftp_info_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="ftp_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">FTP:</property>
-                        <attributes>
-                          <attribute name="weight" value="semibold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="ftp_info_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="ellipsize">end</property>
-                        <property name="max_width_chars">75</property>
-                        <property name="yalign">1</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>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="ftp_view_scrolled_window">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_height">100</property>
-                    <child>
-                      <object class="GtkTreeView" id="ftp_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">ftp_list_store</property>
-                        <property name="search_column">1</property>
-                        <property name="rubber_banding">True</property>
-                        <signal name="button-press-event" handler="on_view_popup_menu" object="ftp_popup_menu" swapped="no"/>
-                        <signal name="button-press-event" handler="on_view_press" swapped="no"/>
-                        <signal name="button-release-event" handler="on_view_release" swapped="no"/>
-                        <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
-                        <signal name="drag-data-get" handler="on_ftp_drag_data_get" swapped="no"/>
-                        <signal name="drag-data-received" handler="on_ftp_drag_data_received" swapped="no"/>
-                        <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
-                        <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                        <signal name="row-activated" handler="on_ftp_row_activated" swapped="no"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="ftp_selection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_name_column">
-                            <property name="resizable">True</property>
-                            <property name="min_width">100</property>
-                            <property name="title" translatable="yes">Name</property>
-                            <property name="expand">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">1</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="ftp_icon_column_renderer">
-                                <property name="xalign">0.019999999552965164</property>
-                              </object>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_name_column_renderer">
-                                <property name="xalign">0.019999999552965164</property>
-                                <property name="ellipsize">end</property>
-                                <signal name="edited" handler="on_ftp_edited" swapped="no"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_size_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Size</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_size_column_renderer">
-                                <property name="xalign">0.94999998807907104</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_date_column">
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Date</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_date_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_attr_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Attr.</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">4</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_attr_column_renderer">
-                                <property name="xalign">0.50999999046325684</property>
-                                <property name="ellipsize">end</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="ftp_extra_column">
-                            <property name="visible">False</property>
-                            <property name="title" translatable="yes">Extra</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="ftp_extra_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">5</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="file_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">2</property>
-                <child>
-                  <object class="GtkBox" id="pc_info_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="pc_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">10</property>
-                        <property name="label" translatable="yes">PC:</property>
-                        <attributes>
-                          <attribute name="weight" value="semibold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="pc_info_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="ellipsize">end</property>
-                        <property name="max_width_chars">75</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="file_view_scrolled_window">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <property name="min_content_height">100</property>
-                    <child>
-                      <object class="GtkTreeView" id="file_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="model">file_list_store</property>
-                        <property name="search_column">1</property>
-                        <property name="rubber_banding">True</property>
-                        <signal name="button-press-event" handler="on_view_popup_menu" object="file_popup_menu" swapped="no"/>
-                        <signal name="button-press-event" handler="on_view_press" swapped="no"/>
-                        <signal name="button-release-event" handler="on_view_release" swapped="no"/>
-                        <signal name="drag-begin" handler="on_view_drag_begin" after="yes" swapped="no"/>
-                        <signal name="drag-data-get" handler="on_file_drag_data_get" swapped="no"/>
-                        <signal name="drag-data-received" handler="on_file_drag_data_received" swapped="no"/>
-                        <signal name="drag-end" handler="on_view_drag_end" swapped="no"/>
-                        <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                        <signal name="row-activated" handler="on_file_row_activated" swapped="no"/>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="file_selection">
-                            <property name="mode">multiple</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_name_column">
-                            <property name="resizable">True</property>
-                            <property name="min_width">100</property>
-                            <property name="title" translatable="yes">Name</property>
-                            <property name="expand">True</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">1</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" id="file_icon_column_renderer">
-                                <property name="xalign">0.20000000298023224</property>
-                              </object>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_name_column_renderer">
-                                <property name="ellipsize">end</property>
-                                <signal name="edited" handler="on_file_edited" swapped="no"/>
-                              </object>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_size_column">
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Size</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_size_column_renderer">
-                                <property name="xalign">0.94999998807907104</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_date_column">
-                            <property name="min_width">75</property>
-                            <property name="title" translatable="yes">Date</property>
-                            <property name="alignment">0.5</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_date_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_type_column">
-                            <property name="visible">False</property>
-                            <property name="sizing">fixed</property>
-                            <property name="min_width">50</property>
-                            <property name="title" translatable="yes">Path</property>
-                            <property name="alignment">0.5</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_path_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" id="file_extra_column">
-                            <property name="visible">False</property>
-                            <property name="title" translatable="yes">Extra</property>
-                            <child>
-                              <object class="GtkCellRendererText" id="file_extra_column_renderer"/>
-                              <attributes>
-                                <attribute name="text">5</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="label_item">
-      <placeholder/>
-    </child>
-  </object>
-  <object class="GtkImage" id="remove_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">list-remove</property>
-  </object>
-  <object class="GtkImage" id="remove_image_2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">list-remove</property>
-  </object>
-  <object class="GtkImage" id="rename_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-edit</property>
-  </object>
-  <object class="GtkMenu" id="ftp_popup_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="ftp_create_folder_menu_item">
-        <property name="label" translatable="yes">Create folder</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">ftp_create_folder_image</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_ftp_create_folder" object="ftp_name_column_renderer" swapped="no"/>
-        <accelerator key="F7" signal="activate"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="ftp_edit_menu_item">
-        <property name="label" translatable="yes">Edit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">rename_image</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_ftp_edit" object="ftp_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-        <accelerator key="F2" signal="activate"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="ftp_remove_menu_item">
-        <property name="label" translatable="yes">Remove</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">remove_image_2</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_ftp_remove" swapped="no"/>
-        <accelerator key="Delete" signal="activate"/>
-      </object>
-    </child>
-  </object>
-  <object class="GtkImage" id="rename_image_2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-edit</property>
-  </object>
-  <object class="GtkMenu" id="file_popup_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="file_create_folder_menu_item">
-        <property name="label" translatable="yes">Create folder</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">file_create_folder_image</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_file_create_folder" object="file_name_column_renderer" swapped="no"/>
-        <accelerator key="F7" signal="activate"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="file_edit_menu_item">
-        <property name="label" translatable="yes">Edit</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">rename_image_2</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_file_edit" object="file_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-        <accelerator key="F2" signal="activate"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="file_remove_menu_item">
-        <property name="label" translatable="yes">Remove</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="image">remove_image</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_file_remove" swapped="no"/>
-        <accelerator key="Delete" signal="activate"/>
-      </object>
-    </child>
-  </object>
-</interface>

app/ui/ftp.py

@@ -1,573 +0,0 @@
-""" Simple FTP client module. """
-import subprocess
-from collections import namedtuple
-from datetime import datetime
-from enum import IntEnum
-from ftplib import all_errors
-from pathlib import Path
-from shutil import rmtree
-from urllib.parse import urlparse, unquote
-
-from gi.repository import GLib
-
-from app.commons import log, run_task, run_idle
-from app.connections import UtfFTP
-from app.settings import IS_WIN, SEP
-from app.ui.dialogs import show_dialog, DialogType, get_builder
-from app.ui.main_helper import on_popup_menu
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
-
-File = namedtuple("File", ["icon", "name", "size", "date", "attr", "extra"])
-
-
-class FtpClientBox(Gtk.HBox):
-    """ Simple FTP client base class. """
-    ROOT = ".."
-    FOLDER = "<Folder>"
-    LINK = "<Link>"
-    MAX_SIZE = 10485760  # 10 MB file limit
-    URI_SEP = "::::"
-
-    class Column(IntEnum):
-        ICON = 0
-        NAME = 1
-        SIZE = 2
-        DATE = 3
-        ATTR = 4
-        EXTRA = 5
-
-    def __init__(self, app, settings, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_spacing(2)
-        self.set_orientation(Gtk.Orientation.VERTICAL)
-
-        self._app = app
-        self._settings = settings
-        self._ftp = None
-        self._select_enabled = True
-
-        handlers = {"on_connect": self.on_connect,
-                    "on_disconnect": self.on_disconnect,
-                    "on_ftp_row_activated": self.on_ftp_row_activated,
-                    "on_file_row_activated": self.on_file_row_activated,
-                    "on_ftp_edit": self.on_ftp_edit,
-                    "on_ftp_edited": self.on_ftp_edited,
-                    "on_file_edit": self.on_file_edit,
-                    "on_file_edited": self.on_file_edited,
-                    "on_file_remove": self.on_file_remove,
-                    "on_ftp_remove": self.on_ftp_file_remove,
-                    "on_file_create_folder": self.on_file_create_folder,
-                    "on_ftp_create_folder": self.on_ftp_create_folder,
-                    "on_view_drag_begin": self.on_view_drag_begin,
-                    "on_ftp_drag_data_get": self.on_ftp_drag_data_get,
-                    "on_ftp_drag_data_received": self.on_ftp_drag_data_received,
-                    "on_file_drag_data_get": self.on_file_drag_data_get,
-                    "on_file_drag_data_received": self.on_file_drag_data_received,
-                    "on_view_drag_end": self.on_view_drag_end,
-                    "on_view_popup_menu": on_popup_menu,
-                    "on_view_key_press": self.on_view_key_press,
-                    "on_view_press": self.on_view_press,
-                    "on_view_release": self.on_view_release}
-
-        builder = get_builder(UI_RESOURCES_PATH + "ftp.glade", handlers)
-
-        self.add(builder.get_object("main_frame"))
-        self._ftp_info_label = builder.get_object("ftp_info_label")
-        self._ftp_view = builder.get_object("ftp_view")
-        self._ftp_model = builder.get_object("ftp_list_store")
-        self._ftp_name_renderer = builder.get_object("ftp_name_column_renderer")
-        self._file_view = builder.get_object("file_view")
-        self._file_model = builder.get_object("file_list_store")
-        self._file_name_renderer = builder.get_object("file_name_column_renderer")
-        # Buttons
-        self._connect_button = builder.get_object("connect_button")
-        disconnect_button = builder.get_object("disconnect_button")
-        disconnect_button.bind_property("visible", builder.get_object("ftp_create_folder_menu_item"), "sensitive")
-        disconnect_button.bind_property("visible", builder.get_object("ftp_edit_menu_item"), "sensitive")
-        disconnect_button.bind_property("visible", builder.get_object("ftp_remove_menu_item"), "sensitive")
-        self._connect_button.bind_property("visible", builder.get_object("disconnect_button"), "visible", 4)
-        # Force Ctrl
-        self._ftp_view.connect("key-press-event", self._app.force_ctrl)
-        self._file_view.connect("key-press-event", self._app.force_ctrl)
-        # Icons
-        theme = Gtk.IconTheme.get_default()
-        folder_icon = "folder-symbolic" if settings.is_darwin else "folder"
-        self._folder_icon = theme.load_icon(folder_icon, 16, 0) if theme.lookup_icon(folder_icon, 16, 0) else None
-        self._link_icon = theme.load_icon("emblem-symbolic-link", 16, 0) if theme.lookup_icon("emblem-symbolic-link",
-                                                                                              16, 0) else None
-        # Initialization
-        self.init_drag_and_drop()
-        self.init_ftp()
-        self.init_file_data()
-        self.show()
-
-    @run_task
-    def init_ftp(self):
-        GLib.idle_add(self._ftp_model.clear)
-        try:
-            if self._ftp:
-                self._ftp.close()
-
-            self._ftp = UtfFTP(host=self._settings.host, user=self._settings.user, passwd=self._settings.password)
-            self._ftp.encoding = "utf-8"
-            self.update_ftp_info(self._ftp.getwelcome())
-        except all_errors as e:
-            self.update_ftp_info(str(e))
-            self.on_disconnect()
-        else:
-            self.init_ftp_data()
-
-    @run_task
-    def init_ftp_data(self, path=None):
-        if not self._ftp:
-            return
-
-        if path:
-            try:
-                self._ftp.cwd(path)
-            except all_errors as e:
-                self.update_ftp_info(str(e))
-
-        files = []
-        try:
-            self._ftp.dir(files.append)
-        except all_errors as e:
-            log(e)
-            self.update_ftp_info(str(e))
-            self.on_disconnect()
-        else:
-            self.append_ftp_data(files)
-            GLib.idle_add(self._connect_button.set_visible, False)
-
-    @run_task
-    def init_file_data(self, path=None):
-        self.append_file_data(Path(path if path else self._settings.data_local_path))
-
-    @run_idle
-    def append_file_data(self, path: Path):
-        self._file_model.clear()
-        self._file_model.append(File(None, self.ROOT, None, None, str(path), "0"))
-
-        try:
-            dirs = [p for p in path.iterdir()]
-        except OSError as e:
-            log(e)
-        else:
-            for p in dirs:
-                is_dir = p.is_dir()
-                st = p.stat()
-                size = str(st.st_size)
-                date = datetime.fromtimestamp(st.st_mtime).strftime("%d-%m-%y %H:%M")
-                icon = None
-                if is_dir:
-                    r_size = self.FOLDER
-                    icon = self._folder_icon
-                elif p.is_symlink():
-                    r_size = self.LINK
-                    icon = self._link_icon
-                else:
-                    r_size = self.get_size_from_bytes(size)
-
-                self._file_model.append(File(icon, p.name, r_size, date, str(p.resolve()), size))
-
-    @run_idle
-    def append_ftp_data(self, files):
-        self._ftp_model.clear()
-        self._ftp_model.append(File(None, self.ROOT, None, None, self._ftp.pwd(), "0"))
-
-        for f in files:
-            f_data = f.split()
-            f_type = f_data[0][0]
-            is_dir = f_type == "d"
-            is_link = f_type == "l"
-            size = f_data[4]
-
-            icon = None
-            if is_dir:
-                r_size = self.FOLDER
-                icon = self._folder_icon
-            elif is_link:
-                r_size = self.LINK
-                icon = self._link_icon
-            else:
-                r_size = self.get_size_from_bytes(size)
-
-            date = "{}, {}  {}".format(f_data[5], f_data[6], f_data[7])
-            self._ftp_model.append(File(icon, " ".join(f_data[8:]), r_size, date, f_data[0], size))
-
-    def on_connect(self, item=None):
-        self.init_ftp()
-
-    def on_disconnect(self, item=None):
-        if self._ftp:
-            self._ftp.close()
-        self._connect_button.set_visible(True)
-        GLib.idle_add(self._ftp_model.clear)
-
-    def on_ftp_row_activated(self, view, path, column):
-        row = self._ftp_model[path][:]
-        f_path = row[self.Column.NAME]
-        size = row[self.Column.SIZE]
-
-        if size == self.FOLDER or f_path == self.ROOT:
-            self.init_ftp_data(f_path)
-        else:
-            b_size = row[self.Column.EXTRA]
-            if b_size.isdigit() and int(b_size) > self.MAX_SIZE:
-                self._app.show_error_dialog("The file size is too large!")
-            else:
-                self.open_ftp_file(f_path)
-
-    def on_file_row_activated(self, view, path, column):
-        row = self._file_model[path][:]
-        path = Path(row[self.Column.ATTR])
-        if row[self.Column.SIZE] == self.FOLDER:
-            self.init_file_data(path)
-        elif row[self.Column.NAME] == self.ROOT:
-            self.init_file_data(path.parent)
-        else:
-            self.open_file(row[self.Column.ATTR])
-
-    @run_task
-    def open_file(self, path):
-        GLib.idle_add(self._file_view.set_sensitive, False)
-        try:
-            cmd = ["start" if IS_WIN else "xdg-open", path]
-            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
-        finally:
-            GLib.idle_add(self._file_view.set_sensitive, True)
-
-    @run_task
-    def open_ftp_file(self, f_path):
-        GLib.idle_add(self._ftp_view.set_sensitive, False)
-
-        try:
-            import tempfile
-            import os
-            path = os.path.expanduser("~/Desktop") if IS_WIN else None
-
-            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=not IS_WIN) as tf:
-                msg = "Downloading file: {}.   Status: {}"
-                try:
-                    status = self._ftp.retrbinary("RETR " + f_path, tf.write)
-                    self.update_ftp_info(msg.format(f_path, status))
-                except all_errors as e:
-                    self.update_ftp_info(msg.format(f_path, e))
-
-                tf.flush()
-                cmd = ["start" if IS_WIN else "xdg-open", tf.name]
-                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
-        finally:
-            GLib.idle_add(self._ftp_view.set_sensitive, True)
-
-    def on_ftp_edit(self, renderer):
-        model, paths = self._ftp_view.get_selection().get_selected_rows()
-        if not paths:
-            return
-
-        if len(paths) > 1:
-            self._app.show_error_dialog("Please, select only one item!")
-            return
-
-        renderer.set_property("editable", True)
-        self._ftp_view.set_cursor(paths, self._ftp_view.get_column(0), True)
-
-    def on_ftp_edited(self, renderer, path, new_value):
-        renderer.set_property("editable", False)
-        row = self._ftp_model[path]
-        old_name = row[self.Column.NAME]
-        if old_name == new_value:
-            return
-
-        resp = self._ftp.rename_file(old_name, new_value)
-        self.update_ftp_info("{}   Status: {}".format(old_name, resp))
-        if resp[0] == "2":
-            row[self.Column.NAME] = new_value
-
-    def on_file_edit(self, renderer):
-        model, paths = self._file_view.get_selection().get_selected_rows()
-        if len(paths) > 1:
-            self._app.show_error_dialog("Please, select only one item!")
-            return
-
-        renderer.set_property("editable", True)
-        self._file_view.set_cursor(paths, self._file_view.get_column(0), True)
-
-    def on_file_edited(self, renderer, path, new_value):
-        renderer.set_property("editable", False)
-        row = self._file_model[path]
-        old_name = row[self.Column.NAME]
-        if old_name == new_value:
-            return
-
-        path = Path(row[self.Column.ATTR])
-        if path.exists():
-            try:
-                new_path = path.rename("{}/{}".format(path.parent, new_value))
-            except ValueError as e:
-                log(e)
-                self._app.show_error_dialog(str(e))
-            else:
-                if new_path.name == new_value:
-                    row[self.Column.NAME] = new_value
-                    row[self.Column.ATTR] = str(new_path.resolve())
-
-    def on_file_remove(self, item=None):
-        if show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
-            return
-
-        model, paths = self._file_view.get_selection().get_selected_rows()
-        to_delete = []
-
-        for path in filter(lambda p: model[p][self.Column.NAME] != self.ROOT, paths):
-            f_path = Path(model[path][self.Column.ATTR])
-            try:
-                rmtree(f_path, ignore_errors=True) if f_path.is_dir() else f_path.unlink()
-            except OSError as e:
-                log(e)
-            else:
-                to_delete.append(model.get_iter(path))
-
-        list(map(model.remove, to_delete))
-
-    def on_ftp_file_remove(self, item=None):
-        if show_dialog(DialogType.QUESTION, self._app._main_window) != Gtk.ResponseType.OK:
-            return
-
-        model, paths = self._ftp_view.get_selection().get_selected_rows()
-        to_delete = []
-
-        for path in filter(lambda p: model[p][self.Column.NAME] != self.ROOT, paths):
-            row = model[path][:]
-            name = row[self.Column.NAME]
-            if row[self.Column.SIZE] == self.FOLDER:
-                resp = self._ftp.delete_dir(name, self.update_ftp_info)
-            else:
-                resp = self._ftp.delete_file(name, self.update_ftp_info)
-
-            if resp[0] == "2":
-                to_delete.append(model.get_iter(path))
-
-        list(map(model.remove, to_delete))
-
-    def on_file_create_folder(self, renderer):
-        itr = self._file_model.get_iter_first()
-        if not itr:
-            return
-
-        name = self.get_new_folder_name(self._file_model)
-        cur_path = self._file_model.get_value(itr, self.Column.ATTR)
-        path = Path("{}/{}".format(cur_path, name))
-
-        try:
-            path.mkdir()
-        except OSError as e:
-            log(e)
-            self._app.show_error_dialog(str(e))
-        else:
-            itr = self._file_model.append(File(self._folder_icon, path.name, self.FOLDER, "", str(path.resolve()), "0"))
-            renderer.set_property("editable", True)
-            self._file_view.set_cursor(self._file_model.get_path(itr), self._file_view.get_column(0), True)
-
-    def on_ftp_create_folder(self, renderer):
-        itr = self._ftp_model.get_iter_first()
-        if not itr:
-            return
-
-        cur_path = self._ftp_model.get_value(itr, self.Column.ATTR)
-        name = self.get_new_folder_name(self._ftp_model)
-
-        try:
-            folder = "{}/{}".format(cur_path, name)
-            resp = self._ftp.mkd(folder)
-        except all_errors as e:
-            self.update_ftp_info(str(e))
-            log(e)
-        else:
-            if resp == "{}/{}".format(cur_path, name):
-                itr = self._ftp_model.append(File(self._folder_icon, name, self.FOLDER, "", "drwxr-xr-x", "0"))
-                renderer.set_property("editable", True)
-                self._ftp_view.set_cursor(self._ftp_model.get_path(itr), self._ftp_view.get_column(0), True)
-
-    def get_new_folder_name(self, model):
-        """ Returns the default name for the newly created folder. """
-        name = "new folder"
-        names = {r[self.Column.NAME] for r in model}
-        count = 0
-        while name in names:
-            count += 1
-            name = "{}{}".format(name, count)
-        return name
-
-    # ***************** Drag-and-drop ********************* #
-
-    def init_drag_and_drop(self):
-        self._ftp_view.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, [], Gdk.DragAction.COPY)
-        self._ftp_view.enable_model_drag_dest([], Gdk.DragAction.DEFAULT | Gdk.DragAction.COPY)
-        self._ftp_view.drag_source_add_uri_targets()
-        self._ftp_view.drag_dest_add_uri_targets()
-
-        self._file_view.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, [], Gdk.DragAction.COPY)
-        self._file_view.enable_model_drag_dest([], Gdk.DragAction.DEFAULT | Gdk.DragAction.COPY)
-        self._file_view.drag_source_add_uri_targets()
-        self._file_view.drag_dest_add_uri_targets()
-
-        self._ftp_view.get_selection().set_select_function(lambda *args: self._select_enabled)
-        self._file_view.get_selection().set_select_function(lambda *args: self._select_enabled)
-
-    def on_view_drag_begin(self, view, context):
-        model, paths = view.get_selection().get_selected_rows()
-        if len(paths) < 1:
-            return
-
-        pix = self._app.get_drag_icon_pixbuf(model, paths, self.Column.NAME, self.Column.SIZE)
-        Gtk.drag_set_icon_pixbuf(context, pix, 0, 0)
-        return True
-
-    def on_ftp_drag_data_get(self, view, context, data, info, time):
-        model, paths = view.get_selection().get_selected_rows()
-        if len(paths) > 0:
-            sep = self.URI_SEP if IS_WIN else "\n"
-            uris = []
-            for r in [model[p][:] for p in paths]:
-                if r[self.Column.SIZE] != self.LINK and r[self.Column.NAME] != self.ROOT:
-                    path = Path("/{}:{}".format(r[self.Column.NAME], r[self.Column.ATTR]))
-                    uris.append(str(path.resolve()) if IS_WIN else path.as_uri())
-            data.set_uris([sep.join(uris)])
-
-    @run_task
-    def on_ftp_drag_data_received(self, view, context, x, y, data: Gtk.SelectionData, info, time):
-        if not self._ftp:
-            return
-
-        resp = "2"
-        try:
-            GLib.idle_add(self._app._wait_dialog.show)
-
-            uris = data.get_uris()
-            if IS_WIN and len(uris) == 1:
-                uris = uris[0].split(self.URI_SEP)
-
-            for uri in uris:
-                uri = urlparse(unquote(uri)).path.strip()
-                path = Path(uri.lstrip("/") if IS_WIN else uri)
-                if path.is_dir():
-                    try:
-                        self._ftp.mkd(path.name)
-                    except all_errors as e:
-                        pass  # NOP
-                    self._ftp.cwd(path.name)
-                    resp = self._ftp.upload_dir(str(path.resolve()) + "/", self.update_ftp_info)
-                else:
-                    resp = self._ftp.send_file(path.name, str(path.parent) + "/", callback=self.update_ftp_info)
-        finally:
-            GLib.idle_add(self._app._wait_dialog.hide)
-            if resp and resp[0] == "2":
-                itr = self._ftp_model.get_iter_first()
-                if itr:
-                    self.init_ftp_data(self._ftp_model.get_value(itr, self.Column.ATTR))
-        Gtk.drag_finish(context, True, False, time)
-        return True
-
-    def on_file_drag_data_get(self, view, context, data: Gtk.SelectionData, info, time):
-        model, paths = view.get_selection().get_selected_rows()
-        if len(paths) > 0:
-            sep = self.URI_SEP if IS_WIN else "\n"
-            uris = [sep.join([Path(model[p][self.Column.ATTR]).as_uri() for p in paths])]
-            data.set_uris(uris)
-
-    @run_task
-    def on_file_drag_data_received(self, view, context, x, y, data, info, time):
-        cur_path = self._file_model.get_value(self._file_model.get_iter_first(), self.Column.ATTR) + SEP
-        try:
-            GLib.idle_add(self._app._wait_dialog.show)
-
-            uris = data.get_uris()
-            if IS_WIN and len(uris) == 1:
-                uris = uris[0].split(self.URI_SEP)
-
-            for uri in uris:
-                name, sep, attr = unquote(Path(uri).name).partition(":")
-                if not attr:
-                    return True
-
-                if attr[0] == "d":
-                    self._ftp.download_dir(name, cur_path, self.update_ftp_info)
-                else:
-                    self._ftp.download_file(name, cur_path, self.update_ftp_info)
-        except OSError as e:
-            log(e)
-        finally:
-            GLib.idle_add(self._app._wait_dialog.hide)
-            self.init_file_data(cur_path)
-
-        Gtk.drag_finish(context, True, False, time)
-        return True
-
-    def on_view_drag_end(self, view, context):
-        self._select_enabled = True
-        view.get_selection().unselect_all()
-
-    @run_idle
-    def update_ftp_info(self, message):
-        message = message.strip()
-        self._ftp_info_label.set_text(message)
-        self._ftp_info_label.set_tooltip_text(message)
-
-    def on_view_key_press(self, view, event):
-        key_code = event.hardware_keycode
-        if not KeyboardKey.value_exist(key_code):
-            return
-
-        key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
-
-        if key is KeyboardKey.F7:
-            if self._ftp_view.is_focus():
-                self.on_ftp_create_folder(self._ftp_name_renderer)
-            elif self._file_view.is_focus():
-                self.on_file_create_folder(self._file_name_renderer)
-        elif key is KeyboardKey.F2 or ctrl and KeyboardKey.R:
-            if self._ftp_view.is_focus():
-                self.on_ftp_edit(self._ftp_name_renderer)
-            elif self._file_view.is_focus():
-                self.on_file_edit(self._file_name_renderer)
-        elif key is KeyboardKey.DELETE:
-            if self._ftp_view.is_focus():
-                self.on_ftp_file_remove()
-            elif self._file_view.is_focus():
-                self.on_file_remove()
-
-    def on_view_press(self, view, event):
-        if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_PRIMARY:
-            target = view.get_path_at_pos(event.x, event.y)
-            mask = not (event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK))
-            if target and mask and view.get_selection().path_is_selected(target[0]):
-                self._select_enabled = False
-
-    def on_view_release(self, view, event):
-        """ Handles a mouse click (release) to view. """
-        # Enable selection.
-        self._select_enabled = True
-
-    def get_size_from_bytes(self, size):
-        """ Simple convert function from bytes to other units like K, M or G. """
-        try:
-            b = float(size)
-        except ValueError:
-            return size
-        else:
-            kb, mb, gb = 1024.0, 1048576.0, 1073741824.0
-
-            if b < kb:
-                return str(b)
-            elif kb <= b < mb:
-                return "{0:.1f} K".format(b / kb)
-            elif mb <= b < gb:
-                return "{0:.1f} M".format(b / mb)
-            elif gb <= b:
-                return "{0:.1f} G".format(b / gb)
-
-
-if __name__ == '__main__':
-    pass

app/ui/import_dialog.glade

@@ -26,25 +26,13 @@ THE SOFTWARE.
 Author: Dmitriy Yefremov
 
 -->
-<interface domain="demon-editor">
+<interface>
   <requires lib="gtk+" version="3.16"/>
-  <!-- interface-css-provider-path style.css -->
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
+  <!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
   <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkImage" id="details_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">emblem-important-symbolic</property>
-  </object>
-  <object class="GtkImage" id="import_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert-symbolic-rtl</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="main_list_store">
     <columns>
       <!-- column-name name -->
@@ -94,16 +82,61 @@ Author: Dmitriy Yefremov
   </object>
   <object class="GtkWindow" id="dialog_window">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Import</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">480</property>
     <property name="default_height">320</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <property name="gravity">center</property>
     <signal name="check-resize" handler="on_resize" swapped="no"/>
-    <child>
-      <placeholder/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">Import</property>
+        <property name="subtitle" translatable="yes">Bouquets and services</property>
+        <property name="spacing">2</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkButton" id="import_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Import</property>
+            <signal name="clicked" handler="on_import" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="import_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-revert-to-saved</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="info_check_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Details</property>
+            <property name="draw_indicator">False</property>
+            <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="info_check_button_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-dialog-info</property>
+              </object>
+            </child>
+            <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
     </child>
     <child>
       <object class="GtkBox" id="main_box">
@@ -128,8 +161,8 @@ Author: Dmitriy Yefremov
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                     <property name="label" translatable="yes">Bouquets</property>
                   </object>
                   <packing>
@@ -227,8 +260,8 @@ Author: Dmitriy Yefremov
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                     <property name="label" translatable="yes">Bouquet details</property>
                   </object>
                   <packing>
@@ -304,62 +337,6 @@ Author: Dmitriy Yefremov
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButtonBox" id="actions_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="margin_left">15</property>
-            <property name="margin_right">15</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="layout_style">start</property>
-            <child>
-              <object class="GtkButton" id="import_button">
-                <property name="label" translatable="yes">Import</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Bouquets and services</property>
-                <property name="valign">center</property>
-                <property name="image">import_image</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="on_import" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="info_check_button">
-                <property name="label" translatable="yes">Details</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Details</property>
-                <property name="valign">center</property>
-                <property name="image">details_image</property>
-                <property name="always_show_image">True</property>
-                <property name="draw_indicator">False</property>
-                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
-                <accelerator key="i" signal="clicked"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkInfoBar" id="info_bar">
             <property name="can_focus">False</property>
@@ -405,7 +382,7 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>

app/ui/imports.py

@@ -1,12 +1,13 @@
 from contextlib import suppress
 from pathlib import Path
 
-from app.commons import run_idle, log
-from app.eparser import get_bouquets, get_services, BouquetsReader
+from app.commons import run_idle
+from app.eparser import get_bouquets, get_services
 from app.eparser.ecommons import BqType, BqServiceType, Bouquet
+from app.eparser.enigma.bouquets import get_bouquet
 from app.eparser.neutrino.bouquets import parse_webtv, parse_bouquets as get_neutrino_bouquets
 from app.settings import SettingsType
-from app.ui.dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
+from app.ui.dialogs import show_dialog, DialogType, get_chooser_dialog, get_message
 from app.ui.main_helper import on_popup_menu
 from .uicommons import Gtk, UI_RESOURCES_PATH, KeyboardKey, Column
 
@@ -20,7 +21,7 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
 
     if profile is SettingsType.ENIGMA_2:
         pattern = ".{}".format(bq_type.value)
-        f_pattern = "*" + pattern if settings.is_darwin else "userbouquet.*{}".format(pattern)
+        f_pattern = "userbouquet.*{}".format(pattern)
     elif profile is SettingsType.NEUTRINO_MP:
         pattern = "webtv.xml" if bq_type is BqType.WEBTV else "bouquets.xml"
         f_pattern = "bouquets.xml"
@@ -33,15 +34,11 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
     if file_path == Gtk.ResponseType.CANCEL:
         return
 
-    if not file_path.endswith(pattern):
+    if not str(file_path).endswith(pattern):
         show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
         return
 
     if profile is SettingsType.ENIGMA_2:
-        if settings.is_darwin and file_path.rfind("userbouquet.") < 0:
-            show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
-            return
-
         bq = get_enigma2_bouquet(file_path)
         imported = list(filter(lambda x: x.data in services or x.type is BqServiceType.IPTV, bq.services))
 
@@ -66,7 +63,7 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
 def get_enigma2_bouquet(path):
     path, sep, f_name = path.rpartition("userbouquet.")
     name, sep, suf = f_name.rpartition(".")
-    bq = BouquetsReader.get_bouquet(path, name, suf)
+    bq = get_bouquet(path, name, suf)
     bouquet = Bouquet(name=bq[0], type=BqType(suf).value, services=bq[1], locked=None, hidden=None)
     return bouquet
 
@@ -84,7 +81,10 @@ class ImportDialog:
                     "on_resize": self.on_resize,
                     "on_key_press": self.on_key_press}
 
-        builder = get_builder(UI_RESOURCES_PATH + "import_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.set_translation_domain("demon-editor")
+        builder.add_from_file(UI_RESOURCES_PATH + "import_dialog.glade")
+        builder.connect_signals(handlers)
 
         self._bq_services = {}
         self._services = {}
@@ -119,25 +119,16 @@ class ImportDialog:
         self._services_model.clear()
         try:
             if not self._bouquets:
-                log("Import [init data]: getting bouquets...")
                 self._bouquets = get_bouquets(path, self._profile)
             for bqs in self._bouquets:
                 for bq in bqs.bouquets:
                     self._main_model.append((bq.name, bq.type, True))
                     self._bq_services[(bq.name, bq.type)] = bq.services
-
-            if self._profile is SettingsType.ENIGMA_2:
-                services = get_services(path, self._profile, 5 if self._settings.v5_support else 4)
-            elif self._profile is SettingsType.NEUTRINO_MP:
-                services = get_services(path, self._profile, 0)
-            else:
-                self.show_info_message("Setting format not supported!", Gtk.MessageType.ERROR)
-                return
-
+            # Note! Getting default format ver. 4
+            services = get_services(path, self._profile, 4 if self._profile is SettingsType.ENIGMA_2 else 0)
             for srv in services:
                 self._services[srv.fav_id] = srv
         except FileNotFoundError as e:
-            log("Import error [init data]: {}".format(e))
             self.show_info_message(str(e), Gtk.MessageType.ERROR)
 
     def on_import(self, item):
@@ -148,17 +139,9 @@ class ImportDialog:
         if not self._bouquets or show_dialog(DialogType.QUESTION, self._dialog_window) == Gtk.ResponseType.CANCEL:
             return
 
-        self.import_data()
-
-    @run_idle
-    def import_data(self):
-        """ Importing data into models. """
-        if not self._bouquets:
-            return
-
-        log("Importing data...")
         services = set()
         to_delete = set()
+
         for row in self._main_model:
             bq = (row[0], row[1])
             if row[-1]:
@@ -168,16 +151,19 @@ class ImportDialog:
                         services.add(srv)
             else:
                 to_delete.add(bq)
+
         bqs_to_delete = []
         for bqs in self._bouquets:
             for bq in bqs.bouquets:
                 if (bq.name, bq.type) in to_delete:
                     bqs_to_delete.append(bq)
+
         for bqs in self._bouquets:
             bq = bqs.bouquets
             for b in bqs_to_delete:
                 with suppress(ValueError):
                     bq.remove(b)
+
         self._append(self._bouquets, list(filter(lambda s: s.fav_id not in self._service_ids, services)))
         self._dialog_window.destroy()
 

app/ui/iptv.py

@@ -1,51 +1,21 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
 import concurrent.futures
-import os
 import re
 import urllib
 from urllib.error import HTTPError
 from urllib.parse import urlparse, unquote, quote
 from urllib.request import Request, urlopen
 
-import requests
-from gi.repository import GLib, Gio, GdkPixbuf
+from gi.repository import GLib
 
-from app.commons import run_idle, run_task, log
+from app.commons import run_idle, run_task
 from app.eparser.ecommons import BqServiceType, Service
-from app.eparser.iptv import (NEUTRINO_FAV_ID_FORMAT, StreamType, ENIGMA2_FAV_ID_FORMAT, get_fav_id, MARKER_FORMAT,
-                              parse_m3u)
+from app.eparser.iptv import NEUTRINO_FAV_ID_FORMAT, StreamType, ENIGMA2_FAV_ID_FORMAT, get_fav_id, MARKER_FORMAT
 from app.settings import SettingsType
-from app.tools.yt import YouTubeException, YouTube
-from app.ui.dialogs import Action, show_dialog, DialogType, get_message, get_builder
-from app.ui.main_helper import get_base_model, get_iptv_url, on_popup_menu, get_picon_pixbuf
-from app.ui.uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, IPTV_ICON, Column, KeyboardKey, get_yt_icon)
+from app.tools.yt import PlayListParser, YouTubeException, YouTube
+from .dialogs import Action, show_dialog, DialogType, get_dialogs_string, get_message
+from .main_helper import get_base_model, get_iptv_url, on_popup_menu
+from .uicommons import (Gtk, Gdk, TEXT_DOMAIN, UI_RESOURCES_PATH, IPTV_ICON, Column, IS_GNOME_SESSION, KeyboardKey,
+                        get_yt_icon)
 
 _DIGIT_ENTRY_NAME = "digit-entry"
 _ENIGMA2_REFERENCE = "{}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
@@ -70,9 +40,7 @@ def get_stream_type(box):
         return StreamType.NONE_REC_1.value
     elif active == 3:
         return StreamType.NONE_REC_2.value
-    elif active == 4:
-        return StreamType.E_SERVICE_URI.value
-    return StreamType.E_SERVICE_HLS.value
+    return StreamType.E_SERVICE_URI.value
 
 
 class IptvDialog:
@@ -94,8 +62,11 @@ class IptvDialog:
         self._yt_links = None
         self._yt_dl = None
 
-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("iptv_dialog", "stream_type_liststore", "yt_quality_liststore"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("iptv_dialog", "stream_type_liststore", "yt_quality_liststore"))
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("iptv_dialog")
         self._dialog.set_transient_for(transient)
@@ -190,8 +161,6 @@ class IptvDialog:
                 self._stream_type_combobox.set_active(3)
             elif stream_type is StreamType.E_SERVICE_URI:
                 self._stream_type_combobox.set_active(4)
-            elif stream_type is StreamType.E_SERVICE_HLS:
-                self._stream_type_combobox.set_active(5)
         except ValueError:
             self.show_info_message("Unknown stream type {}".format(s_type), Gtk.MessageType.ERROR)
 
@@ -231,8 +200,7 @@ class IptvDialog:
     def on_url_changed(self, entry):
         url_str = entry.get_text()
         url = urlparse(url_str)
-        e_types = (StreamType.E_SERVICE_URI.value, StreamType.E_SERVICE_HLS.value)
-        cond = all([url.scheme, url.netloc, url.path]) or self.get_type() in e_types
+        cond = all([url.scheme, url.netloc, url.path]) or self.get_type() == StreamType.E_SERVICE_URI.value
         entry.set_name("GtkEntry" if cond else _DIGIT_ENTRY_NAME)
 
         yt_id = YouTube.get_yt_id(url_str)
@@ -283,7 +251,7 @@ class IptvDialog:
         yield True
 
     def on_stream_type_changed(self, item):
-        if self.get_type() in (StreamType.E_SERVICE_URI.value, StreamType.E_SERVICE_HLS.value):
+        if self.get_type() == StreamType.E_SERVICE_URI.value:
             self.show_info_message("DreamOS only!", Gtk.MessageType.WARNING)
         self.update_reference_entry()
 
@@ -322,14 +290,14 @@ class IptvDialog:
             self._bouquet[self._paths[0][0]] = fav_id
             self._model.set(self._model.get_iter(self._paths), {Column.FAV_SERVICE: name, Column.FAV_ID: fav_id})
         else:
+            aggr = [None] * 10
             s_type = BqServiceType.IPTV.name
-            srv = (None, None, name, None, None, s_type, None, fav_id, None, None, None)
+            srv = (None, None, name, None, None, s_type, None, fav_id, *aggr[0:3])
             itr = self._model.insert_after(self._model.get_iter(self._paths[0]),
                                            srv) if self._paths else self._model.insert(0, srv)
             self._model.set_value(itr, 1, IPTV_ICON)
             self._bouquet.insert(self._model.get_path(itr)[0], fav_id)
-            self._services[fav_id] = Service(None, None, IPTV_ICON, name, None, None, None, s_type, None,
-                                             None, None, None, None, None, None, None, None, None, fav_id, None)
+            self._services[fav_id] = Service(None, None, IPTV_ICON, name, *aggr[0:3], s_type, *aggr, fav_id, None)
 
     @run_idle
     def on_info_bar_close(self, bar=None, resp=None):
@@ -347,8 +315,10 @@ class SearchUnavailableDialog:
     def __init__(self, transient, model, fav_bouquet, iptv_rows, s_type):
         handlers = {"on_response": self.on_response}
 
-        builder = get_builder(UI_RESOURCES_PATH + "iptv.glade", handlers,
-                              objects=("search_unavailable_streams_dialog",))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_file(UI_RESOURCES_PATH + "iptv.glade", ("search_unavailable_streams_dialog",))
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("search_unavailable_streams_dialog")
         self._dialog.set_transient_for(transient)
@@ -424,10 +394,9 @@ class SearchUnavailableDialog:
         self._dialog.destroy()
 
 
-class IptvListDialog:
-    """ Base class for working with iptv lists. """
+class IptvListConfigurationDialog:
 
-    def __init__(self, transient, s_type):
+    def __init__(self, transient, services, iptv_rows, bouquet, fav_model, s_type):
         handlers = {"on_apply": self.on_apply,
                     "on_response": self.on_response,
                     "on_stream_type_default_togged": self.on_stream_type_default_togged,
@@ -441,15 +410,20 @@ class IptvListDialog:
                     "on_entry_changed": self.on_entry_changed,
                     "on_info_bar_close": self.on_info_bar_close}
 
+        self._rows = iptv_rows
+        self._services = services
+        self._bouquet = bouquet
+        self._fav_model = fav_model
         self._s_type = s_type
 
-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("iptv_list_configuration_dialog", "stream_type_liststore"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("iptv_list_configuration_dialog", "stream_type_liststore"))
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("iptv_list_configuration_dialog")
         self._dialog.set_transient_for(transient)
-        self._data_box = builder.get_object("iptv_list_data_box")
-        self._start_values_grid = builder.get_object("start_values_grid")
         self._info_bar = builder.get_object("list_configuration_info_bar")
         self._reference_label = builder.get_object("reference_label")
         self._stream_type_check_button = builder.get_object("stream_type_default_check_button")
@@ -464,28 +438,22 @@ class IptvListDialog:
         self._list_tid_entry = builder.get_object("list_tid_entry")
         self._list_nid_entry = builder.get_object("list_nid_entry")
         self._list_namespace_entry = builder.get_object("list_namespace_entry")
-        self._apply_button = builder.get_object("list_configuration_apply_button")
-        self._cancel_button = builder.get_object("cancel_config_list_button")
-        self._ok_button = builder.get_object("list_configuration_ok_button")
-        # Style
-        style_provider = Gtk.CssProvider()
-        style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._default_elems = (self._stream_type_check_button, self._type_check_button, self._sid_auto_check_button,
-                               self._tid_check_button, self._nid_check_button, self._namespace_check_button)
+        self._reset_to_default_switch = builder.get_object("reset_to_default_lists_switch")
+        # style
+        self._style_provider = Gtk.CssProvider()
+        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
         self._digit_elems = (self._list_srv_type_entry, self._list_sid_entry, self._list_tid_entry,
                              self._list_nid_entry, self._list_namespace_entry)
         for el in self._digit_elems:
-            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
+            el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                            Gtk.STYLE_PROVIDER_PRIORITY_USER)
 
     def show(self):
         self._dialog.run()
 
     def on_response(self, dialog, response):
-        if response == Gtk.ResponseType.APPLY:
-            return True
-
-        self._dialog.destroy()
+        if response == Gtk.ResponseType.CANCEL:
+            self._dialog.destroy()
 
     def on_stream_type_changed(self, box):
         self.update_reference()
@@ -521,51 +489,19 @@ class IptvListDialog:
         self._list_namespace_entry.set_sensitive(not button.get_active())
 
     @run_idle
-    def on_reset_to_default(self, item):
+    def on_reset_to_default(self, item, active):
+        item.set_sensitive(not active)
         self._stream_type_combobox.set_active(1)
         self._list_srv_type_entry.set_text("1")
-        for el in self._digit_elems[1:]:
+        for el in (self._list_sid_entry, self._list_nid_entry, self._list_tid_entry, self._list_namespace_entry):
             el.set_text("0")
-        for el in self._default_elems:
+        for el in (self._stream_type_check_button, self._type_check_button, self._sid_auto_check_button,
+                   self._tid_check_button, self._nid_check_button, self._namespace_check_button):
             el.set_active(True)
 
     def on_info_bar_close(self, bar=None, resp=None):
         self._info_bar.set_visible(False)
 
-    def on_apply(self, item):
-        pass
-
-    @run_idle
-    def update_reference(self):
-        if is_data_correct(self._digit_elems):
-            stream_type = get_stream_type(self._stream_type_combobox)
-            self._reference_label.set_text(
-                _ENIGMA2_REFERENCE.format(stream_type, *[int(elem.get_text()) for elem in self._digit_elems]))
-
-    def on_entry_changed(self, entry):
-        if _PATTERN.search(entry.get_text()):
-            entry.set_name(_DIGIT_ENTRY_NAME)
-        else:
-            entry.set_name("GtkEntry")
-            self.update_reference()
-
-    def is_default_values(self):
-        return any(el.get_text() == "0" for el in self._digit_elems[2:])
-
-    def is_all_data_default(self):
-        return all(el.get_active() for el in self._default_elems)
-
-
-class IptvListConfigurationDialog(IptvListDialog):
-
-    def __init__(self, transient, services, iptv_rows, bouquet, fav_model, s_type):
-        super().__init__(transient, s_type)
-
-        self._rows = iptv_rows
-        self._bouquet = bouquet
-        self._fav_model = fav_model
-        self._services = services
-
     @run_idle
     def on_apply(self, item):
         if not is_data_correct(self._digit_elems):
@@ -573,13 +509,14 @@ class IptvListConfigurationDialog(IptvListDialog):
             return
 
         if self._s_type is SettingsType.ENIGMA_2:
+            reset = self._reset_to_default_switch.get_active()
             type_default = self._type_check_button.get_active()
             tid_default = self._tid_check_button.get_active()
             sid_auto = self._sid_auto_check_button.get_active()
             nid_default = self._nid_check_button.get_active()
             namespace_default = self._namespace_check_button.get_active()
 
-            stream_type = get_stream_type(self._stream_type_combobox)
+            stream_type = StreamType.NONE_TS.value if reset else get_stream_type(self._stream_type_combobox)
             srv_type = "1" if type_default else self._list_srv_type_entry.get_text()
             tid = "0" if tid_default else "{:X}".format(int(self._list_tid_entry.get_text()))
             nid = "0" if nid_default else "{:X}".format(int(self._list_nid_entry.get_text()))
@@ -590,7 +527,7 @@ class IptvListConfigurationDialog(IptvListDialog):
                 data, sep, desc = fav_id.partition("http")
                 data = data.split(":")
 
-                if self.is_all_data_default():
+                if reset:
                     data[2], data[3], data[4], data[5], data[6] = "10000"
                 else:
                     data[0], data[2], data[4], data[5], data[6] = stream_type, srv_type, tid, nid, namespace
@@ -609,213 +546,19 @@ class IptvListConfigurationDialog(IptvListDialog):
 
             self._info_bar.set_visible(True)
 
-
-class M3uImportDialog(IptvListDialog):
-    """ Import dialog for *.m3u* playlists. """
-
-    def __init__(self, transient, s_type, m3_path, app):
-        super().__init__(transient, s_type)
-
-        self._app = app
-        self._picons = app._picons
-        self._pic_path = app._settings.picons_local_path
-        self._services = None
-        self._url_count = 0
-        self._errors_count = 0
-        self._max_count = 0
-        self._is_download = False
-        self._cancellable = Gio.Cancellable()
-        self._dialog.set_title(get_message("Playlist import"))
-        self._dialog.connect("delete-event", self.on_close)
-        self._apply_button.set_label(get_message("Import"))
-        self._ok_button.bind_property("visible", self._apply_button, "visible", 4)
-        self._ok_button.bind_property("visible", self._cancel_button, "visible", 4)
-        # Progress
-        self._progress_bar = Gtk.ProgressBar(visible=False, valign="center")
-        self._spinner = Gtk.Spinner(active=False)
-        self._info_label = Gtk.Label(visible=True, ellipsize="end", max_width_chars=30)
-        load_label = Gtk.Label(label=get_message("Loading data..."))
-        self._spinner.bind_property("active", self._spinner, "visible")
-        self._spinner.bind_property("visible", load_label, "visible")
-        self._spinner.bind_property("active", self._start_values_grid, "sensitive", 4)
-
-        progress_box = Gtk.HBox(visible=True, spacing=2)
-        progress_box.add(self._progress_bar)
-        progress_box.pack_end(self._spinner, False, False, 0)
-        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.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
-        extra_box = Gtk.HBox(visible=True, spacing=2, margin_bottom=5, margin_top=5)
-        extra_box.set_center_widget(progress_box)
-        extra_box.pack_start(self._info_label, False, False, 5)
-        extra_box.pack_end(self._picon_box, True, True, 5)
-
-        frame = Gtk.Frame(visible=True)
-        frame.add(extra_box)
-        self._data_box.add(frame)
-
-        self.get_m3u(m3_path, s_type)
-
-    @run_task
-    def get_m3u(self, path, s_type):
-        try:
-            GLib.idle_add(self._spinner.set_property, "active", True)
-            self._services = parse_m3u(path, s_type)
-            for s in self._services:
-                if s.picon:
-                    GLib.idle_add(self._picon_box.set_sensitive, True)
-                    break
-        finally:
-            msg = "{} {}.".format(get_message("Streams detected:"), len(self._services) if self._services else 0)
-            GLib.idle_add(self._info_label.set_text, msg)
-            GLib.idle_add(self._spinner.set_property, "active", False)
-
-    def on_apply(self, item):
-        if not is_data_correct(self._digit_elems):
-            show_dialog(DialogType.ERROR, self._dialog, "Error. Verify the data!")
-            return
-
-        picons = {}
-        services = self._services
-
-        if not self.is_all_data_default():
-            services = []
-            params = [int(el.get_text()) for el in self._digit_elems]
-            s_type = params[0]
-            params = params[1:]
+    @run_idle
+    def update_reference(self):
+        if is_data_correct(self._digit_elems):
             stream_type = get_stream_type(self._stream_type_combobox)
+            self._reference_label.set_text(
+                _ENIGMA2_REFERENCE.format(stream_type, *[int(elem.get_text()) for elem in self._digit_elems]))
 
-            for i, s in enumerate(self._services, start=params[0]):
-                # Skipping markers.
-                if not s.data_id:
-                    services.append(s)
-                    continue
-
-                params[0] = i
-                picon_id = "{}_0_{:X}_{:X}_{:X}_{:X}_{:X}_0_0_0.png".format(stream_type, s_type, *params)
-                fav_id = get_fav_id(s.data_id, s.service, self._s_type, params, stream_type, s_type)
-                if s.picon:
-                    picons[s.picon] = picon_id
-
-                services.append(s._replace(picon=None, picon_id=picon_id, data_id=None, fav_id=fav_id))
-
-        if self._picons_switch.get_active():
-            if self.is_default_values():
-                show_dialog(DialogType.ERROR, self._dialog,
-                            "Set values for TID, NID and Namespace for correct naming of the picons!")
-                return
-
-            self.download_picons(picons)
+    def on_entry_changed(self, entry):
+        if _PATTERN.search(entry.get_text()):
+            entry.set_name(_DIGIT_ENTRY_NAME)
         else:
-            GLib.idle_add(self._ok_button.set_visible, True)
-            GLib.idle_add(self._info_bar.set_visible, True, priority=GLib.PRIORITY_LOW)
-
-        self._app.append_imported_services(services)
-
-    @run_task
-    def download_picons(self, picons):
-        self._is_download = True
-        os.makedirs(os.path.dirname(self._pic_path), exist_ok=True)
-        GLib.idle_add(self._apply_button.set_sensitive, False)
-        GLib.idle_add(self._progress_bar.set_visible, True)
-
-        self._errors_count = 0
-        self._url_count = len(picons)
-        self._max_count = self._url_count
-        self._cancellable.reset()
-
-        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-            futures = {executor.submit(self.download_picon, p, picons.get(p, None)): p for p in filter(None, picons)}
-            done, not_done = concurrent.futures.wait(futures, timeout=0)
-            while self._is_download and not_done:
-                done, not_done = concurrent.futures.wait(not_done, timeout=5)
-
-            for future in not_done:
-                future.cancel()
-            concurrent.futures.wait(not_done)
-
-            self.update_progress(self._url_count)
-            self.on_done()
-
-    def download_picon(self, url, pic_data):
-        err_msg = "Picon download error: {}  [{}]"
-        timeout = (3, 5)  # connect and read timeouts
-
-        req = requests.get(url, timeout=timeout)
-        if req.status_code != 200:
-            log(err_msg.format(url, req.reason))
-            self.update_progress(1)
-        else:
-            self.on_picon_load_done(req.content, pic_data)
-
-    @run_idle
-    def on_picon_load_done(self, data, user_data):
-        try:
-            self._info_label.set_text("Processing: {}".format(user_data))
-            f = Gio.MemoryInputStream.new_from_data(data)
-            pixbuf = GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, 220, 132, False, self._cancellable)
-            path = "{}{}".format(self._pic_path, user_data)
-            pixbuf.savev(path, "png", [], [])
-            self._picons[user_data] = get_picon_pixbuf(path)
-        except GLib.GError as e:
-            self.update_progress(1)
-            if e.code != Gio.IOErrorEnum.CANCELLED:
-                log("Loading picon [{}] data error: {}".format(user_data, e))
-        else:
-            self.update_progress()
-
-    @run_idle
-    def update_progress(self, error=0):
-        self._errors_count += error
-        self._url_count -= 1
-        frac = 1 - self._url_count / self._max_count
-        self._progress_bar.set_fraction(frac)
-
-    @run_idle
-    def on_done(self):
-        self._progress_bar.set_visible(False)
-        self._progress_bar.set_fraction(0.0)
-        self._apply_button.set_sensitive(True)
-        self._info_label.set_text("Errors: {}.".format(self._errors_count))
-        self._is_download = False
-
-        gen = self.update_fav_model()
-        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
-
-    def update_fav_model(self):
-        services = self._app._services
-        picons = self._app._picons
-        model = self._app.fav_view.get_model()
-        for r in model:
-            s = services.get(r[Column.FAV_ID], None)
-            if s:
-                model.set_value(r.iter, Column.FAV_PICON, picons.get(s.picon_id, None))
-                yield True
-
-        self._info_bar.set_visible(True)
-        self._ok_button.set_visible(True)
-        yield True
-
-    def on_response(self, dialog, response):
-        if response == Gtk.ResponseType.APPLY:
-            return True
-
-        if response == Gtk.ResponseType.CANCEL and not self._is_download or not self.on_close():
-            self._dialog.destroy()
-
-    def on_close(self, window=None, event=None):
-        if self._is_download:
-            if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
-                self._is_download = False
-                self._cancellable.cancel()
-                return False
-            return True
-
-        return False
+            entry.set_name("GtkEntry")
+            self.update_reference()
 
 
 class YtListImportDialog:
@@ -839,10 +582,12 @@ class YtListImportDialog:
         self._settings = settings
         self._yt = None
 
-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("yt_import_dialog_window", "yt_liststore", "yt_quality_liststore",
-                                       "yt_popup_menu", "remove_selection_image", "yt_receive_image",
-                                       "yt_import_image"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("yt_import_dialog_window", "yt_liststore", "yt_quality_liststore",
+                                         "yt_popup_menu", "remove_selection_image"))
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("yt_import_dialog_window")
         self._dialog.set_transient_for(transient)
@@ -920,9 +665,7 @@ class YtListImportDialog:
     def update_refs_list(self):
         if self._yt_list_id:
             try:
-                if not self._yt:
-                    self._yt = YouTube.get_instance(self._settings)
-                self._yt_list_title, links = self._yt.get_yt_playlist(self._yt_list_id, self._url_entry.get_text())
+                self._yt_list_title, links = PlayListParser.get_yt_playlist(self._yt_list_id)
             except Exception as e:
                 self.show_info_message(str(e), Gtk.MessageType.ERROR)
                 return
@@ -943,13 +686,13 @@ class YtListImportDialog:
 
     @run_idle
     def append_services(self, links):
+        aggr = [None] * 9
         srvs = []
 
         if self._yt_list_title:
             title = self._yt_list_title
             fav_id = MARKER_FORMAT.format(0, title, title)
-            mk = Service(None, None, None, title, None, None, None, BqServiceType.MARKER.name, None,
-                         None, None, None, None, None, None, None, None, 0, fav_id, None)
+            mk = Service(None, None, None, title, *aggr[0:3], BqServiceType.MARKER.name, *aggr, 0, fav_id, None)
             srvs.append(mk)
 
         act = self._quality_model.get_value(self._quality_box.get_active_iter(), 0)
@@ -959,8 +702,7 @@ class YtListImportDialog:
                 continue
             ln = lnk.get(act) if act in lnk else lnk[sorted(lnk, key=lambda x: int(x.rstrip("p")), reverse=True)[0]]
             fav_id = get_fav_id(ln, title, self._s_type)
-            srv = Service(None, None, IPTV_ICON, title, None, None, None, BqServiceType.IPTV.name, None, None, None,
-                          None, None, None, None, None, None, None, fav_id, None)
+            srv = Service(None, None, IPTV_ICON, title, *aggr[0:3], BqServiceType.IPTV.name, *aggr, None, fav_id, None)
             srvs.append(srv)
         self.appender(srvs)
 

app/ui/main_helper.py

@@ -37,7 +37,7 @@ def insert_marker(view, bouquets, selected_bouquet, services, parent_window, m_t
     marker = (None, None, text, None, None, s_type, None, fav_id, None, None, None)
     itr = model.insert_before(model.get_iter(paths[0]), marker) if paths else model.insert(0, marker)
     bouquets[selected_bouquet].insert(model.get_path(itr)[0], fav_id)
-    services[fav_id] = Service(None, None, None, text, None, None, None, s_type, None, None, None, None, None, None, None, None, None, 0, fav_id, None)
+    services[fav_id] = Service(None, None, None, text, None, None, None, s_type, *[None] * 9, 0, fav_id, None)
 
 
 # ***************** Movement *******************#
@@ -46,57 +46,54 @@ def move_items(key, view: Gtk.TreeView):
     """ Move items in the tree view """
     selection = view.get_selection()
     model, paths = selection.get_selected_rows()
-    if not paths:
-        return
 
-    is_tree_store = type(model) is Gtk.TreeStore
-    mod_length = len(model)
-    if not is_tree_store and mod_length == len(paths):
-        return
-
-    cursor_path = view.get_cursor()[0]
-    max_path = Gtk.TreePath.new_from_indices((mod_length,))
-    min_path = Gtk.TreePath.new_from_indices((0,))
-
-    if is_tree_store:
+    if paths:
+        mod_length = len(model)
+        if mod_length == len(paths):
+            return
+        cursor_path = view.get_cursor()[0]
+        max_path = Gtk.TreePath.new_from_indices((mod_length,))
+        min_path = Gtk.TreePath.new_from_indices((0,))
         is_tree_store = False
-        parent_paths = list(filter(lambda p: p.get_depth() == 1, paths))
-        if parent_paths:
-            paths = parent_paths
-            min_path = model.get_path(model.get_iter_first())
-            view.collapse_all()
-            if mod_length == len(paths):
-                return
-        else:
-            if not is_some_level(paths):
-                return
-            parent_itr = model.iter_parent(model.get_iter(paths[0]))
-            parent_index = model.get_path(parent_itr)
-            children_num = model.iter_n_children(parent_itr)
-            if key in (KeyboardKey.PAGE_DOWN, KeyboardKey.END, KeyboardKey.END_KP, KeyboardKey.PAGE_DOWN_KP):
-                children_num -= 1
-            min_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, 0))
-            max_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, children_num))
-            is_tree_store = True
 
-    if key is KeyboardKey.UP:
-        top_path = Gtk.TreePath(paths[0])
-        set_cursor(top_path, paths, selection, view)
-        top_path.prev()
-        move_up(top_path, model, paths)
-    elif key is KeyboardKey.DOWN:
-        down_path = Gtk.TreePath(paths[-1])
-        set_cursor(down_path, paths, selection, view)
-        down_path.next()
-        if down_path < max_path:
-            move_down(down_path, model, paths)
-        else:
-            max_path.prev()
-            move_down(max_path, model, paths)
-    elif key in (KeyboardKey.PAGE_UP, KeyboardKey.HOME, KeyboardKey.PAGE_UP_KP, KeyboardKey.HOME_KP):
-        move_up(min_path if is_tree_store else cursor_path, model, paths)
-    elif key in (KeyboardKey.PAGE_DOWN, KeyboardKey.END, KeyboardKey.END_KP, KeyboardKey.PAGE_DOWN_KP):
-        move_down(max_path if is_tree_store else cursor_path, model, paths)
+        if type(model) is Gtk.TreeStore:
+            parent_paths = list(filter(lambda p: p.get_depth() == 1, paths))
+            if parent_paths:
+                paths = parent_paths
+                min_path = model.get_path(model.get_iter_first())
+                view.collapse_all()
+                if mod_length == len(paths):
+                    return
+            else:
+                if not is_some_level(paths):
+                    return
+                parent_itr = model.iter_parent(model.get_iter(paths[0]))
+                parent_index = model.get_path(parent_itr)
+                children_num = model.iter_n_children(parent_itr)
+                if key in (KeyboardKey.PAGE_DOWN, KeyboardKey.END, KeyboardKey.END_KP, KeyboardKey.PAGE_DOWN_KP):
+                    children_num -= 1
+                min_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, 0))
+                max_path = Gtk.TreePath.new_from_string("{}:{}".format(parent_index, children_num))
+                is_tree_store = True
+
+        if key is KeyboardKey.UP:
+            top_path = Gtk.TreePath(paths[0])
+            set_cursor(top_path, paths, selection, view)
+            top_path.prev()
+            move_up(top_path, model, paths)
+        elif key is KeyboardKey.DOWN:
+            down_path = Gtk.TreePath(paths[-1])
+            set_cursor(down_path, paths, selection, view)
+            down_path.next()
+            if down_path < max_path:
+                move_down(down_path, model, paths)
+            else:
+                max_path.prev()
+                move_down(max_path, model, paths)
+        elif key in (KeyboardKey.PAGE_UP, KeyboardKey.HOME, KeyboardKey.PAGE_UP_KP, KeyboardKey.HOME_KP):
+            move_up(min_path if is_tree_store else cursor_path, model, paths)
+        elif key in (KeyboardKey.PAGE_DOWN, KeyboardKey.END, KeyboardKey.END_KP, KeyboardKey.PAGE_DOWN_KP):
+            move_down(max_path if is_tree_store else cursor_path, model, paths)
 
 
 def move_up(top_path, model, paths):
@@ -164,8 +161,7 @@ def rename(view, parent_window, target, fav_view=None, service_view=None, servic
             return
 
         srv_name = response
-        if not model.get_value(itr, Column.FAV_BACKGROUND):
-            model.set_value(itr, Column.FAV_SERVICE, response)
+        model.set_value(itr, Column.FAV_SERVICE, response)
 
         if service_view is not None:
             for row in get_base_model(service_view.get_model()):
@@ -280,7 +276,7 @@ def set_hide(services, model, paths):
     for path in paths:
         itr = model.get_iter(path)
         model.set_value(itr, col_num, None if hide else HIDE_ICON)
-        flags = list(model.get_value(itr, 0).split(","))
+        flags = [*model.get_value(itr, 0).split(",")]
         index, flag = None, None
         for i, fl in enumerate(flags):
             if fl.startswith("f:"):
@@ -353,12 +349,12 @@ def scroll_to(index, view, paths=None):
 
 # ***************** Picons *********************#
 
-def update_picons_data(path, picons, size=32):
+def update_picons_data(path, picons):
     if not os.path.exists(path):
         return
 
     for file in os.listdir(path):
-        pf = get_picon_pixbuf(path + file, size)
+        pf = get_picon_pixbuf(path + file)
         if pf:
             picons[file] = pf
 
@@ -405,19 +401,15 @@ def assign_picons(target, srv_view, fav_view, transient, picons, settings, servi
             picons_path = dst_path or settings.picons_local_path
             os.makedirs(os.path.dirname(picons_path), exist_ok=True)
             picon_file = picons_path + picon_id
-            try:
-                shutil.copy(src_path, picon_file)
-            except shutil.SameFileError:
-                pass  # NOP
+            shutil.copy(src_path, picon_file)
+            picons_files.append(picon_file)
+            picon = get_picon_pixbuf(picon_file)
+            picons[picon_id] = picon
+            model.set_value(itr, p_pos, picon)
+            if target is ViewTarget.SERVICES:
+                set_picon(fav_id, fav_view.get_model(), picon, Column.FAV_ID, p_pos)
             else:
-                picons_files.append(picon_file)
-                picon = get_picon_pixbuf(picon_file)
-                picons[picon_id] = picon
-                model.set_value(itr, p_pos, picon)
-                if target is ViewTarget.SERVICES:
-                    set_picon(fav_id, fav_view.get_model(), picon, Column.FAV_ID, p_pos)
-                else:
-                    set_picon(fav_id, get_base_model(srv_view.get_model()), picon, Column.SRV_FAV_ID, p_pos)
+                set_picon(fav_id, get_base_model(srv_view.get_model()), picon, Column.SRV_FAV_ID, p_pos)
 
     return picons_files
 
@@ -530,7 +522,7 @@ def get_picon_pixbuf(path, size=32):
 
 # ***************** Bouquets *********************#
 
-def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
+def gen_bouquets(view, bq_view, transient, gen_type, tv_types, s_type, callback):
     """ Auto-generate and append list of bouquets """
     fav_id_index = Column.SRV_FAV_ID
     index = Column.SRV_TYPE
@@ -545,6 +537,8 @@ def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
         if not is_only_one_item_selected(paths, transient):
             return
         service = Service(*model[paths][:Column.SRV_TOOLTIP])
+        if service.service_type not in tv_types:
+            bq_type = BqType.RADIO.value
         append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
                         [service.package if gen_type is BqGenType.PACKAGE else
                          service.pos if gen_type is BqGenType.SAT else service.service_type], s_type)
@@ -589,10 +583,8 @@ def get_bouquets_names(model):
 # ***************** Others *********************#
 
 def update_entry_data(entry, dialog, settings):
-    """ Updates value in text entry from chooser dialog. """
-    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings,
-                           action_type=Gtk.FileChooserAction.CREATE_FOLDER if settings.is_darwin else None,
-                           create_dir=True)
+    """ Updates value in text entry from chooser dialog """
+    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings)
     if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
         entry.set_text(response)
         return response
@@ -625,7 +617,7 @@ def get_base_paths(paths, model):
 def get_model_data(view):
     """ Returns model name and base model from the given view """
     model = get_base_model(view.get_model())
-    model_name = model.get_name() if model else ""
+    model_name = model.get_name()
     return model_name, model
 
 

app/ui/picons_manager.py

@@ -1,78 +1,41 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
 import os
 import re
 import shutil
-from enum import Enum
+import subprocess
+import tempfile
 from pathlib import Path
 from urllib.parse import urlparse, unquote
 
-from gi.repository import GLib, GdkPixbuf, Gio
+from gi.repository import GLib, GdkPixbuf
 
 from app.commons import run_idle, run_task, run_with_delay
 from app.connections import upload_data, DownloadType, download_data, remove_picons
 from app.settings import SettingsType, Settings
-from app.tools.picons import (PiconsParser, parse_providers, Provider, convert_to, download_picon, PiconsCzDownloader,
-                              PiconsError)
+from app.tools.picons import PiconsParser, parse_providers, Provider, convert_to
 from app.tools.satellites import SatellitesParser, SatelliteSource
-from .dialogs import show_dialog, DialogType, get_message, get_builder
+from .dialogs import show_dialog, DialogType, get_message
 from .main_helper import update_entry_data, append_text_to_tview, scroll_to, on_popup_menu, get_base_model, set_picon, \
     get_picon_pixbuf
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TV_ICON, Column, KeyboardKey
 
 
 class PiconsDialog:
-    class DownloadSource(Enum):
-        LYNG_SAT = "lyngsat"
-        PICON_CZ = "piconcz"
-
     def __init__(self, transient, settings, picon_ids, sat_positions, app):
         self._picon_ids = picon_ids
         self._sat_positions = sat_positions
         self._app = app
+        self._TMP_DIR = tempfile.gettempdir() + "/"
         self._BASE_URL = "www.lyngsat.com/packages/"
         self._PATTERN = re.compile(r"^https://www\.lyngsat\.com/[\w-]+\.html$")
         self._POS_PATTERN = re.compile(r"^\d+\.\d+[EW]?$")
         self._current_process = None
         self._terminate = False
-        self._is_downloading = False
         self._filter_binding = None
         self._services = None
         self._current_picon_info = None
-        self._filter_cache = {}
-        # Downloader
-        self._sats = None
-        self._sat_names = None
-        self._download_src = self.DownloadSource.PICON_CZ
-        self._picon_cz_downloader = None
 
         handlers = {"on_receive": self.on_receive,
+                    "on_load_providers": self.on_load_providers,
                     "on_cancel": self.on_cancel,
                     "on_close": self.on_close,
                     "on_send": self.on_send,
@@ -101,10 +64,7 @@ class PiconsDialog:
                     "on_selective_remove": self.on_selective_remove,
                     "on_local_remove": self.on_local_remove,
                     "on_picons_dest_view_realize": self.on_picons_dest_view_realize,
-                    "on_download_source_changed": self.on_download_source_changed,
                     "on_satellites_view_realize": self.on_satellites_view_realize,
-                    "on_satellite_filter_toggled": self.on_satellite_filter_toggled,
-                    "on_providers_view_query_tooltip": self.on_providers_view_query_tooltip,
                     "on_satellite_selection": self.on_satellite_selection,
                     "on_select_all": self.on_select_all,
                     "on_unselect_all": self.on_unselect_all,
@@ -112,11 +72,12 @@ class PiconsDialog:
                     "on_fiter_srcs_toggled": self.on_fiter_srcs_toggled,
                     "on_filter_services_switch": self.on_filter_services_switch,
                     "on_picon_activated": self.on_picon_activated,
-                    "on_view_query_tooltip": self.on_view_query_tooltip,
                     "on_tree_view_key_press": self.on_tree_view_key_press,
                     "on_popup_menu": on_popup_menu}
 
-        builder = get_builder(UI_RESOURCES_PATH + "picons_manager.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "picons_manager.glade")
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("picons_dialog")
         self._dialog.set_transient_for(transient)
@@ -138,12 +99,17 @@ class PiconsDialog:
         self._src_filter_button = builder.get_object("src_filter_button")
         self._dst_filter_button = builder.get_object("dst_filter_button")
         self._picons_filter_entry = builder.get_object("picons_filter_entry")
+        self._ip_entry = builder.get_object("ip_entry")
+        self._picons_entry = builder.get_object("picons_entry")
+        self._url_entry = builder.get_object("url_entry")
         self._picons_dir_entry = builder.get_object("picons_dir_entry")
+        self._info_bar = builder.get_object("info_bar")
+        self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("info_bar_message_label")
-        self._info_toggle_button = builder.get_object("info_toggle_button")
+        self._info_check_button = builder.get_object("info_check_button")
         self._picon_info_image = builder.get_object("picon_info_image")
         self._picon_info_label = builder.get_object("picon_info_label")
-        self._download_source_button = builder.get_object("download_source_button")
+        self._load_providers_button = builder.get_object("load_providers_button")
         self._receive_button = builder.get_object("receive_button")
         self._convert_button = builder.get_object("convert_button")
         self._enigma2_path_button = builder.get_object("enigma2_path_button")
@@ -157,37 +123,34 @@ class PiconsDialog:
         self._resize_no_radio_button = builder.get_object("resize_no_radio_button")
         self._resize_220_132_radio_button = builder.get_object("resize_220_132_radio_button")
         self._resize_100_60_radio_button = builder.get_object("resize_100_60_radio_button")
-        self._explorer_action_box = builder.get_object("explorer_action_box")
         self._satellite_label = builder.get_object("satellite_label")
-        self._provider_header_label = builder.get_object("provider_header_label")
-        self._satellite_filter_switch = builder.get_object("satellite_filter_switch")
-        self._bouquet_filter_switch = builder.get_object("bouquet_filter_switch")
-        self._bouquet_filter_grid = builder.get_object("bouquet_filter_grid")
         self._header_download_box = builder.get_object("header_download_box")
         self._satellite_label.bind_property("visible", builder.get_object("loading_data_label"), "visible", 4)
         self._satellite_label.bind_property("visible", builder.get_object("loading_data_spinner"), "visible", 4)
-        self._satellite_label.bind_property("visible", self._download_source_button, "sensitive")
-        self._satellite_label.bind_property("visible", self._satellites_view, "sensitive")
-        self._download_source_button.bind_property("visible", self._receive_button, "visible")
-        self._cancel_button.bind_property("visible", builder.get_object("receive_button"), "visible", 4)
-        self._convert_button.bind_property("visible", self._explorer_action_box, "visible", 4)
-        downloader_action_box = builder.get_object("downloader_action_box")
-        self._explorer_action_box.bind_property("visible", downloader_action_box, "visible", 4)
-        self._convert_button.bind_property("visible", downloader_action_box, "visible", 4)
+        self._cancel_button.bind_property("visible", self._header_download_box, "visible", 4)
+        self._convert_button.bind_property("visible", self._header_download_box, "visible", 4)
+        self._load_providers_button.bind_property("visible", self._receive_button, "visible")
+        self._load_providers_button.bind_property("visible", builder.get_object("download_box_separator"), "visible")
         self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
         self._explorer_src_path_button.bind_property("sensitive", builder.get_object("picons_view_sw"), "sensitive")
         self._filter_button.bind_property("active", builder.get_object("filter_service_box"), "visible")
         self._filter_button.bind_property("active", builder.get_object("src_title_grid"), "visible")
         self._filter_button.bind_property("active", builder.get_object("dst_title_grid"), "visible")
-        self._filter_button.bind_property("visible", self._info_toggle_button, "visible")
+        self._filter_button.bind_property("visible", self._info_check_button, "visible")
         explorer_info_bar = builder.get_object("explorer_info_bar")
         explorer_info_bar.bind_property("visible", builder.get_object("explorer_info_bar_frame"), "visible")
-        self._info_toggle_button.bind_property("active", explorer_info_bar, "visible")
+        self._info_check_button.bind_property("active", explorer_info_bar, "visible")
         # Init drag-and-drop
         self.init_drag_and_drop()
-        # Settings
+        # Style
+        self._style_provider = Gtk.CssProvider()
+        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
+        self._url_entry.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
+                                                                    Gtk.STYLE_PROVIDER_PRIORITY_USER)
         self._settings = settings
         self._s_type = settings.setting_type
+        self._ip_entry.set_text(self._settings.host)
+        self._picons_entry.set_text(self._settings.picons_path)
         self._picons_dir_entry.set_text(self._settings.picons_local_path)
 
         window_size = self._settings.get("picons_downloader_window_size")
@@ -300,9 +263,8 @@ class PiconsDialog:
     def on_picons_view_drag_data_get(self, view, drag_context, data, info, time):
         model, path = view.get_selection().get_selected_rows()
         if path:
-            p_uri = Path(model[path][-1]).as_uri()
-            dest_uri = Path(self._explorer_dest_path_button.get_filename()).as_uri()
-            data.set_uris(["{}::::{}".format(p_uri, dest_uri)])
+            data.set_uris([Path(model[path][-1]).as_uri(),
+                           Path(self._explorer_dest_path_button.get_filename()).as_uri()])
 
     def on_picons_src_view_drag_drop(self, view, drag_context, x, y, time):
         view.stop_emission_by_name("drag_drop")
@@ -377,11 +339,10 @@ class PiconsDialog:
             return
 
         uris = data.get_uris()
-        if uris:
+        if len(uris) == 2:
             name, fav_id = self._current_picon_info
-            src, sep, dst = uris[0].partition("::::")
-            src = urlparse(unquote(src)).path
-            dst = "{}/{}".format(urlparse(unquote(dst)).path, name)
+            src = urlparse(unquote(uris[0])).path
+            dst = "{}/{}".format(urlparse(unquote(uris[1])).path, name)
             if src != dst:
                 shutil.copy(src, dst)
                 for row in get_base_model(self._picons_dest_view.get_model()):
@@ -394,7 +355,7 @@ class PiconsDialog:
 
     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 and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
+        if path:
             self.on_send(files_filter={path.name}, path=path.parent)
 
     def on_download_button_drag_data_received(self, button, drag_context, x, y, data, info, time):
@@ -409,9 +370,8 @@ class PiconsDialog:
 
     def get_path_from_uris(self, data):
         uris = data.get_uris()
-        if uris:
-            src, sep, dst = uris[0].partition("::::")
-            return Path(urlparse(unquote(src)).path).resolve()
+        if len(uris) == 2:
+            return Path(urlparse(unquote(uris[0])).path).resolve()
 
     def update_picon_in_lists(self, dst, fav_id):
         picon = get_picon_pixbuf(dst)
@@ -423,7 +383,7 @@ class PiconsDialog:
 
     def on_selective_send(self, view):
         path = self.get_selected_path(view)
-        if path and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
+        if path:
             self.on_send(files_filter={path.name}, path=path.parent)
 
     def on_selective_download(self, view):
@@ -476,7 +436,7 @@ class PiconsDialog:
                                             files_filter=files_filter), True)
 
     def on_remove(self, item=None, files_filter=None):
-        if show_dialog(DialogType.QUESTION, self._dialog) != Gtk.ResponseType.OK:
+        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return
 
         self.run_func(lambda: remove_picons(settings=self._settings,
@@ -503,280 +463,148 @@ class PiconsDialog:
 
     # ******************** Downloader ************************* #
 
-    def on_download_source_changed(self, button):
-        self._download_src = self.DownloadSource(button.get_active_id())
-        self.set_providers_header()
-        self._bouquet_filter_grid.set_sensitive(self._download_src is self.DownloadSource.PICON_CZ)
-        GLib.idle_add(self._providers_view.get_model().clear)
-        self.init_satellites(self._satellites_view)
-
     def on_satellites_view_realize(self, view):
-        self.set_providers_header()
         self.get_satellites(view)
 
-    def on_satellite_filter_toggled(self, button, state):
-        self.init_satellites(self._satellites_view)
-
-    def on_providers_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            return False
-
-        dest = view.get_dest_row_at_pos(x, y)
-        if not dest:
-            return False
-
-        path, pos = dest
-        model = view.get_model()
-        itr = model.get_iter(path)
-        logo_url = model.get_value(itr, 5)
-        if logo_url:
-            pix_data = self._picon_cz_downloader.get_logo_data(logo_url)
-            if pix_data:
-                pix = self.get_pixbuf(pix_data)
-                model.set_value(itr, 0, pix if pix else TV_ICON)
-                size = self._settings.tooltip_logo_size
-                tooltip.set_icon(self.get_pixbuf(pix_data, size, size))
-            else:
-                self.update_logo_data(itr, model, logo_url)
-        tooltip.set_text(model.get_value(itr, 1))
-        view.set_tooltip_row(tooltip, path)
-        return True
-
-    @run_task
-    def update_logo_data(self, itr, model, url):
-        pix_data = self._picon_cz_downloader.get_provider_logo(url)
-        if pix_data:
-            pix = self.get_pixbuf(pix_data)
-            GLib.idle_add(model.set_value, itr, 0, pix if pix else TV_ICON)
-
-    @run_idle
-    def set_providers_header(self):
-        msg = "{} [{}]"
-        tooltip = ""
-        if self._download_src is self.DownloadSource.PICON_CZ:
-            tooltip = "https://picon.cz (by Chocholoušek)"
-            msg = msg.format(get_message("Package"), tooltip)
-        elif self._download_src is self.DownloadSource.LYNG_SAT:
-            tooltip = "https://www.lyngsat.com"
-            msg = msg.format(get_message("Providers"), tooltip)
-        else:
-            msg = ""
-
-        self._provider_header_label.set_text(msg)
-        self._provider_header_label.set_tooltip_text(tooltip)
-
     @run_task
     def get_satellites(self, view):
-        self._sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
-        if not self._sats:
+        sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
+        if not sats:
             self.show_info_message("Getting satellites list error!", Gtk.MessageType.ERROR)
-
-        self._sat_names = {s[1]: s[0] for s in self._sats}  # position -> satellite name
-        self._picon_cz_downloader = PiconsCzDownloader(self._picon_ids, self.append_output)
-        self.init_satellites(view)
-
-    @run_task
-    def init_satellites(self, view):
-        sats = self._sats
-        if self._download_src is self.DownloadSource.PICON_CZ:
-            if not self._picon_cz_downloader:
-                return
-            try:
-                self._picon_cz_downloader.init()
-            except PiconsError as e:
-                self.show_info_message(str(e), Gtk.MessageType.ERROR)
-            else:
-                providers = self._picon_cz_downloader.providers
-                sats = ((self._sat_names.get(p, p), p, None, p, False) for p in providers)
         gen = self.append_satellites(view.get_model(), sats)
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
     def append_satellites(self, model, sats):
-        is_filter = self._satellite_filter_switch.get_active()
-        if model:
-            model.clear()
-
         try:
-            for sat in sorted(sats):
+            for sat in sats:
                 pos = sat[1]
-                name = "{} ({})".format(sat[0], pos)
-                if is_filter and pos not in self._sat_positions:
-                    continue
-                if not model:
-                    return
-                yield model.append((name, sat[3], pos))
+                name, pos = "{} ({})".format(sat[0], pos), "{}{}".format("-" if pos[-1] == "W" else "", pos[:-1])
+
+                if not self._terminate and model:
+                    if pos in self._sat_positions:
+                        yield model.append((name, sat[3], pos))
         finally:
             self._satellite_label.show()
 
     def on_satellite_selection(self, view, path, column):
-        self.on_info_bar_close()
-        model = self._providers_view.get_model()
-        model.clear()
-        self._satellite_label.set_visible(False)
-        self.get_providers(view.get_model()[path][1], model)
-
-    @run_task
-    def get_providers(self, url, model):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            providers = parse_providers(url)
-        elif self._download_src is self.DownloadSource.PICON_CZ:
-            providers = self._picon_cz_downloader.get_sat_providers(url)
-        else:
-            return
-
-        self.append_providers(providers or [], model)
+        model = view.get_model()
+        self._url_entry.set_text(model.get(model.get_iter(path), 1)[0])
 
     @run_idle
-    def append_providers(self, providers, model):
-        if self._download_src is self.DownloadSource.LYNG_SAT:
-            for p in providers:
-                model.append(p._replace(logo=self.get_pixbuf(p.logo) if p.logo else TV_ICON))
-        elif self._download_src is self.DownloadSource.PICON_CZ:
-            for p in providers:
-                logo_data = self._picon_cz_downloader.get_logo_data(p.ssid)
-                model.append(p._replace(logo=self.get_pixbuf(logo_data) if logo_data else TV_ICON))
+    def on_load_providers(self, item):
+        self._expander.set_expanded(True)
+        self.on_info_bar_close()
+        self._cancel_button.show()
+        url = self._url_entry.get_text()
 
-        self.update_receive_button_state()
-        GLib.idle_add(self._satellite_label.set_visible, True)
+        try:
+            self._current_process = subprocess.Popen(["wget", "-pkP", self._TMP_DIR, url],
+                                                     stdout=subprocess.PIPE,
+                                                     stderr=subprocess.PIPE,
+                                                     universal_newlines=True)
+        except FileNotFoundError as e:
+            self._cancel_button.hide()
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
+        else:
+            GLib.io_add_watch(self._current_process.stderr, GLib.IO_IN, self.write_to_buffer)
+            model = self._providers_view.get_model()
+            model.clear()
+            self.append_providers(url, model)
 
-    def get_pixbuf(self, img_data, w=48, h=32):
-        if img_data:
-            f = Gio.MemoryInputStream.new_from_data(img_data)
-            return GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, w, h, True, None)
+    @run_task
+    def append_providers(self, url, model):
+        self._current_process.wait()
+        try:
+            self._terminate = False
+            providers = parse_providers(self._TMP_DIR + url[url.find("w"):])
+        except FileNotFoundError:
+            pass  # NOP
+        else:
+            if providers:
+                for p in providers:
+                    if self._terminate:
+                        return
+                    model.append((self.get_pixbuf(p[0]) if p[0] else TV_ICON, *p[1:]))
+            self.update_receive_button_state()
+        finally:
+            GLib.idle_add(self._cancel_button.hide)
+            self._terminate = False
+
+    def get_pixbuf(self, img_url):
+        return GdkPixbuf.Pixbuf.new_from_file_at_scale(filename=self._TMP_DIR + "www.lyngsat.com/" + img_url,
+                                                       width=48, height=48, preserve_aspect_ratio=True)
 
     def on_receive(self, item):
-        if self._is_downloading:
+        self._cancel_button.show()
+        self.start_download()
+
+    @run_task
+    def start_download(self):
+        if self._current_process.poll() is None:
             self.show_dialog("The task is already running!", DialogType.ERROR)
             return
 
+        self._terminate = False
+        self._expander.set_expanded(True)
+
         providers = self.get_selected_providers()
-
-        if self._download_src is self.DownloadSource.PICON_CZ and len(providers) > 1:
-            self.show_dialog("Please, select only one item!", DialogType.ERROR)
-            return
-
-        self._cancel_button.show()
-        self.start_download(providers)
-
-    @run_task
-    def start_download(self, providers):
-        self._is_downloading = True
-        GLib.idle_add(self._expander.set_expanded, True)
-
         for prv in providers:
-            if self._download_src is self.DownloadSource.LYNG_SAT and not self._POS_PATTERN.match(prv[2]):
+            if not self._POS_PATTERN.match(prv[2]):
                 self.show_info_message(
                     get_message("Specify the correct position value for the provider!"), Gtk.MessageType.ERROR)
                 scroll_to(prv.path, self._providers_view)
                 return
 
         try:
-            picons_path = self._picons_dir_entry.get_text()
-            os.makedirs(os.path.dirname(picons_path), exist_ok=True)
-            self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
-            providers = (Provider(*p) for p in providers)
+            for prv in providers:
+                if self._terminate:
+                    return
+                self.process_provider(Provider(*prv))
 
-            if self._download_src is self.DownloadSource.LYNG_SAT:
-                self.get_picons_for_lyngsat(picons_path, providers)
-            elif self._download_src is self.DownloadSource.PICON_CZ:
-                self.get_picons_for_picon_cz(picons_path, providers)
+            if self._resize_no_radio_button.get_active():
+                self.resize(self._picons_dir_entry.get_text())
 
-            if not self._is_downloading:
-                return
-
-            if not self._resize_no_radio_button.get_active():
-                self.resize(picons_path)
+            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
         finally:
             GLib.idle_add(self._cancel_button.hide)
-            self._is_downloading = False
+            self._terminate = False
 
-    def get_picons_for_lyngsat(self, path, providers):
-        import concurrent.futures
+    def process_provider(self, prv):
+        url = prv.url
+        self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
+        self._current_process = subprocess.Popen(["wget", "-pkP", self._TMP_DIR, url],
+                                                 stdout=subprocess.PIPE,
+                                                 stderr=subprocess.PIPE,
+                                                 universal_newlines=True)
+        GLib.io_add_watch(self._current_process.stderr, GLib.IO_IN, self.write_to_buffer)
+        self._current_process.wait()
+        path = self._TMP_DIR + (url[url.find("//") + 2:] if prv.single else self._BASE_URL + url[url.rfind("/") + 1:])
+        PiconsParser.parse(path, self._picons_dir_entry.get_text(),
+                           self._TMP_DIR, prv, self._picon_ids, self.get_picons_format())
 
-        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-            picons = []
-            # Getting links to picons.
-            futures = {executor.submit(self.process_provider, p, path): p for p in providers}
-            for future in concurrent.futures.as_completed(futures):
-                if not self._is_downloading:
-                    executor.shutdown()
-                    return
-
-                pic = future.result()
-                if pic:
-                    picons.extend(pic)
-            # Getting picon images.
-            futures = {executor.submit(download_picon, *pic, self.append_output): pic for pic in picons}
-            done, not_done = concurrent.futures.wait(futures, timeout=0)
-            while self._is_downloading and not_done:
-                done, not_done = concurrent.futures.wait(not_done, timeout=5)
-
-            for future in not_done:
-                future.cancel()
-            concurrent.futures.wait(not_done)
-            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
-
-    def get_picons_for_picon_cz(self, path, providers):
-        p_ids = None
-        if self._bouquet_filter_switch.get_active():
-            p_ids = self.get_bouquet_picon_ids()
-            if not p_ids:
-                return
-
-        try:
-            # We download it sequentially.
-            for p in providers:
-                self._picon_cz_downloader.download(p, path, p_ids)
-        except PiconsError as e:
-            self.append_output("Error: {}\n".format(str(e)))
-            self.show_info_message(str(e), Gtk.MessageType.ERROR)
-        else:
-            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
-
-    def get_bouquet_picon_ids(self):
-        """ Returns picon ids for selected bouquet or None. """
-        bq_selected = self._app.check_bouquet_selection()
-        if not bq_selected:
-            return
-
-        model, paths = self._app.bouquets_view.get_selection().get_selected_rows()
-        if len(paths) > 1:
-            self.show_dialog("Please, select only one bouquet!", DialogType.ERROR)
-            return
-
-        fav_bouquet = self._app.current_bouquets[bq_selected]
-        services = self._app.current_services
-        return {services.get(fav_id).picon_id for fav_id in fav_bouquet}
-
-    def process_provider(self, prv, picons_path):
-        self.append_output("Getting links to picons for: {}.\n".format(prv.name))
-        return PiconsParser.parse(prv, picons_path, self._picon_ids, self.get_picons_format())
+    def write_to_buffer(self, fd, condition):
+        if condition == GLib.IO_IN:
+            char = fd.read(1)
+            self.append_output(char)
+            return True
+        return False
 
     @run_idle
     def append_output(self, char):
         append_text_to_tview(char, self._text_view)
 
-    @run_task
     def resize(self, path):
         self.show_info_message(get_message("Resizing..."), Gtk.MessageType.INFO)
-
+        command = "mogrify -resize {}! *.png".format(
+            "220x132" if self._resize_220_132_radio_button.get_active() else "100x60").split()
         try:
-            from pathlib import Path
-            from PIL import Image
-        except ImportError as e:
-            self.show_info_message("{} {}".format(get_message("Conversion error."), e), Gtk.MessageType.ERROR)
-        else:
-            res = (220, 132) if self._resize_220_132_radio_button.get_active() else (100, 60)
-
-            for img_file in Path(path).glob("*.png"):
-                img = Image.open(img_file)
-                img = img.resize(res, Image.ANTIALIAS)
-                img.save(img_file, "PNG", optimize=True)
-
-            self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
+            self._current_process = subprocess.Popen(command, universal_newlines=True, cwd=path)
+            self._current_process.wait()
+        except FileNotFoundError as e:
+            self.show_info_message("Conversion error. " + str(e), Gtk.MessageType.ERROR)
 
     def on_cancel(self, item=None):
-        if self._is_downloading and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
+        if self.is_task_running() and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return True
 
         self.terminate_task()
@@ -784,16 +612,18 @@ class PiconsDialog:
     @run_task
     def terminate_task(self):
         self._terminate = True
-        self._is_downloading = False
-        self.show_info_message(get_message("The task is canceled!"), Gtk.MessageType.WARNING)
+
+        if self._current_process:
+            self._current_process.terminate()
+            self.show_info_message(get_message("The task is canceled!"), Gtk.MessageType.WARNING)
 
     def on_close(self, window, event):
         if self.on_cancel():
             return True
 
         self._terminate = True
-        self._is_downloading = False
         self.save_window_size(window)
+        self.clean_data()
         self._app.update_picons()
         GLib.idle_add(self._dialog.destroy)
 
@@ -802,16 +632,22 @@ class PiconsDialog:
         height = size.height - self._text_view.get_allocated_height() - self._info_bar.get_allocated_height()
         self._settings.add("picons_downloader_window_size", (size.width, height))
 
+    @run_task
+    def clean_data(self):
+        path = self._TMP_DIR + "www.lyngsat.com"
+        if os.path.exists(path):
+            shutil.rmtree(path)
+
     @run_task
     def run_func(self, func, update=False):
         try:
             GLib.idle_add(self._expander.set_expanded, True)
-            GLib.idle_add(self._explorer_action_box.set_sensitive, False)
+            GLib.idle_add(self._header_download_box.set_sensitive, False)
             func()
         except OSError as e:
             self.show_info_message(str(e), Gtk.MessageType.ERROR)
         finally:
-            GLib.idle_add(self._explorer_action_box.set_sensitive, True)
+            GLib.idle_add(self._header_download_box.set_sensitive, True)
             if update:
                 self.on_picons_dest_changed(self._explorer_dest_path_button)
 
@@ -820,10 +656,9 @@ class PiconsDialog:
 
     @run_idle
     def show_info_message(self, text, message_type):
-        self._info_bar.set_visible(False)
-        self._message_label.set_text(get_message(text))
-        self._info_bar.set_message_type(message_type)
         self._info_bar.set_visible(True)
+        self._info_bar.set_message_type(message_type)
+        self._message_label.set_text(get_message(text))
 
     def on_picons_dir_open(self, entry, icon, event_button):
         update_entry_data(entry, self._dialog, settings=self._settings)
@@ -866,13 +701,8 @@ class PiconsDialog:
                 self._filter_binding.unbind()
                 self._app.filter_entry.set_text("")
 
-    @run_with_delay(0.5)
+    @run_with_delay(1)
     def on_picons_filter_changed(self, entry):
-        txt = entry.get_text().upper()
-        self._filter_cache.clear()
-        for s in self._app.current_services.values():
-            self._filter_cache[s.picon_id] = txt in s.service.upper()
-
         GLib.idle_add(self._picons_src_filter_model.refilter, priority=GLib.PRIORITY_LOW)
         GLib.idle_add(self._picons_dst_filter_model.refilter, priority=GLib.PRIORITY_LOW)
 
@@ -892,10 +722,11 @@ class PiconsDialog:
             return True
 
         txt = self._picons_filter_entry.get_text().upper()
-        return txt in t.upper() or self._filter_cache.get(t, False)
+        return txt in t.upper() or t in (
+            map(lambda s: s.picon_id, filter(lambda s: txt in s.service.upper(), self._app.current_services.values())))
 
     def on_picon_activated(self, view):
-        if self._info_toggle_button.get_active():
+        if self._info_check_button.get_active():
             model, path = view.get_selection().get_selected_rows()
             if not path:
                 return
@@ -923,20 +754,6 @@ class PiconsDialog:
                                                        get_message("System"), srv.system, get_message("Freq"), srv.freq,
                                                        ref)
 
-    def on_view_query_tooltip(self, view, x, y, keyboard_mode, tooltip):
-        dest = view.get_dest_row_at_pos(x, y)
-        if not dest:
-            return False
-
-        path, pos = dest
-        model = view.get_model()
-        row = model[path][:]
-        tooltip.set_icon(get_picon_pixbuf(row[-1], size=self._settings.tooltip_logo_size))
-        tooltip.set_text(row[1])
-        view.set_tooltip_row(tooltip, path)
-
-        return True
-
     def on_tree_view_key_press(self, view, event):
         key_code = event.hardware_keycode
         if not KeyboardKey.value_exist(key_code):
@@ -949,7 +766,7 @@ class PiconsDialog:
     def on_url_changed(self, entry):
         suit = self._PATTERN.search(entry.get_text())
         entry.set_name("GtkEntry" if suit else "digit-entry")
-        self._download_source_button.set_sensitive(suit if suit else False)
+        self._load_providers_button.set_sensitive(suit if suit else False)
 
     def on_position_edited(self, render, path, value):
         model = self._providers_view.get_model()
@@ -959,9 +776,9 @@ class PiconsDialog:
     def on_visible_page(self, stack: Gtk.Stack, param):
         name = stack.get_visible_child_name()
         self._convert_button.set_visible(name == "converter")
-        self._download_source_button.set_visible(name == "downloader")
+        self._load_providers_button.set_visible(name == "downloader")
         is_explorer = name == "explorer"
-        self._explorer_action_box.set_visible(is_explorer)
+        self._filter_button.set_visible(is_explorer)
         if is_explorer:
             self.on_picons_dest_changed(self._explorer_dest_path_button)
 
@@ -1006,6 +823,9 @@ class PiconsDialog:
 
         return picon_format
 
+    def is_task_running(self):
+        return self._current_process and self._current_process.poll() is None
+
 
 if __name__ == "__main__":
     pass

app/ui/satellites_dialog.py

@@ -1,18 +1,18 @@
-import concurrent.futures
 import re
 import time
+import concurrent.futures
 from math import fabs
 
 from gi.repository import GLib
 
-from app.commons import run_idle, run_task, log
+from app.commons import run_idle, run_task
 from app.eparser import get_satellites, write_satellites, Satellite, Transponder
 from app.eparser.ecommons import PLS_MODE, get_key_by_value
-from app.tools.satellites import SatellitesParser, SatelliteSource, ServicesParser
-from .dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
+from app.tools.satellites import SatellitesParser, SatelliteSource
+from .dialogs import show_dialog, DialogType, get_dialogs_string, get_chooser_dialog
 from .main_helper import move_items, scroll_to, append_text_to_tview, get_base_model, on_popup_menu
 from .search import SearchProvider
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, MOVE_KEYS, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, MOVE_KEYS, KeyboardKey, IS_GNOME_SESSION, MOD_MASK
 
 _UI_PATH = UI_RESOURCES_PATH + "satellites_dialog.glade"
 
@@ -44,10 +44,12 @@ class SatellitesDialog:
                     "on_resize": self.on_resize,
                     "on_quit": self.on_quit}
 
-        builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("satellites_editor_window", "satellites_tree_store", "popup_menu",
-                                       "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2",
-                                       "sat_editor_save_image", "sat_editor_update_image"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH),
+                                        ("satellites_editor_window", "satellites_tree_store", "popup_menu",
+                                         "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2"))
+        builder.connect_signals(handlers)
 
         self._window = builder.get_object("satellites_editor_window")
         self._window.set_transient_for(transient)
@@ -182,8 +184,7 @@ class SatellitesDialog:
                 model.set(edited_itr, {0: sat.name, 10: sat.flags, 11: sat.position})
             else:
                 index = self.get_sat_position_index(sat.position, model)
-                model.insert(None, index,
-                             [sat.name, None, None, None, None, None, None, None, None, None, sat.flags, sat.position])
+                model.insert(None, index, [sat.name, *self._aggr, sat.flags, sat.position])
                 scroll_to(index, view)
 
     def on_transponder(self, transponder=None, edited_itr=None):
@@ -208,8 +209,7 @@ class SatellitesDialog:
                                        4: tr.fec_inner, 5: tr.system, 6: tr.modulation,
                                        7: tr.pls_mode, 8: tr.pls_code, 9: tr.is_id})
             else:
-                row = ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner,
-                       tr.system, tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None]
+                row = ["Transponder:", *tr, None, None]
                 model, paths = view.get_selection().get_selected_rows()
                 itr = model.get_iter(paths[0])
                 view.expand_row(paths[0], 0)
@@ -253,22 +253,13 @@ class SatellitesDialog:
 
         return paths
 
-    @run_idle
-    def on_remove(self, view):
-        """ Removal of selected satellites and transponders.
-
-            The satellites are removed first! Then transponders.
-        """
+    @staticmethod
+    def on_remove(view):
         selection = view.get_selection()
         model, paths = selection.get_selected_rows()
-        itrs = [model.get_iter(path) for path in paths]
-        satellites = list(filter(model.iter_has_child, itrs))
-        if len(satellites):
-            # Removing selected satellites.
-            list(map(model.remove, satellites))
-        else:
-            # Removing selected transponders.
-            list(map(model.remove, itrs))
+
+        for itr in [model.get_iter(path) for path in paths]:
+            model.remove(itr)
 
     @run_idle
     def on_save(self, view):
@@ -288,7 +279,7 @@ class SatellitesDialog:
 
     @run_idle
     def on_update(self, item):
-        SatellitesUpdateDialog(self._window, self._settings, self._sat_view.get_model()).show()
+        SatellitesUpdateDialog(self._window, self._sat_view.get_model()).show()
 
     @staticmethod
     def parse_data(model, path, itr, sats):
@@ -315,8 +306,13 @@ class TransponderDialog:
     def __init__(self, transient, transponder: Transponder = None):
 
         handlers = {"on_entry_changed": self.on_entry_changed}
-        objects = ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store", "pls_mode_store")
-        builder = get_builder(_UI_PATH, handlers, use_str=True, objects=objects)
+
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("transponder_dialog", "pol_store", "fec_store", "mod_store", "system_store",
+                                         "pls_mode_store"))
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("transponder_dialog")
         self._dialog.set_transient_for(transient)
@@ -330,7 +326,7 @@ class TransponderDialog:
         self._pls_code_entry = builder.get_object("pls_code_entry")
         self._is_id_entry = builder.get_object("is_id_entry")
         # pattern for frequency and rate entries (only digits)
-        self._pattern = re.compile(r"\D")
+        self._pattern = re.compile("\D")
         # style
         self._style_provider = Gtk.CssProvider()
         self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
@@ -395,7 +391,10 @@ class SatelliteDialog:
     """ Shows dialog for adding or edit satellite """
 
     def __init__(self, transient, satellite: Satellite = None):
-        builder = get_builder(_UI_PATH, use_str=True, objects=("satellite_dialog", "side_store", "pos_adjustment"))
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("satellite_dialog", "side_store", "pos_adjustment"))
 
         self._dialog = builder.get_object("satellite_dialog")
         self._dialog.set_transient_for(transient)
@@ -429,17 +428,16 @@ class SatelliteDialog:
         return Satellite(name=name, flags="0", position=pos, transponders=None)
 
 
-# ********************** Update dialogs ************************ #
+# ***************** Satellite update dialog *******************#
 
-class UpdateDialog:
-    """ Base dialog for update satellites, transponders and services from the web."""
+class SatellitesUpdateDialog:
+    """ Dialog for update satellites over internet """
 
-    def __init__(self, transient, settings, title=None):
+    def __init__(self, transient, main_model):
         handlers = {"on_update_satellites_list": self.on_update_satellites_list,
-                    "on_receive_data": self.on_receive_data,
+                    "on_receive_satellites_list": self.on_receive_satellites_list,
                     "on_cancel_receive": self.on_cancel_receive,
-                    "on_satellite_toggled": self.on_satellite_toggled,
-                    "on_transponder_toggled": self.on_transponder_toggled,
+                    "on_selected_toggled": self.on_selected_toggled,
                     "on_info_bar_close": self.on_info_bar_close,
                     "on_filter_toggled": self.on_filter_toggled,
                     "on_find_toggled": self.on_find_toggled,
@@ -452,35 +450,26 @@ class UpdateDialog:
                     "on_search_up": self.on_search_up,
                     "on_quit": self.on_quit}
 
-        self._settings = settings
-        self._download_task = False
-        self._parser = None
-        self._size_name = "{}_window_size".format("_".join(re.findall("[A-Z][^A-Z]*", self.__class__.__name__))).lower()
-
-        builder = get_builder(UI_RESOURCES_PATH + "satellites_dialog.glade", handlers,
-                              objects=("satellites_update_window", "update_source_store", "update_sat_list_store",
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_file(UI_RESOURCES_PATH + "satellites_dialog.glade",
+                                      ("satellites_update_window", "update_source_store", "update_sat_list_store",
                                        "update_sat_list_model_filter", "update_sat_list_model_sort", "side_store",
                                        "pos_adjustment", "pos_adjustment2", "satellites_update_popup_menu",
-                                       "remove_selection_image", "sat_update_cancel_image", "sat_receive_image",
-                                       "sat_update_filter_image", "sat_update_search_image", "sat_update_image",
-                                       "update_transponder_store", "update_service_store"))
+                                       "remove_selection_image"))
+        builder.connect_signals(handlers)
 
         self._window = builder.get_object("satellites_update_window")
         self._window.set_transient_for(transient)
-        if title:
-            self._window.set_title(title)
-
-        self._transponder_paned = builder.get_object("sat_update_tr_paned")
+        self._main_model = main_model
+        # self._dialog.get_content_area().set_border_width(0)
         self._sat_view = builder.get_object("sat_update_tree_view")
-        self._transponder_view = builder.get_object("sat_update_tr_view")
-        self._service_view = builder.get_object("sat_update_srv_view")
         self._source_box = builder.get_object("source_combo_box")
         self._sat_update_expander = builder.get_object("sat_update_expander")
         self._text_view = builder.get_object("text_view")
-        self._receive_button = builder.get_object("receive_data_button")
+        self._receive_button = builder.get_object("receive_sat_list_tool_button")
         self._sat_update_info_bar = builder.get_object("sat_update_info_bar")
         self._info_bar_message_label = builder.get_object("info_bar_message_label")
-        self._receive_button.bind_property("visible", builder.get_object("cancel_data_button"), "visible", 4)
         # Filter
         self._filter_bar = builder.get_object("sat_update_filter_bar")
         self._from_pos_button = builder.get_object("from_pos_button")
@@ -496,31 +485,21 @@ class UpdateDialog:
                                                builder.get_object("sat_update_search_down_button"),
                                                builder.get_object("sat_update_search_up_button"))
 
-        window_size = self._settings.get(self._size_name)
-        if window_size:
-            self._window.resize(*window_size)
+        self._download_task = False
+        self._parser = None
 
     def show(self):
         self._window.show()
 
-    @property
-    def is_download(self):
-        return self._download_task
-
-    @is_download.setter
-    def is_download(self, value):
-        self._download_task = value
-        self._receive_button.set_visible(not value)
-
     @run_idle
     def on_update_satellites_list(self, item):
-        if self.is_download:
+        if self._download_task:
             show_dialog(DialogType.ERROR, self._window, "The task is already running!")
             return
 
         model = get_base_model(self._sat_view.get_model())
         model.clear()
-        self.is_download = True
+        self._download_task = True
         src = self._source_box.get_active()
         if not self._parser:
             self._parser = SatellitesParser()
@@ -529,16 +508,10 @@ class UpdateDialog:
 
     @run_task
     def get_sat_list(self, src, callback):
-        sat_src = SatelliteSource.FLYSAT
-        if src == 1:
-            sat_src = SatelliteSource.LYNGSAT
-        elif src == 2:
-            sat_src = SatelliteSource.KINGOFSAT
-
-        sats = self._parser.get_satellites_list(sat_src)
+        sats = self._parser.get_satellites_list(SatelliteSource.FLYSAT if src == 0 else SatelliteSource.LYNGSAT)
         if sats:
             callback(sats)
-        self.is_download = False
+        self._download_task = False
 
     @run_idle
     def append_satellites(self, sats):
@@ -547,16 +520,70 @@ class UpdateDialog:
             model.append(sat)
 
     @run_idle
-    def on_receive_data(self, item):
-        if self.is_download:
+    def on_receive_satellites_list(self, item):
+        if self._download_task:
             show_dialog(DialogType.ERROR, self._window, "The task is already running!")
             return
+        self.receive_satellites()
+
+    @run_task
+    def receive_satellites(self):
+        self._download_task = True
+        self.update_expander()
+        model = self._sat_view.get_model()
+        start = time.time()
+
+        with concurrent.futures.ProcessPoolExecutor(max_workers=4) as executor:
+            text = "Processing: {}\n"
+            sats = []
+            appender = self.append_output()
+            next(appender)
+            futures = {executor.submit(self._parser.get_satellite, sat[:-1]): sat for sat in [r for r in model if r[4]]}
+            for future in concurrent.futures.as_completed(futures):
+                if not self._download_task:
+                    self._download_task = True
+                    executor.shutdown()
+                    appender.send("\nCanceled\n")
+                    appender.close()
+                    self._download_task = False
+                    return
+                data = future.result()
+                appender.send(text.format(data[0]))
+                sats.append(data)
+
+            appender.send("-" * 75 + "\n")
+            appender.send("Consumed : {:0.0f}s, {} satellites received.".format(start - time.time(), len(sats)))
+            appender.close()
+
+            sats = {s[2]: s for s in sats}  # key = position, v = satellite
+
+            for row in self._main_model:
+                pos = row[-1]
+                if pos in sats:
+                    sat = sats.pop(pos)
+                    itr = row.iter
+                    self.update_satellite(itr, row, sat)
+
+            for sat in sats.values():
+                append_satellite(self._main_model, sat)
+
+            self._download_task = False
 
     @run_idle
     def update_expander(self):
         self._sat_update_expander.set_expanded(True)
         self._text_view.get_buffer().set_text("", 0)
 
+    @run_idle
+    def update_satellite(self, itr, row, sat):
+        if self._main_model.iter_has_child(itr):
+            children = row.iterchildren()
+            for ch in children:
+                self._main_model.remove(ch.iter)
+
+        for tr in sat[3]:
+            self._main_model.append(itr, ["Transponder:", *tr, None, None])
+
     def append_output(self):
         @run_idle
         def append(t):
@@ -569,15 +596,11 @@ class UpdateDialog:
     def on_cancel_receive(self, item=None):
         self._download_task = False
 
-    def on_satellite_toggled(self, toggle, path):
+    def on_selected_toggled(self, toggle, path):
         model = self._sat_view.get_model()
         self.update_state(model, path, not toggle.get_active())
         self.update_receive_button_state(self._filter_model)
 
-    def on_transponder_toggled(self, toggle, path):
-        model = self._transponder_view.get_model()
-        model.set_value(model.get_iter(path), 2, not toggle.get_active())
-
     @run_idle
     def update_receive_button_state(self, model):
         self._receive_button.set_sensitive((any(r[4] for r in model)))
@@ -602,7 +625,7 @@ class UpdateDialog:
         self._filter_positions = self.get_positions()
         self._filter_model.refilter()
 
-    def filter_function(self, model, itr, data):
+    def filter_function(self, model, iter, data):
         if self._filter_model is None or self._filter_model == "None":
             return True
 
@@ -613,7 +636,7 @@ class UpdateDialog:
         if from_pos > to_pos:
             from_pos, to_pos = to_pos, from_pos
 
-        return from_pos <= float(self._parser.get_position(model.get(itr, 1)[0])) <= to_pos
+        return from_pos <= float(self._parser.get_position(model.get(iter, 1)[0])) <= to_pos
 
     def get_positions(self):
         from_pos = round(self._from_pos_button.get_value(), 1) * (-1 if self._filter_from_combo_box.get_active() else 1)
@@ -646,309 +669,18 @@ class UpdateDialog:
         self._filter_model.get_model().set_value(itr, 4, select)
 
     def on_quit(self, window, event):
-        self._settings.add(self._size_name, window.get_size())
-        self.is_download = False
+        self._download_task = False
 
 
-class SatellitesUpdateDialog(UpdateDialog):
-    """ Dialog for update satellites from the web. """
-
-    def __init__(self, transient, settings, main_model):
-        super().__init__(transient=transient, settings=settings)
-
-        self._main_model = main_model
-
-    @run_idle
-    def on_receive_data(self, item):
-        if self.is_download:
-            show_dialog(DialogType.ERROR, self._window, "The task is already running!")
-            return
-
-        self.receive_satellites()
-
-    @run_task
-    def receive_satellites(self):
-        self.is_download = True
-        self.update_expander()
-        model = self._sat_view.get_model()
-        start = time.time()
-
-        with concurrent.futures.ProcessPoolExecutor(max_workers=4) as executor:
-            text = "Processing: {}\n"
-            sats = []
-            appender = self.append_output()
-            next(appender)
-            futures = {executor.submit(self._parser.get_satellite, sat[:-1]): sat for sat in [r for r in model if r[4]]}
-            for future in concurrent.futures.as_completed(futures):
-                if not self.is_download:
-                    self.is_download = True
-                    executor.shutdown()
-                    appender.send("\nCanceled\n")
-                    appender.close()
-                    self.is_download = False
-                    return
-                data = future.result()
-                appender.send(text.format(data[0]))
-                sats.append(data)
-
-            appender.send("-" * 75 + "\n")
-            appender.send("Consumed: {:0.0f}s, {} satellites received.".format(time.time() - start, len(sats)))
-            appender.close()
-
-            sats = {s[2]: s for s in sats}  # key = position, v = satellite
-
-            for row in self._main_model:
-                pos = row[-1]
-                if pos in sats:
-                    sat = sats.pop(pos)
-                    itr = row.iter
-                    self.update_satellite(itr, row, sat)
-
-            for sat in sats.values():
-                append_satellite(self._main_model, sat)
-
-            self.is_download = False
-
-    @run_idle
-    def update_satellite(self, itr, row, sat):
-        if self._main_model.iter_has_child(itr):
-            children = row.iterchildren()
-            for ch in children:
-                self._main_model.remove(ch.iter)
-
-        for tr in sat[3]:
-            self._main_model.append(itr, ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner,
-                                          tr.system, tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None])
-
-
-class ServicesUpdateDialog(UpdateDialog):
-    """ Dialog for updating services from the web. """
-
-    def __init__(self, transient, settings, callback):
-        super().__init__(transient=transient, settings=settings, title="Services update")
-
-        self._callback = callback
-        self._satellite_paths = {}
-        self._transponders = {}
-        self._services = {}
-        self._selected_transponders = set()
-        self._services_parser = ServicesParser(source=SatelliteSource.LYNGSAT)
-
-        self._transponder_paned.set_visible(True)
-        self._source_box.remove(0)
-        self._source_box.remove(1)
-        self._source_box.set_active(0)
-        # Transponder view popup menu
-        tr_popup_menu = Gtk.Menu()
-        select_all_item = Gtk.ImageMenuItem.new_from_stock("gtk-select-all")
-        select_all_item.connect("activate", lambda w: self.update_transponder_selection(True))
-        tr_popup_menu.append(select_all_item)
-        remove_selection_item = Gtk.ImageMenuItem.new_from_stock("gtk-undo")
-        remove_selection_item.set_label(get_message("Remove selection"))
-        remove_selection_item.connect("activate", lambda w: self.update_transponder_selection(False))
-        tr_popup_menu.append(remove_selection_item)
-        tr_popup_menu.show_all()
-
-        self._sat_view.connect("row-activated", self.on_activate_satellite)
-        self._transponder_view.connect("row-activated", self.on_activate_transponder)
-        self._transponder_view.connect("button-press-event", lambda w, e: on_popup_menu(tr_popup_menu, e))
-        self._transponder_view.connect("select_all", lambda w: self.update_transponder_selection(True))
-
-    @run_idle
-    def on_receive_data(self, item):
-        if self.is_download:
-            show_dialog(DialogType.ERROR, self._window, "The task is already running!")
-            return
-
-        self.receive_services()
-
-    @run_task
-    def receive_services(self):
-        self.is_download = True
-        self.update_expander()
-        model = self._sat_view.get_model()
-        appender = self.append_output()
-        next(appender)
-
-        start = time.time()
-        non_cached_sats = []
-        sat_names = {}
-        t_names = {}
-        t_urls = []
-        services = []
-
-        for r in (r for r in model if r[-1]):
-            if not self.is_download:
-                appender.send("\nCanceled\n")
-                return
-
-            sat, url = r[0], r[3]
-            trs = self._transponders.get(url, None)
-            if trs:
-                for t in filter(lambda tp: tp.url in self._selected_transponders, trs):
-                    t_urls.append(t.url)
-                    t_names[t.url] = t.text
-            else:
-                non_cached_sats.append(url)
-                sat_names[url] = sat
-
-        if non_cached_sats:
-            with concurrent.futures.ProcessPoolExecutor(max_workers=4) as executor:
-                futures = {executor.submit(self._services_parser.get_transponders_links, u): u for u in non_cached_sats}
-                for future in concurrent.futures.as_completed(futures):
-                    if not self.is_download:
-                        appender.send("\nCanceled.\n")
-                        self.is_download = False
-                        return
-
-                    appender.send("Getting transponders for: {}.\n".format(sat_names.get(futures[future])))
-                    for t in future.result():
-                        t_urls.append(t.url)
-                        t_names[t.url] = t.text
-
-                appender.send("-" * 75 + "\n")
-                appender.send("{} transponders received.\n\n".format(len(t_urls)))
-
-        non_cached_ts = []
-        for tr in t_urls:
-            srvs = self._services.get(tr)
-            services.extend(srvs) if srvs else non_cached_ts.append(tr)
-
-        if non_cached_ts:
-            with concurrent.futures.ProcessPoolExecutor(max_workers=4) as executor:
-                futures = {executor.submit(self._services_parser.get_transponder_services, u): u for u in non_cached_ts}
-                for future in concurrent.futures.as_completed(futures):
-                    if not self.is_download:
-                        appender.send("\nCanceled.\n")
-                        self.is_download = False
-                        return
-
-                    appender.send("Getting services for: {}.\n".format(t_names.get(futures[future], "")))
-                    list(map(services.append, future.result()))
-
-        appender.send("-" * 75 + "\n")
-        appender.send("Consumed: {:0.0f}s, {} services received.".format(time.time() - start, len(services)))
-
-        try:
-            from app.eparser.enigma.lamedb import LameDbReader
-            # Used for double checking!
-            reader = LameDbReader(path=None)
-            srvs = reader.get_services_list("".join(reader.get_services_lines(services)))
-        except ValueError as e:
-            log("ServicesUpdateDialog [on receive data] error: {}".format(e))
-        else:
-            self._callback(srvs)
-
-        self.is_download = False
-
-    @run_task
-    def get_sat_list(self, src, callback):
-        sats = self._parser.get_satellites_list(SatelliteSource.LYNGSAT)
-        if sats:
-            callback(sats)
-        self.is_download = False
-
-    def on_satellite_toggled(self, toggle, path):
-        model = self._sat_view.get_model()
-        self.update_state(model, path, not toggle.get_active())
-        self.update_receive_button_state(self._filter_model)
-
-        url = model.get_value(model.get_iter(path), 3)
-        selected = toggle.get_active()
-        transponders = self._transponders.get(url, None)
-
-        if transponders:
-            for t in transponders:
-                self._selected_transponders.add(t.url) if selected else self._selected_transponders.discard(t.url)
-
-    def on_transponder_toggled(self, toggle, path):
-        model = self._transponder_view.get_model()
-        itr = model.get_iter(path)
-        active = not toggle.get_active()
-        url = self.update_transponder_state(itr, model, active)
-
-        s_path = self._satellite_paths.get(url, None)
-        if s_path:
-            self.update_sat_state(model, s_path, active)
-
-    def update_sat_state(self, model, path, active):
-        sat_model = self._sat_view.get_model()
-        if active:
-            self.update_state(sat_model, path, active)
-        else:
-            self.update_state(sat_model, path, any((r[-1] for r in model)))
-        self.update_receive_button_state(self._filter_model)
-
-    def update_transponder_state(self, itr, model, active):
-        model.set_value(itr, 2, active)
-        url = model.get_value(itr, 1)
-        self._selected_transponders.add(url) if active else self._selected_transponders.discard(url)
-        return url
-
-    @run_task
-    def on_activate_satellite(self, view, path, column):
-        model = view.get_model()
-        itr = model.get_iter(path)
-        url, selected = model.get_value(itr, 3), model.get_value(itr, 4)
-        transponders = self._transponders.get(url, None)
-        if transponders is None:
-            GLib.idle_add(view.set_sensitive, False)
-            transponders = self._services_parser.get_transponders_links(url)
-            self._transponders[url] = transponders
-
-            for t in transponders:
-                t_url = t.url
-                self._satellite_paths[t_url] = path
-                self._selected_transponders.add(t_url) if selected else self._selected_transponders.discard(t_url)
-
-        self.append_transponders(self._transponder_view.get_model(), transponders)
-
-    @run_idle
-    def append_transponders(self, model, trs_list):
-        model.clear()
-        list(map(model.append, [(t.text, t.url, t.url in self._selected_transponders) for t in trs_list]))
-        self._sat_view.set_sensitive(True)
-
-    @run_task
-    def on_activate_transponder(self, view, path, column):
-        url = view.get_model()[path][1]
-        services = self._services.get(url, None)
-        if services is None:
-            GLib.idle_add(view.set_sensitive, False)
-            services = self._services_parser.get_transponder_services(url)
-            self._services[url] = services
-
-        self.append_services(self._service_view.get_model(), services)
-
-    @run_idle
-    def append_services(self, model, srv_list):
-        model.clear()
-        for s in srv_list:
-            model.append((None, s.service, s.package, s.service_type, str(s.ssid), None))
-
-        self._transponder_view.set_sensitive(True)
-
-    def update_transponder_selection(self, select):
-        m = self._transponder_view.get_model()
-        if not len(m):
-            return
-
-        s_path = self._satellite_paths.get({self.update_transponder_state(r.iter, m, select) for r in m}.pop(), None)
-        if s_path:
-            self.update_sat_state(m, s_path, select)
-
-
-# ************************* Commons ************************* #
-
+# ***************** Commons *******************#
 
 @run_idle
 def append_satellite(model, sat):
     """ Common function for append satellite to the model """
     name, flags, pos, transponders = sat
-    parent = model.append(None, [name, None, None, None, None, None, None, None, None, None, flags, pos])
-    for tr in transponders:
-        model.append(parent, ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner, tr.system,
-                              tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None])
+    parent = model.append(None, [name, *(None,) * 9, flags, pos])
+    for transponder in transponders:
+        model.append(parent, ["Transponder:", *transponder, None, None])
 
 
 if __name__ == "__main__":

app/ui/service_details_dialog.glade

@@ -1,38 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
-
-The MIT License (MIT)
-
-Copyright (c) 2018-2021 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
-
--->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellite list editor for GNU/Linux. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkListStore" id="fec_list_store">
     <columns>
       <!-- column-name fec -->
@@ -40,53 +9,40 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
       </row>
       <row>
-        <col id="0">1/2</col>
+        <col id="0" translatable="yes">1/2</col>
       </row>
       <row>
         <col id="0" translatable="yes">2/3</col>
       </row>
       <row>
-        <col id="0">3/4</col>
+        <col id="0" translatable="yes">3/4</col>
       </row>
       <row>
-        <col id="0">5/6</col>
+        <col id="0" translatable="yes">5/6</col>
       </row>
       <row>
-        <col id="0">7/8</col>
+        <col id="0" translatable="yes">7/8</col>
       </row>
       <row>
-        <col id="0">8/9</col>
+        <col id="0" translatable="yes">8/9</col>
       </row>
       <row>
-        <col id="0">3/5</col>
+        <col id="0" translatable="yes">3/5</col>
       </row>
       <row>
-        <col id="0">4/5</col>
+        <col id="0" translatable="yes">4/5</col>
       </row>
       <row>
-        <col id="0">6/7</col>
+        <col id="0" translatable="yes">6/7</col>
       </row>
       <row>
-        <col id="0">9/10</col>
+        <col id="0" translatable="yes">9/10</col>
       </row>
     </data>
   </object>
-  <object class="GtkComboBox" id="rate_lp_combo_box">
-    <property name="visible">True</property>
-    <property name="sensitive">False</property>
-    <property name="can_focus">False</property>
-    <property name="model">fec_list_store</property>
-    <property name="id_column">0</property>
-    <child>
-      <object class="GtkCellRendererText" id="rate_lp_cellrenderertext"/>
-      <attributes>
-        <attribute name="text">0</attribute>
-      </attributes>
-    </child>
-  </object>
   <object class="GtkListStore" id="invertion_list_store">
     <columns>
       <!-- column-name invertion -->
@@ -94,13 +50,13 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">Off</col>
+        <col id="0" translatable="yes">Off</col>
       </row>
       <row>
-        <col id="0">On</col>
+        <col id="0" translatable="yes">On</col>
       </row>
       <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
       </row>
     </data>
   </object>
@@ -111,19 +67,19 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
       </row>
       <row>
-        <col id="0">QPSK</col>
+        <col id="0" translatable="yes">QPSK</col>
       </row>
       <row>
-        <col id="0">8PSK</col>
+        <col id="0" translatable="yes">8PSK</col>
       </row>
       <row>
-        <col id="0">16APSK</col>
+        <col id="0" translatable="yes">16APSK</col>
       </row>
       <row>
-        <col id="0">32APSK</col>
+        <col id="0" translatable="yes">32APSK</col>
       </row>
     </data>
   </object>
@@ -134,13 +90,13 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">Off</col>
+        <col id="0" translatable="yes">Off</col>
       </row>
       <row>
-        <col id="0">On</col>
+        <col id="0" translatable="yes">On</col>
       </row>
       <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
       </row>
     </data>
   </object>
@@ -151,13 +107,13 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">Root</col>
+        <col id="0" translatable="yes">Root</col>
       </row>
       <row>
-        <col id="0">Gold</col>
+        <col id="0" translatable="yes">Gold</col>
       </row>
       <row>
-        <col id="0">Combo</col>
+        <col id="0" translatable="yes">Combo</col>
       </row>
     </data>
   </object>
@@ -168,16 +124,16 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">H</col>
+        <col id="0" translatable="yes">H</col>
       </row>
       <row>
-        <col id="0">V</col>
+        <col id="0" translatable="yes">V</col>
       </row>
       <row>
-        <col id="0">R</col>
+        <col id="0" translatable="yes">R</col>
       </row>
       <row>
-        <col id="0">L</col>
+        <col id="0" translatable="yes">L</col>
       </row>
     </data>
   </object>
@@ -188,20 +144,21 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">35%</col>
+        <col id="0" translatable="yes">35%</col>
       </row>
       <row>
-        <col id="0">25%</col>
+        <col id="0" translatable="yes">25%</col>
       </row>
       <row>
-        <col id="0">20%</col>
+        <col id="0" translatable="yes">20%</col>
       </row>
       <row>
-        <col id="0">Auto</col>
+        <col id="0" translatable="yes">Auto</col>
       </row>
     </data>
   </object>
   <object class="GtkAdjustment" id="sat_pos_adjustment">
+    <property name="lower">-180</property>
     <property name="upper">180</property>
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">10</property>
@@ -253,13 +210,26 @@ Author: Dmitriy Yefremov
     </columns>
     <data>
       <row>
-        <col id="0">DVB-S</col>
+        <col id="0" translatable="yes">DVB-S</col>
       </row>
       <row>
-        <col id="0">DVB-S2</col>
+        <col id="0" translatable="yes">DVB-S2</col>
       </row>
     </data>
   </object>
+  <object class="GtkComboBox" id="rate_lp_combo_box">
+    <property name="visible">True</property>
+    <property name="sensitive">False</property>
+    <property name="can_focus">False</property>
+    <property name="model">fec_list_store</property>
+    <property name="id_column">0</property>
+    <child>
+      <object class="GtkCellRendererText" id="rate_lp_cellrenderertext"/>
+      <attributes>
+        <attribute name="text">0</attribute>
+      </attributes>
+    </child>
+  </object>
   <object class="GtkDialog" id="service_details_dialog">
     <property name="use-header-bar">{use_header}</property>
     <property name="can_focus">False</property>
@@ -272,9 +242,44 @@ Author: Dmitriy Yefremov
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="gravity">center</property>
     <child type="titlebar">
       <placeholder/>
     </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Cancel</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="apply_button">
+        <property name="label">gtk-save</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Save current service</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="clicked" handler="on_save" swapped="no"/>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="create_button">
+        <property name="label">gtk-new</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="tooltip_text" translatable="yes">Create and save as new service</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="clicked" handler="on_create_new" swapped="no"/>
+      </object>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog_vbox">
         <property name="can_focus">False</property>
@@ -285,55 +290,6 @@ Author: Dmitriy Yefremov
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_cancel" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="apply_button">
-                <property name="label" translatable="yes">Apply</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Save current service</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_save" swapped="no"/>
-                <accelerator key="Return" signal="activate"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="create_button">
-                <property name="label" translatable="yes">Create</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Create and save as new service</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_create_new" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -358,7 +314,7 @@ Author: Dmitriy Yefremov
                 <property name="margin_right">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
+                <property name="spacing">2</property>
                 <child>
                   <object class="GtkGrid" id="srv_grid">
                     <property name="visible">True</property>
@@ -379,7 +335,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkEntry" id="name_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -401,7 +357,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkEntry" id="package_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -425,7 +381,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">10</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -470,7 +426,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">7</property>
                             <property name="max_width_chars">7</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                             <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                             <signal name="changed" handler="update_reference" swapped="no"/>
                           </object>
@@ -820,14 +776,10 @@ Author: Dmitriy Yefremov
                   <object class="GtkBox" id="flags_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">10</property>
                     <child>
                       <object class="GtkGrid" id="flags_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">10</property>
                         <property name="column_spacing">2</property>
                         <child>
                           <object class="GtkLabel" id="flags_label">
@@ -900,47 +852,6 @@ Author: Dmitriy Yefremov
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkBox" id="extra_flags_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkLabel" id="extra_pids_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Extra:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="extra_pids_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
-                            <property name="placeholder_text">c:000000,etc.</property>
-                            <signal name="changed" handler="on_extra_pids_entry_changed" swapped="no"/>
-                          </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="pack_type">end</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkGrid" id="caids_grid">
                         <property name="visible">True</property>
@@ -951,9 +862,9 @@ Author: Dmitriy Yefremov
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text">C:0000,C:a1b2,etc.</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="width_chars">15</property>
+                            <property name="max_width_chars">26</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                             <property name="placeholder_text" translatable="yes">C:0000,C:a1b2,etc.</property>
                             <signal name="changed" handler="on_cas_entry_changed" swapped="no"/>
                           </object>
@@ -978,7 +889,7 @@ Author: Dmitriy Yefremov
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -1056,7 +967,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1082,7 +993,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1161,7 +1072,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1181,6 +1092,21 @@ Author: Dmitriy Yefremov
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSpinButton" id="sat_pos_button">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="input_purpose">number</property>
+                        <property name="adjustment">sat_pos_adjustment</property>
+                        <property name="digits">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkLabel" id="tid_label">
                         <property name="visible">True</property>
@@ -1199,7 +1125,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">8</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1226,7 +1152,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">8</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1235,50 +1161,6 @@ Author: Dmitriy Yefremov
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkBox" id="sat_pos_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">1</property>
-                        <child>
-                          <object class="GtkSpinButton" id="sat_pos_button">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="input_purpose">number</property>
-                            <property name="adjustment">sat_pos_adjustment</property>
-                            <property name="digits">1</property>
-                            <property name="numeric">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="pos_side_box">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="active">0</property>
-                            <items>
-                              <item id="E">E</item>
-                              <item id="W">W</item>
-                            </items>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1435,7 +1317,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1461,7 +1343,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1487,7 +1369,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="primary_icon_stock">gtk-edit</property>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1616,7 +1498,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">10</property>
-                        <property name="icon_name">document-edit-symbolic</property>
+                        <property name="stock">gtk-edit</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1644,6 +1526,9 @@ Author: Dmitriy Yefremov
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+    </action-widgets>
   </object>
   <object class="GtkListStore" id="transponder_services_liststore">
     <columns>
@@ -1673,9 +1558,30 @@ Author: Dmitriy Yefremov
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="gravity">center</property>
     <child>
       <placeholder/>
     </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_no_button">
+        <property name="label">gtk-cancel</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="tr_services_ok_button">
+        <property name="label">gtk-ok</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+      </object>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="tr_services_dialog_vbox">
         <property name="can_focus">False</property>
@@ -1684,35 +1590,6 @@ Author: Dmitriy Yefremov
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkButton" id="tr_services_no_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="tr_services_ok_button">
-                <property name="label" translatable="yes">OK</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1739,7 +1616,7 @@ Author: Dmitriy Yefremov
                     <property name="margin_right">20</property>
                     <property name="margin_top">5</property>
                     <property name="margin_bottom">5</property>
-                    <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
+                     <property name="label" translatable="yes">Changes will be applied to all services of this transponder!
 Continue?</property>
                     <property name="justify">center</property>
                     <property name="lines">2</property>

app/ui/service_details_dialog.py

@@ -1,44 +1,15 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 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
-#
-
-
-import os
 import re
+import os
 
-from app.commons import run_idle, log
+from app.commons import run_idle
 from app.eparser import Service
-from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, get_key_by_value,
-                                  get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION,
-                                  TrType, SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, T_FEC,
-                                  HIERARCHY, A_MODULATION)
+from app.eparser.ecommons import MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, \
+    get_key_by_value, get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION, TrType, \
+    SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, HIERARCHY, T_FEC
 from app.settings import SettingsType
-from .dialogs import show_dialog, DialogType, Action, get_builder
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, IS_GNOME_SESSION
+from .dialogs import show_dialog, DialogType, Action, get_dialogs_string
 from .main_helper import get_base_model
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, CODED_ICON, Column
 
 _UI_PATH = UI_RESOURCES_PATH + "service_details_dialog.glade"
 
@@ -70,18 +41,19 @@ class ServiceDetailsDialog:
                     "on_tr_edit_toggled": self.on_tr_edit_toggled,
                     "update_reference": self.update_reference,
                     "on_cas_entry_changed": self.on_cas_entry_changed,
-                    "on_extra_pids_entry_changed": self.on_extra_pids_entry_changed,
                     "on_digit_entry_changed": self.on_digit_entry_changed,
-                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed,
-                    "on_cancel": lambda item: self._dialog.destroy()}
+                    "on_non_empty_entry_changed": self.on_non_empty_entry_changed}
 
-        builder = get_builder(_UI_PATH, handlers, use_str=True)
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION))
+        builder.connect_signals(handlers)
         self._builder = builder
 
         self._dialog = builder.get_object("service_details_dialog")
         self._dialog.set_transient_for(transient)
         self._s_type = settings.setting_type
-        self._tr_type = TrType.Satellite
+        self._tr_type = None
         self._satellites_xml_path = settings.data_local_path + "satellites.xml"
         self._picons_dir_path = settings.picons_local_path
         self._services_view = srv_view
@@ -98,7 +70,6 @@ class ServiceDetailsDialog:
         self._DIGIT_PATTERN = re.compile("\\D")
         self._NON_EMPTY_PATTERN = re.compile("(?:^[\\s]*$|\\D)")
         self._CAID_PATTERN = re.compile("(?:^[\\s]*$)|(C:[0-9a-fA-F]{1,4})(,C:[0-9a-fA-F]{1,4})*")
-        self._PIDS_PATTERN = re.compile("(?:^[\\s]*$)|(c:[0-9]{2}[0-9a-fA-F]{4})(,c:[0-9]{2}[0-9a-fA-F]{4})*")
         # Buttons
         self._apply_button = builder.get_object("apply_button")
         self._create_button = builder.get_object("create_button")
@@ -134,7 +105,6 @@ class ServiceDetailsDialog:
         self._stream_id_entry = self._digit_elements.get("stream_id_entry")
         self._tr_flag_entry = self._digit_elements.get("tr_flag_entry")
         self._namespace_entry = self._non_empty_elements.get("namespace_entry")
-        self._extra_pids_entry = builder.get_object("extra_pids_entry")
         # Service elements
         self._name_entry = builder.get_object("name_entry")
         self._package_entry = builder.get_object("package_entry")
@@ -149,7 +119,6 @@ class ServiceDetailsDialog:
         self._pids_grid = builder.get_object("pids_grid")
         # Transponder elements
         self._sat_pos_button = builder.get_object("sat_pos_button")
-        self._pos_side_box = builder.get_object("pos_side_box")
         self._pol_combo_box = builder.get_object("pol_combo_box")
         self._fec_combo_box = builder.get_object("fec_combo_box")
         self._rate_lp_combo_box = builder.get_object("rate_lp_combo_box")
@@ -167,7 +136,7 @@ class ServiceDetailsDialog:
         self._TRANSPONDER_ELEMENTS = (self._sat_pos_button, self._pol_combo_box, self._invertion_combo_box,
                                       self._sys_combo_box, self._freq_entry, self._transponder_id_entry,
                                       self._network_id_entry, self._namespace_entry, self._fec_combo_box,
-                                      self._rate_entry, self._rate_lp_combo_box, self._pos_side_box)
+                                      self._rate_entry, self._rate_lp_combo_box)
 
         if self._action is Action.EDIT:
             self.update_data_elements()
@@ -175,7 +144,12 @@ class ServiceDetailsDialog:
             self.init_default_data_elements()
 
     def show(self):
-        self._dialog.show()
+        response = self._dialog.run()
+        if response == Gtk.ResponseType.OK:
+            pass
+        self._dialog.destroy()
+
+        return response
 
     @run_idle
     def init_default_data_elements(self):
@@ -234,8 +208,6 @@ class ServiceDetailsDialog:
             self.update_ui_for_terrestrial()
         elif self._tr_type is TrType.Cable:
             self.update_ui_for_cable()
-        elif self._tr_type is TrType.ATSC:
-            self.update_ui_for_atsc()
         else:
             self.set_sat_positions(srv.pos)
 
@@ -275,7 +247,6 @@ class ServiceDetailsDialog:
     def init_enigma2_pids(self, flags):
         pids = list(filter(lambda x: x.startswith("c:"), flags))
         if pids:
-            extra_pids = []
             for pid in pids:
                 if pid.startswith(Pids.VIDEO.value):
                     self._video_pid_entry.set_text(str(int(pid[4:], 16)))
@@ -288,19 +259,15 @@ class ServiceDetailsDialog:
                 elif pid.startswith(Pids.AC3.value):
                     self._ac3_pid_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.VIDEO_TYPE.value):
-                    extra_pids.append(pid)
+                    pass
                 elif pid.startswith(Pids.AUDIO_CHANNEL.value):
-                    extra_pids.append(pid)
+                    pass
                 elif pid.startswith(Pids.BIT_STREAM_DELAY.value):
                     self._bitstream_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.PCM_DELAY.value):
                     self._pcm_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.SUBTITLE.value):
-                    extra_pids.append(pid)
-                else:
-                    extra_pids.append(pid)
-
-            self._extra_pids_entry.set_text(",".join(extra_pids))
+                    pass
 
     def init_enigma2_transponder_data(self, srv):
         """ Transponder data initialisation """
@@ -342,11 +309,6 @@ class ServiceDetailsDialog:
             self.select_active_text(self._pls_mode_combo_box, HIERARCHY.get(tr_data[7]))
             self.select_active_text(self._invertion_combo_box, Inversion(tr_data[8]).name)
             self.select_active_text(self._sys_combo_box, T_SYSTEM.get(tr_data[9]))
-        elif tr_type is TrType.ATSC:
-            self._sys_combo_box.set_active(0)
-            self.select_active_text(self._mod_combo_box, A_MODULATION.get(tr_data[2]))
-            self.select_active_text(self._invertion_combo_box, Inversion(tr_data[1]).name)
-
         # Should be called last to properly initialize the reference
         self._srv_type_entry.set_text(data[4])
 
@@ -373,8 +335,7 @@ class ServiceDetailsDialog:
 
     def set_sat_positions(self, sat_pos):
         """ Sat positions initialisation """
-        self._sat_pos_button.set_value(float(sat_pos[:-1]))
-        self._pos_side_box.set_active_id(sat_pos[-1:])
+        self._sat_pos_button.set_value(float(sat_pos))
 
     def on_system_changed(self, box):
         if not self._tr_edit_switch.get_active():
@@ -414,18 +375,18 @@ class ServiceDetailsDialog:
         if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return
 
-        if self.on_edit() if self._action is Action.EDIT else self.on_new():
-            self._dialog.destroy()
+        self.on_edit() if self._action is Action.EDIT else self.on_new()
+        self._dialog.destroy()
 
     def on_new(self):
         """ Create new service. """
+        service = self.get_service(*self.get_srv_data(), self.get_satellite_transponder_data())
         show_dialog(DialogType.ERROR, transient=self._dialog, text="Not implemented yet!")
-        return True
 
     def on_edit(self):
         """ Edit current service.  """
         fav_id, data_id = self.get_srv_data()
-        # Transponder
+        # transponder
         transponder = self._old_service.transponder
         if self._tr_edit_switch.get_active():
             try:
@@ -435,24 +396,17 @@ class ServiceDetailsDialog:
                     transponder = self.get_terrestrial_transponder_data()
                 elif self._tr_type is TrType.Cable:
                     transponder = self.get_cable_transponder_data()
-                elif self._tr_type is TrType.ATSC:
-                    transponder = self.get_atsc_transponder_data()
             except Exception as e:
-                log("Edit service error: {}".format(e))
+                print(e)
                 show_dialog(DialogType.ERROR, transient=self._dialog, text="Error getting transponder parameters!")
             else:
                 if self._transponder_services_iters:
-                    self.update_transponder_services(transponder, self.get_sat_position())
-        # Service
+                    self.update_transponder_services(transponder)
+        # service
         service = self.get_service(fav_id, data_id, transponder)
         old_fav_id = self._old_service.fav_id
         if old_fav_id != fav_id:
-            if fav_id in self._services:
-                msg = "{}\n\n\t{}".format("A similar service is already in this list!", "Are you sure?")
-                if show_dialog(DialogType.QUESTION, transient=self._dialog, text=msg) != Gtk.ResponseType.OK:
-                    return False
             self.update_bouquets(fav_id, old_fav_id)
-
         self._services[fav_id] = service
 
         if self._old_service.picon_id != service.picon_id:
@@ -460,7 +414,7 @@ class ServiceDetailsDialog:
 
         flags = service.flags_cas
         extra_data = {Column.SRV_TOOLTIP: None, Column.SRV_BACKGROUND: None}
-        if self._s_type is SettingsType.ENIGMA_2 and flags:
+        if flags:
             f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
             if f_flags and Flag.is_new(int(f_flags[0][2:])):
                 extra_data[Column.SRV_BACKGROUND] = self._new_color
@@ -469,7 +423,6 @@ class ServiceDetailsDialog:
         self._current_model.set(self._current_itr, {i: v for i, v in enumerate(service)})
         self.update_fav_view(self._old_service, service)
         self._old_service = service
-        return True
 
     def update_bouquets(self, fav_id, old_fav_id):
         self._services.pop(old_fav_id, None)
@@ -485,17 +438,14 @@ class ServiceDetailsDialog:
     def update_fav_view(self, old_service, new_service):
         model = self._fav_view.get_model()
         for row in filter(lambda r: old_service.fav_id == r[7], model):
-            itr = row.iter
-            if not model.get_value(itr, Column.FAV_BACKGROUND):
-                model.set_value(itr, Column.FAV_SERVICE, new_service.service)
-
-            model.set(itr, {Column.FAV_CODED: new_service.coded,
-                            Column.FAV_LOCKED: new_service.locked,
-                            Column.FAV_HIDE: new_service.hide,
-                            Column.FAV_TYPE: new_service.service_type,
-                            Column.FAV_POS: new_service.pos,
-                            Column.FAV_ID: new_service.fav_id,
-                            Column.FAV_PICON: new_service.picon})
+            model.set(row.iter, {1: new_service.coded,
+                                 2: new_service.service,
+                                 3: new_service.locked,
+                                 4: new_service.hide,
+                                 5: new_service.service_type,
+                                 6: new_service.pos,
+                                 7: new_service.fav_id,
+                                 8: new_service.picon})
 
     def update_picon_name(self, old_name, new_name):
         if not os.path.isdir(self._picons_dir_path):
@@ -537,9 +487,7 @@ class ServiceDetailsDialog:
         if self._s_type is SettingsType.ENIGMA_2:
             return self.get_enigma2_flags()
         elif self._s_type is SettingsType.NEUTRINO_MP:
-            flags = self._old_service.flags_cas.split(":")
-            flags[1] = self.get_sat_position()
-            return ":".join(flags)
+            return self._old_service.flags_cas
 
     def get_enigma2_flags(self):
         flags = ["p:{}".format(self._package_entry.get_text())]
@@ -569,9 +517,6 @@ class ServiceDetailsDialog:
         pcm_pid = self._pcm_entry.get_text()
         if pcm_pid:
             flags.append("{}{:04x}".format(Pids.PCM_DELAY.value, int(pcm_pid)))
-        extra_pids = self._extra_pids_entry.get_text()
-        if extra_pids:
-            flags.append(extra_pids)
         # flags
         f_flags = Flag.KEEP.value if self._keep_check_button.get_active() else 0
         f_flags = f_flags + Flag.HIDE.value if self._hide_check_button.get_active() else f_flags
@@ -594,9 +539,7 @@ class ServiceDetailsDialog:
             return fav_id, data_id
         elif self._s_type is SettingsType.NEUTRINO_MP:
             fav_id = self._NEUTRINO_FAV_ID.format(tr_id, net_id, ssid)
-            data_id = self._old_service.data_id.split(":")
-            data_id[1] = "{:x}".format(int(service_type))
-            return fav_id, ":".join(data_id)
+            return fav_id, self._old_service.data_id
 
     # ***************** Transponder ********************* #
 
@@ -604,27 +547,27 @@ class ServiceDetailsDialog:
         freq = self._freq_entry.get_text()
         fec = self._fec_combo_box.get_active_id()
         system = self._sys_combo_box.get_active_id()
-        o_srv = self._old_service
 
         if self._tr_type is TrType.Satellite or self._s_type is SettingsType.NEUTRINO_MP:
             freq = self._freq_entry.get_text()
             rate = self._rate_entry.get_text()
             pol = self._pol_combo_box.get_active_id()
-            pos = "{}{}".format(round(self._sat_pos_button.get_value(), 1), self._pos_side_box.get_active_id())
+            pos = str(round(self._sat_pos_button.get_value(), 1))
             return freq, rate, pol, fec, system, pos
-        elif self._tr_type in (TrType.Terrestrial, TrType.ATSC):
+        elif self._tr_type is TrType.Terrestrial:
+            o_srv = self._old_service
             return freq, o_srv.rate, o_srv.pol, fec, system, o_srv.pos
         elif self._tr_type is TrType.Cable:
+            o_srv = self._old_service
             return freq, self._rate_entry.get_text(), o_srv.pol, fec, o_srv.system, o_srv.pos
 
     def get_satellite_transponder_data(self):
         sys = self._sys_combo_box.get_active_id()
-        freq = "{}000".format(self._freq_entry.get_text())
-        rate = "{}000".format(self._rate_entry.get_text())
+        freq = self._freq_entry.get_text()
+        rate = self._rate_entry.get_text()
         pol = self.get_value_from_combobox_id(self._pol_combo_box, POLARIZATION)
         fec = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)
-        sat_pos = self.get_sat_position()
-
+        sat_pos = str(round(self._sat_pos_button.get_value(), 1)).replace(".", "")
         inv = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
         srv_sys = "0"  # !!!
 
@@ -648,17 +591,12 @@ class ServiceDetailsDialog:
             srv_sys = None
             return self._NEUTRINO_TRANSPONDER_DATA.format(tr_id, on_id, freq, inv, rate, fec, pol, mod, srv_sys)
 
-    def get_sat_position(self):
-        sat_pos = self._sat_pos_button.get_value() * (-1 if self._pos_side_box.get_active_id() == "W" else 1)
-        sat_pos = str(round(sat_pos, 1)).replace(".", "")
-        return sat_pos
-
     def get_terrestrial_transponder_data(self):
         tr_data = re.split("\s|:", self._old_service.transponder)
         # frequency, bandwidth, code rate HP, code rate LP, modulation, transmission mode, guard interval, hierarchy,
         # inversion, system, plp_id
         # Bandwidth -> Pol, Rate HP -> FEC, TransmissionMode -> Roll off, GuardInterval -> Pilot, Hierarchy -> Pls Mode
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
+        tr_data[1] = self._freq_entry.get_text()
         tr_data[2] = self.get_value_from_combobox_id(self._pol_combo_box, BANDWIDTH)
         tr_data[3] = self.get_value_from_combobox_id(self._fec_combo_box, T_FEC)
         tr_data[4] = self.get_value_from_combobox_id(self._rate_lp_combo_box, T_FEC)
@@ -668,50 +606,28 @@ class ServiceDetailsDialog:
         tr_data[8] = self.get_value_from_combobox_id(self._pls_mode_combo_box, HIERARCHY)
         tr_data[9] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
         tr_data[10] = self.get_value_from_combobox_id(self._sys_combo_box, T_SYSTEM)
-
         return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))
 
     def get_cable_transponder_data(self):
         tr_data = re.split("\s|:", self._old_service.transponder)
         # frequency, symbol_rate, modulation, inversion, fec_inner, system;
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
-        tr_data[2] = "{}000".format(self._rate_entry.get_text())
+        tr_data[1] = self._freq_entry.get_text()
+        tr_data[2] = self._rate_entry.get_text()
         tr_data[3] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
         tr_data[4] = self.get_value_from_combobox_id(self._mod_combo_box, C_MODULATION)
         tr_data[5] = self.get_value_from_combobox_id(self._fec_combo_box, FEC_DEFAULT)
         tr_data[6] = get_value_by_name(SystemCable, self._sys_combo_box.get_active_id())
-
         return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))
 
-    def get_atsc_transponder_data(self):
-        tr_data = re.split("\s|:", self._old_service.transponder)
-        # frequency, inversion, modulation, system
-        tr_data[1] = "{}000".format(self._freq_entry.get_text())
-        tr_data[2] = get_value_by_name(Inversion, self._invertion_combo_box.get_active_id())
-        tr_data[3] = self.get_value_from_combobox_id(self._mod_combo_box, A_MODULATION)
-
-        return "{} {}".format(tr_data[0], ":".join(tr_data[1:]))
-
-    def update_transponder_services(self, transponder, sat_pos):
+    def update_transponder_services(self, transponder):
         for itr in self._transponder_services_iters:
-            srv = self._current_model[itr][:]
+            srv = self._current_model[itr][:Column.SRV_TOOLTIP]
             srv[Column.SRV_FREQ], srv[Column.SRV_RATE], srv[Column.SRV_POL], srv[Column.SRV_FEC], srv[
                 Column.SRV_SYSTEM], srv[Column.SRV_POS] = self.get_transponder_values()
             srv[Column.SRV_TRANSPONDER] = transponder
-
-            fav_id = srv[Column.SRV_FAV_ID]
-            old_srv = self._services.pop(fav_id, None)
-            if not old_srv:
-                log("Update transponder services error: No service found for ID {}".format(srv[Column.SRV_FAV_ID]))
-                continue
-
-            if self._s_type is SettingsType.NEUTRINO_MP:
-                flags = srv[Column.SRV_CAS_FLAGS].split(":")
-                flags[1] = sat_pos
-                srv[Column.SRV_CAS_FLAGS] = ":".join(flags)
-
-            self._services[fav_id] = Service(*srv[:Column.SRV_TOOLTIP])
-            self._current_model.set_row(itr, srv)
+            srv = Service(*srv)
+            self._services[srv.fav_id] = self._services.pop(srv.fav_id)._replace(transponder=transponder)
+            self._current_model.set(itr, {i: v for i, v in enumerate(srv)})
 
     # ***************** Others *********************#
 
@@ -731,9 +647,6 @@ class ServiceDetailsDialog:
     def on_cas_entry_changed(self, entry):
         entry.set_name("GtkEntry" if self._CAID_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
 
-    def on_extra_pids_entry_changed(self, entry):
-        entry.set_name("GtkEntry" if self._PIDS_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
-
     def get_value_from_combobox_id(self, box: Gtk.ComboBox, dc: dict):
         cb_id = box.get_active_id()
         return get_key_by_value(dc, cb_id)
@@ -743,16 +656,16 @@ class ServiceDetailsDialog:
         if active and self._action is Action.EDIT:
             self._transponder_services_iters = []
             response = TransponderServicesDialog(self._dialog,
-                                                 self._services_view,
+                                                 self._current_model,
                                                  self._old_service.transponder,
                                                  self._transponder_services_iters).show()
-            if response == Gtk.ResponseType.CANCEL or response == Gtk.ResponseType.DELETE_EVENT:
+            if response == Gtk.ResponseType.CANCEL or response == -4:
                 switch.set_active(False)
                 self._transponder_services_iters = None
                 return
 
         self.update_dvb_s2_elements(active and (self._sys_combo_box.get_active_id() == "DVB-S2"
-                                                or self._old_service.transponder_type in "tca"))
+                                                or self._old_service.transponder_type in "tc"))
 
         for elem in self._TRANSPONDER_ELEMENTS:
             elem.set_sensitive(active)
@@ -766,8 +679,6 @@ class ServiceDetailsDialog:
                 return False
         if self._cas_entry.get_name() == self._DIGIT_ENTRY_NAME:
             return False
-        if self._extra_pids_entry.get_name() == self._DIGIT_ENTRY_NAME:
-            return False
         return True
 
     def update_reference(self, entry, event=None):
@@ -885,18 +796,6 @@ class ServiceDetailsDialog:
         self._transponder_id_entry.set_max_width_chars(8)
         self._network_id_entry.set_max_width_chars(8)
 
-    def update_ui_for_atsc(self):
-        self.update_ui_for_cable()
-        tr_grid = self._builder.get_object("tr_grid")
-        tr_grid.remove_column(1)
-        tr_grid.remove_column(1)
-        # Init models
-        fec_model, modulation_model, system_model = self.get_models_for_non_satellite()
-        system_model.append((TrType.ATSC.name,))
-        [modulation_model.append((v,)) for k, v in A_MODULATION.items()]
-        # Extra
-        self._namespace_entry.set_max_width_chars(25)
-
     def get_transponder_grid_for_non_satellite(self):
         self._pids_grid.set_visible(False)
         tr_grid = self._builder.get_object("tr_grid")
@@ -914,23 +813,23 @@ class ServiceDetailsDialog:
 
 
 class TransponderServicesDialog:
-    def __init__(self, transient, services_view, transponder, tr_iters):
-        builder = get_builder(_UI_PATH, use_str=True, objects=("tr_services_dialog", "transponder_services_liststore"))
+    def __init__(self, transient, model, transponder, tr_iters):
+        builder = Gtk.Builder()
+        builder.set_translation_domain(TEXT_DOMAIN)
+        builder.add_objects_from_string(get_dialogs_string(_UI_PATH).format(use_header=IS_GNOME_SESSION),
+                                        ("tr_services_dialog", "transponder_services_liststore"))
         self._dialog = builder.get_object("tr_services_dialog")
         self._dialog.set_transient_for(transient)
         self._srv_model = builder.get_object("transponder_services_liststore")
-        self.append_services(services_view, transponder, tr_iters)
+        self.append_services(model, transponder, tr_iters)
         builder.get_object("srv_list_dialog_info_bar").connect("response", lambda bar, resp: bar.hide())
 
-    def append_services(self, view, transponder, tr_iters):
-        model = view.get_model()
-        filter_model = model.get_model()
+    def append_services(self, model, transponder, tr_iters):
         for row in model:
             if row[Column.SRV_TRANSPONDER] == transponder:
                 self._srv_model.append((row[Column.SRV_SERVICE], row[Column.SRV_PACKAGE], row[Column.SRV_TYPE],
                                         row[Column.SRV_SSID], row[Column.SRV_FREQ], row[Column.SRV_POS]))
-                itr = model.get_iter(row.path)
-                tr_iters.append(filter_model.convert_iter_to_child_iter(model.convert_iter_to_child_iter(itr)))
+                tr_iters.append(model.get_iter(row.path))
 
     def show(self):
         response = self._dialog.run()

app/ui/settings_dialog.py

@@ -1,18 +1,25 @@
 import os
 import re
+from enum import Enum
 
 from app.commons import run_task, run_idle, log
 from app.connections import test_telnet, test_ftp, TestException, test_http, HttpApiException
-from app.settings import SettingsType, Settings, PlayStreamsMode, IS_WIN
-from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog, get_builder
+from app.settings import SettingsType, Settings, PlayStreamsMode
+from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog
 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
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON
 
 
 def show_settings_dialog(transient, options):
     return SettingsDialog(transient, options).show()
 
 
+class Property(Enum):
+    FTP = "ftp"
+    HTTP = "http"
+    TELNET = "telnet"
+
+
 class SettingsDialog:
     _DIGIT_ENTRY_NAME = "digit-entry"
     _DIGIT_PATTERN = re.compile("(?:^[\\s]*$|\\D)")
@@ -29,7 +36,6 @@ class SettingsDialog:
                     "on_set_color_switch": self.on_set_color_switch,
                     "on_force_bq_name": self.on_force_bq_name,
                     "on_http_mode_switch": self.on_http_mode_switch,
-                    "on_experimental_switch": self.on_experimental_switch,
                     "on_yt_dl_switch": self.on_yt_dl_switch,
                     "on_default_path_mode_switch": self.on_default_path_mode_switch,
                     "on_default_data_path_changed": self.on_default_data_path_changed,
@@ -43,6 +49,7 @@ class SettingsDialog:
                     "on_profile_set_default": self.on_profile_set_default,
                     "on_lang_changed": self.on_lang_changed,
                     "on_main_settings_visible": self.on_main_settings_visible,
+                    "on_network_settings_visible": self.on_network_settings_visible,
                     "on_http_use_ssl_toggled": self.on_http_use_ssl_toggled,
                     "on_click_mode_togged": self.on_click_mode_togged,
                     "on_play_mode_changed": self.on_play_mode_changed,
@@ -50,11 +57,10 @@ class SettingsDialog:
                     "on_apply_presets": self.on_apply_presets,
                     "on_digit_entry_changed": self.on_digit_entry_changed,
                     "on_view_popup_menu": self.on_view_popup_menu,
-                    "on_list_font_reset": self.on_list_font_reset,
                     "on_theme_changed": self.on_theme_changed,
                     "on_theme_add": self.on_theme_add,
                     "on_theme_remove": self.on_theme_remove,
-                    "on_appearance_changed": self.on_appearance_changed,
+                    "on_icon_theme_changed": self.on_icon_theme_changed,
                     "on_icon_theme_add": self.on_icon_theme_add,
                     "on_icon_theme_remove": self.on_icon_theme_remove}
 
@@ -64,7 +70,9 @@ class SettingsDialog:
         self._profiles = self._settings.profiles
         self._s_type = self._settings.setting_type
 
-        builder = get_builder(UI_RESOURCES_PATH + "settings_dialog.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "settings_dialog.glade")
+        builder.connect_signals(handlers)
 
         self._dialog = builder.get_object("settings_dialog")
         self._dialog.set_transient_for(transient)
@@ -75,13 +83,15 @@ class SettingsDialog:
         self._port_field = builder.get_object("port_field")
         self._login_field = builder.get_object("login_field")
         self._password_field = builder.get_object("password_field")
+        self._http_login_field = builder.get_object("http_login_field")
+        self._http_password_field = builder.get_object("http_password_field")
         self._http_port_field = builder.get_object("http_port_field")
         self._http_use_ssl_check_button = builder.get_object("http_use_ssl_check_button")
+        self._telnet_login_field = builder.get_object("telnet_login_field")
+        self._telnet_password_field = builder.get_object("telnet_password_field")
         self._telnet_port_field = builder.get_object("telnet_port_field")
         self._telnet_timeout_spin_button = builder.get_object("telnet_timeout_spin_button")
-        # Test
-        self._ftp_radio_button = builder.get_object("ftp_radio_button")
-        self._http_radio_button = builder.get_object("http_radio_button")
+        self._settings_stack = builder.get_object("settings_stack")
         # Paths
         self._services_field = builder.get_object("services_field")
         self._user_bouquet_field = builder.get_object("user_bouquet_field")
@@ -103,6 +113,7 @@ class SettingsDialog:
         self._support_ver5_switch = builder.get_object("support_ver5_switch")
         self._force_bq_name_switch = builder.get_object("force_bq_name_switch")
         # Streaming
+        header_separator = builder.get_object("header_separator")
         self._apply_presets_button = builder.get_object("apply_presets_button")
         self._transcoding_switch = builder.get_object("transcoding_switch")
         self._edit_preset_switch = builder.get_object("edit_preset_switch")
@@ -114,31 +125,27 @@ class SettingsDialog:
         self._audio_channels_combo_box = builder.get_object("audio_channels_combo_box")
         self._audio_sample_rate_combo_box = builder.get_object("audio_sample_rate_combo_box")
         self._audio_codec_combo_box = builder.get_object("audio_codec_combo_box")
+        self._apply_presets_button.bind_property("visible", header_separator, "visible")
         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._play_in_vlc_radio_button = builder.get_object("play_in_vlc_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")
         # Program
         self._before_save_switch = builder.get_object("before_save_switch")
         self._before_downloading_switch = builder.get_object("before_downloading_switch")
-        self._load_on_startup_switch = builder.get_object("load_on_startup_switch")
-        self._bouquet_hints_switch = builder.get_object("bouquet_hints_switch")
-        self._services_hints_switch = builder.get_object("services_hints_switch")
-        self._lang_combo_box = builder.get_object("lang_combo_box")
-        # Appearance
-        self._list_font_button = builder.get_object("list_font_button")
-        self._picons_size_button = builder.get_object("picons_size_button")
-        self._tooltip_logo_size_button = builder.get_object("tooltip_logo_size_button")
+        self._program_frame = builder.get_object("program_frame")
+        self._extra_support_grid = builder.get_object("extra_support_grid")
         self._colors_grid = builder.get_object("colors_grid")
         self._set_color_switch = builder.get_object("set_color_switch")
         self._new_color_button = builder.get_object("new_color_button")
         self._extra_color_button = builder.get_object("extra_color_button")
+        self._load_on_startup_switch = builder.get_object("load_on_startup_switch")
+        self._bouquet_hints_switch = builder.get_object("bouquet_hints_switch")
+        self._services_hints_switch = builder.get_object("services_hints_switch")
+        self._lang_combo_box = builder.get_object("lang_combo_box")
         # Extra
         self._support_http_api_switch = builder.get_object("support_http_api_switch")
         self._enable_yt_dl_switch = builder.get_object("enable_yt_dl_switch")
@@ -151,23 +158,16 @@ class SettingsDialog:
         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")
+        self._click_mode_zap_button.bind_property("sensitive", self._enable_send_to_switch, "sensitive")
+        self._enable_send_to_switch.bind_property("sensitive", builder.get_object("enable_send_to_label"), "sensitive")
+        self._extra_support_grid.bind_property("sensitive", builder.get_object("v5_support_grid"), "sensitive")
         self._enable_yt_dl_switch.bind_property("active", builder.get_object("yt_dl_update_box"), "sensitive")
-        self._enable_exp_switch.bind_property("active", builder.get_object("v5_support_box"), "sensitive")
-        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_http_box"), "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")
         # Profiles
         self._profile_view = builder.get_object("profile_tree_view")
         self._profile_add_button = builder.get_object("profile_add_button")
         self._profile_remove_button = builder.get_object("profile_remove_button")
         self._apply_profile_button = builder.get_object("apply_profile_button")
+        self._apply_profile_button.bind_property("visible", header_separator, "visible")
         self._apply_profile_button.bind_property("visible", builder.get_object("reset_button"), "visible")
         # Style
         self._style_provider = Gtk.CssProvider()
@@ -180,29 +180,26 @@ class SettingsDialog:
         self.init_ui_elements(self._s_type)
         self.init_profiles()
 
-        if IS_WIN:
-            self._gst_lib_button.set_visible(False)
-            # Themes
-            enable_exp = self._settings.is_enable_experimental
-            builder.get_object("style_frame").set_visible(enable_exp)
-            builder.get_object("themes_support_frame").set_visible(enable_exp)
-            self._layout_switch = builder.get_object("layout_switch")
-            self._layout_switch.set_active(self._ext_settings.alternate_layout)
-            self._theme_frame = builder.get_object("theme_frame")
-            self._theme_frame.set_visible(enable_exp)
+        if self._settings.is_darwin:
+            # Appearance
+            self._appearance_box = builder.get_object("appearance_box")
+            self._appearance_box.set_visible(True)
             self._theme_thumbnail_image = builder.get_object("theme_thumbnail_image")
             self._theme_combo_box = builder.get_object("theme_combo_box")
             self._icon_theme_combo_box = builder.get_object("icon_theme_combo_box")
-            self._dark_mode_switch = builder.get_object("dark_mode_switch")
             self._themes_support_switch = builder.get_object("themes_support_switch")
-            self._themes_support_switch.bind_property("active", self._theme_frame, "sensitive")
-            self.init_themes()
+            self._themes_support_switch.bind_property("active", builder.get_object("gtk_theme_frame"), "sensitive")
+            self._themes_support_switch.bind_property("active", builder.get_object("icon_theme_frame"), "sensitive")
+            self.init_appearance()
 
     @run_idle
     def init_ui_elements(self, s_type):
         is_enigma_profile = s_type is SettingsType.ENIGMA_2
         self._neutrino_radio_button.set_active(s_type is SettingsType.NEUTRINO_MP)
-        self.update_title()
+        self.update_header_bar()
+        self._settings_stack.get_child_by_name(Property.HTTP.value).set_visible(is_enigma_profile)
+        self._program_frame.set_sensitive(is_enigma_profile)
+        self._extra_support_grid.set_sensitive(is_enigma_profile)
         http_active = self._support_http_api_switch.get_active()
         self._click_mode_zap_button.set_sensitive(is_enigma_profile and http_active)
         self._lang_combo_box.set_active_id(self._ext_settings.language)
@@ -220,12 +217,12 @@ class SettingsDialog:
                 self.on_profile_selected(self._profile_view, False)
         self._profile_remove_button.set_sensitive(len(self._profile_view.get_model()) > 1)
 
-    def update_title(self):
-        title = "{} [{}]"
+    def update_header_bar(self):
+        label, sep, st = self._header_bar.get_subtitle().partition(":")
         if self._s_type is SettingsType.ENIGMA_2:
-            self._dialog.set_title(title.format(get_message("Options"), self._enigma_radio_button.get_label()))
+            self._header_bar.set_subtitle("{}: {}".format(label, self._enigma_radio_button.get_label()))
         elif self._s_type is SettingsType.NEUTRINO_MP:
-            self._dialog.set_title(title.format(get_message("Options"), self._neutrino_radio_button.get_label()))
+            self._header_bar.set_subtitle("{}: {}".format(label, self._neutrino_radio_button.get_label()))
 
     def show(self):
         self._dialog.run()
@@ -258,8 +255,12 @@ class SettingsDialog:
         self._port_field.set_text(self._settings.port)
         self._login_field.set_text(self._settings.user)
         self._password_field.set_text(self._settings.password)
+        self._http_login_field.set_text(self._settings.http_user)
+        self._http_password_field.set_text(self._settings.http_password)
         self._http_port_field.set_text(self._settings.http_port)
         self._http_use_ssl_check_button.set_active(self._settings.http_use_ssl)
+        self._telnet_login_field.set_text(self._settings.telnet_user)
+        self._telnet_password_field.set_text(self._settings.telnet_password)
         self._telnet_port_field.set_text(self._settings.telnet_port)
         self._telnet_timeout_spin_button.set_value(self._settings.telnet_timeout)
         self._services_field.set_text(self._settings.services_path)
@@ -275,7 +276,6 @@ class SettingsDialog:
         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._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)
@@ -283,12 +283,8 @@ class SettingsDialog:
         self._transcoding_switch.set_active(self._settings.activate_transcoding)
         self._presets_combo_box.set_active_id(self._settings.active_preset)
         self.on_transcoding_preset_changed(self._presets_combo_box)
-        self._picons_size_button.set_active_id(str(self._settings.list_picon_size))
-        self._tooltip_logo_size_button.set_active_id(str(self._settings.tooltip_logo_size))
-        self._list_font_button.set_font(self._settings.list_font)
 
         if self._s_type is SettingsType.ENIGMA_2:
-            self._enable_exp_switch.set_active(self._settings.is_enable_experimental)
             self._support_ver5_switch.set_active(self._settings.v5_support)
             self._force_bq_name_switch.set_active(self._settings.force_bq_names)
             self._support_http_api_switch.set_active(self._settings.http_api_support)
@@ -319,8 +315,12 @@ class SettingsDialog:
         self._settings.port = self._port_field.get_text()
         self._settings.user = self._login_field.get_text()
         self._settings.password = self._password_field.get_text()
+        self._settings.http_user = self._http_login_field.get_text()
+        self._settings.http_password = self._http_password_field.get_text()
         self._settings.http_port = self._http_port_field.get_text()
         self._settings.http_use_ssl = self._http_use_ssl_check_button.get_active()
+        self._settings.telnet_user = self._telnet_login_field.get_text()
+        self._settings.telnet_password = self._telnet_password_field.get_text()
         self._settings.telnet_port = self._telnet_port_field.get_text()
         self._settings.telnet_timeout = int(self._telnet_timeout_spin_button.get_value())
         self._settings.services_path = self._services_field.get_text()
@@ -341,7 +341,6 @@ class SettingsDialog:
         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.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()
@@ -351,18 +350,13 @@ class SettingsDialog:
         self._ext_settings.records_path = self._record_data_dir_field.get_text()
         self._ext_settings.activate_transcoding = self._transcoding_switch.get_active()
         self._ext_settings.active_preset = self._presets_combo_box.get_active_id()
-        self._ext_settings.list_picon_size = int(self._picons_size_button.get_active_id())
-        self._ext_settings.tooltip_logo_size = int(self._tooltip_logo_size_button.get_active_id())
-        self._ext_settings.list_font = self._list_font_button.get_font()
 
-        if IS_WIN:
-            self._ext_settings.alternate_layout = self._layout_switch.get_active()
+        if self._ext_settings.is_darwin:
             self._ext_settings.is_themes_support = self._themes_support_switch.get_active()
             self._ext_settings.theme = self._theme_combo_box.get_active_id()
             self._ext_settings.icon_theme = self._icon_theme_combo_box.get_active_id()
 
         if self._s_type is SettingsType.ENIGMA_2:
-            self._ext_settings.is_enable_experimental = self._enable_exp_switch.get_active()
             self._ext_settings.use_colors = self._set_color_switch.get_active()
             self._ext_settings.new_color = self._new_color_button.get_rgba().to_string()
             self._ext_settings.extra_color = self._extra_color_button.get_rgba().to_string()
@@ -382,15 +376,16 @@ class SettingsDialog:
         if self._test_spinner.get_state() is Gtk.StateType.ACTIVE:
             return
         self.show_spinner(True)
-        if self._ftp_radio_button.get_active():
-            self.test_ftp()
-        elif self._http_radio_button.get_active():
+        current_property = Property(self._settings_stack.get_visible_child_name())
+        if current_property is Property.HTTP:
             self.test_http()
-        else:
+        elif current_property is Property.TELNET:
             self.test_telnet()
+        elif current_property is Property.FTP:
+            self.test_ftp()
 
     def test_http(self):
-        user, password = self._login_field.get_text(), self._password_field.get_text()
+        user, password = self._http_login_field.get_text(), self._http_password_field.get_text()
         host, port = self._host_field.get_text(), self._http_port_field.get_text()
         use_ssl = self._http_use_ssl_check_button.get_active()
         try:
@@ -405,7 +400,7 @@ class SettingsDialog:
     def test_telnet(self):
         timeout = int(self._telnet_timeout_spin_button.get_value())
         host, port = self._host_field.get_text(), self._telnet_port_field.get_text()
-        user, password = self._login_field.get_text(), self._password_field.get_text()
+        user, password = self._telnet_login_field.get_text(), self._telnet_password_field.get_text()
         try:
             self.show_info_message(test_telnet(host, port, user, password, timeout), Gtk.MessageType.INFO)
             self.show_spinner(False)
@@ -447,12 +442,6 @@ class SettingsDialog:
                 self._click_mode_zap_and_play_button.get_active())):
             self._click_mode_disabled_button.set_active(True)
 
-    def on_experimental_switch(self, switch, state):
-        if not state:
-            self._support_ver5_switch.set_active(state)
-            self._enable_send_to_switch.set_active(state)
-            self._enable_yt_dl_switch.set_active(state)
-
     def on_force_bq_name(self, switch, state):
         if self._main_stack.get_visible_child_name() != "extra":
             return
@@ -571,6 +560,9 @@ class SettingsDialog:
         self._apply_profile_button.set_visible(name == "profiles")
         self._apply_presets_button.set_visible(name == "streaming")
 
+    def on_network_settings_visible(self, stack, param):
+        self._http_use_ssl_check_button.set_visible(Property(stack.get_visible_child_name()) is Property.HTTP)
+
     def on_http_use_ssl_toggled(self, button):
         active = button.get_active()
         self._settings.http_use_ssl = active
@@ -610,48 +602,29 @@ class SettingsDialog:
         return 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_sensitive(not self._settings.is_darwin)
         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._play_in_vlc_radio_button.set_active(mode is PlayStreamsMode.VLC)
         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._play_in_vlc_radio_button.get_active():
+            return PlayStreamsMode.VLC
         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"
-
     def on_transcoding_preset_changed(self, button):
         presets = self._settings.transcoding_presets
         prs = presets.get(button.get_active_id())
@@ -696,11 +669,6 @@ class SettingsDialog:
         if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_SECONDARY:
             menu.popup(None, None, None, None, event.button, event.time)
 
-    def on_list_font_reset(self, button):
-        self._list_font_button.set_font(APP_FONT)
-
-    # ******************* Themes *********************** #
-
     def on_theme_changed(self, button):
         if self._main_stack.get_visible_child_name() != "appearance":
             return
@@ -717,11 +685,9 @@ class SettingsDialog:
         self.add_theme(self._ext_settings.themes_path, self._theme_combo_box)
 
     def on_theme_remove(self, button):
-        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
-            Gtk.Settings().get_default().set_property("gtk-theme-name", "")
-            self.remove_theme(self._theme_combo_box, self._ext_settings.themes_path)
+        self.remove_theme(self._theme_combo_box, self._ext_settings.themes_path)
 
-    def on_appearance_changed(self, button, state=False):
+    def on_icon_theme_changed(self, button, state=False):
         if self._main_stack.get_visible_child_name() != "appearance":
             return
         self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
@@ -730,32 +696,28 @@ class SettingsDialog:
         self.add_theme(self._ext_settings.icon_themes_path, self._icon_theme_combo_box)
 
     def on_icon_theme_remove(self, button):
-        if show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.OK:
-            Gtk.Settings().get_default().set_property("gtk-icon-theme-name", "")
-            self.remove_theme(self._icon_theme_combo_box, self._ext_settings.icon_themes_path)
+        self.remove_theme(self._icon_theme_combo_box, self._ext_settings.icon_themes_path)
 
     @run_idle
     def add_theme(self, path, button):
         response = get_chooser_dialog(self._dialog, self._settings, "Themes Archive [*.xz, *.zip]", ("*.xz", "*.zip"))
         if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
             return
-        self._theme_frame.set_sensitive(False)
+        self._appearance_box.set_sensitive(False)
         self.unpack_theme(response, path, button)
 
     @run_task
     def unpack_theme(self, src, dst, button):
         try:
-            os.makedirs(os.path.dirname(dst), exist_ok=True)
+            from shutil import unpack_archive
 
-            import subprocess
-            log("Unpacking '{}' started...".format(src))
-            p = subprocess.Popen(["tar", "-xvf", src, "-C", dst],
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-            p.communicate()
-            log("Unpacking end.")
-        finally:
+            unpack_archive(src, dst)
+        except (KeyError, EOFError) as e:
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
+        else:
             self.update_theme_button(button, dst)
+        finally:
+            self._appearance_box.set_sensitive(True)
 
     @run_idle
     def update_theme_button(self, button, dst):
@@ -768,7 +730,6 @@ class SettingsDialog:
                 button.append(theme, theme)
                 button.set_active_id(theme)
         self.show_info_message("Done!", Gtk.MessageType.INFO)
-        self._theme_frame.set_sensitive(True)
 
     @run_idle
     def remove_theme(self, button, path):
@@ -777,6 +738,9 @@ class SettingsDialog:
             self.show_info_message("No selected item!", Gtk.MessageType.ERROR)
             return
 
+        if show_dialog(DialogType.QUESTION, self._dialog) != Gtk.ResponseType.OK:
+            return
+
         from shutil import rmtree
 
         try:
@@ -784,15 +748,11 @@ class SettingsDialog:
         except OSError as e:
             self.show_info_message(str(e), Gtk.MessageType.ERROR)
         else:
-            self.theme_button_remove_active(button)
+            button.remove(button.get_active())
+            button.set_active(0)
 
     @run_idle
-    def theme_button_remove_active(self, button):
-        button.remove(button.get_active())
-        button.set_active(0)
-
-    @run_idle
-    def init_themes(self):
+    def init_appearance(self):
         t_support = self._ext_settings.is_themes_support
         self._themes_support_switch.set_active(t_support)
         if t_support:

app/ui/style.css

@@ -7,37 +7,6 @@
   margin: 1px;
 }
 
-paned > separator {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: 2px 24px;
-}
-
-.red-button {
-  background-image: none;
-  background-color: red;
-}
-
-.green-button {
-  background-image: none;
-  background-color: green;
-}
-
-.yellow-button {
-  background-image: none;
-  background-color: yellow;
-}
-
-.blue-button {
-  background-image: none;
-  background-color: blue;
-}
-
-.time-entry {
-  padding: 0px;
-  margin: 0px;
-}
-
 .group {}
 
 .group :first-child {
@@ -48,18 +17,10 @@ paned > separator {
 .group :last-child {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  border-left-width: 0;
 }
 
 .group :not(:first-child):not(:last-child) {
   border-radius: 0;
   border-left-width: 0;
-  border-right-width: 1px;
-}
-
-.stack-switcher > button {
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  min-width: 5em;
-  min-height: 1.5em;
-}
+  border-right-width: 0;
+}

app/ui/telnet.glade

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 
-
-The MIT License (MIT)
-
-Copyright (c) 2018-2020 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
-
--->
-<interface domain="demon-editor">
-  <requires lib="gtk+" version="3.16"/>
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkTextTagTable" id="tag_table">
-    <child type="tag">
-      <object class="GtkTextTag" id="end_tag">
-        <property name="font">Normal</property>
-        <property name="editable">False</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkTextBuffer" id="text_buffer">
-    <property name="tag_table">tag_table</property>
-  </object>
-  <object class="GtkWindow" id="dialog_window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">DemonEditor [Telnet client]</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">terminal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <signal name="delete-event" handler="on_close" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkBox" id="main_box">
-        <property name="width_request">560</property>
-        <property name="height_request">320</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkScrolledWindow" id="telnet_scrolled_window">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTextView" id="text_view">
-                <property name="name">textview-large</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="wrap_mode">char</property>
-                <property name="left_margin">5</property>
-                <property name="right_margin">5</property>
-                <property name="buffer">text_buffer</property>
-                <property name="overwrite">True</property>
-                <property name="input_hints">GTK_INPUT_HINT_WORD_COMPLETION | GTK_INPUT_HINT_NONE</property>
-                <property name="monospace">True</property>
-                <signal name="key-press-event" handler="on_view_key_press" swapped="no"/>
-                <signal name="realize" handler="on_text_view_realize" 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="commands_entry">
-            <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">2</property>
-            <property name="spacing">2</property>
-            <child>
-              <object class="GtkComboBoxText" id="profile_combo_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="active">0</property>
-                <property name="has_frame">False</property>
-                <signal name="changed" handler="on_profile_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="connect_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Connect</property>
-                <signal name="clicked" handler="on_connect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="connect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-connect</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="disconnect_button">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Disconnect</property>
-                <signal name="clicked" handler="on_disconnect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="disconnect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-disconnect</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="center">
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="clear_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Clear</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_clear" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="clear_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-clear</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkInfoBar" id="info_bar">
-            <property name="app_paintable">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">2</property>
-            <property name="show_close_button">True</property>
-            <signal name="response" handler="on_info_bar_close" swapped="no"/>
-            <child internal-child="action_area">
-              <object class="GtkButtonBox">
-                <property name="can_focus">False</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child internal-child="content_area">
-              <object class="GtkBox">
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="info_bar_message_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">Info</property>
-                    <property name="justify">center</property>
-                    <property name="wrap">True</property>
-                    <property name="wrap_mode">word-char</property>
-                    <property name="lines">2</property>
-                  </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">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

app/ui/telnet.py

@@ -1,256 +0,0 @@
-import re
-import selectors
-import socket
-from collections import deque
-from telnetlib import Telnet
-
-from gi.repository import GLib
-
-from app.commons import run_task, run_idle, log
-from app.settings import Settings
-from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
-
-
-class ExtTelnet(Telnet):
-
-    def __init__(self, output_callback, **kwargs):
-        super().__init__(**kwargs)
-        self._output_callback = output_callback
-
-    def interact(self):
-        """Interaction function, emulates a very dumb telnet client."""
-        with selectors.DefaultSelector() as selector:
-            selector.register(self, selectors.EVENT_READ)
-
-            while True:
-                for key, events in selector.select():
-                    if key.fileobj is self:
-                        try:
-                            text = self.read_very_eager()
-                        except EOFError as e:
-                            msg = "\n*** Connection closed by remote host ***\n"
-                            self._output_callback(msg)
-                            log(msg)
-                            raise e
-                        else:
-                            if text:
-                                self._output_callback(text)
-
-
-class TelnetDialog:
-    """ Dialog of very simple telnet client. """
-    _COLOR_PATTERN = re.compile("\x1b.*?m")  # Color info
-    _ERASING_PATTERN = re.compile("\x1b.*?K")  # Erase to right
-    _APP_MODE_PATTERN = re.compile("\x1b.*?(1h)|(1l)")  # h - on, l - off
-    _ALL_PATTERN = re.compile(r'(\x1b\[|\x9b)[0-?]*[@-~]')
-    _NOT_SUPPORTED = {"mc", "mcedit", "vi", "nano"}
-
-    def __init__(self, transient, settings):
-        self._handlers = {"on_profile_changed": self.on_profile_changed,
-                          "on_clear": self.on_clear,
-                          "on_text_view_realize": self.on_text_view_realize,
-                          "on_view_key_press": self.on_view_key_press,
-                          "on_info_bar_close": self.on_info_bar_close,
-                          "on_connect": self.on_connect,
-                          "on_disconnect": self.on_disconnect,
-                          "on_close": self.on_close}
-
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "telnet.glade")
-        builder.connect_signals(self._handlers)
-        self._dialog_window = builder.get_object("dialog_window")
-        self._dialog_window.set_transient_for(transient)
-        self._profile_combo_box = builder.get_object("profile_combo_box")
-        self._info_bar = builder.get_object("info_bar")
-        self._info_message_label = builder.get_object("info_bar_message_label")
-        self._text_view = builder.get_object("text_view")
-        self._buf = builder.get_object("text_buffer")
-        self._end_tag = builder.get_object("end_tag")
-        self._connect_button = builder.get_object("connect_button")
-        self._connect_button.bind_property("visible", builder.get_object("disconnect_button"), "visible", 4)
-        provider = Gtk.CssProvider()
-        provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        builder.get_object("main_box").get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-        window_size = settings.get("telnet_dialog_window_size")
-        if window_size:
-            self._dialog_window.resize(*window_size)
-
-        self._ext_settings = settings
-        self._settings = Settings(settings.settings)
-        self._tn = None
-        self._app_mode = False
-        self._commands = deque(maxlen=10)
-
-    def show(self):
-        self._dialog_window.show()
-
-    def on_close(self, window, event):
-        """  Performs shutdown tasks """
-        self._ext_settings.add("telnet_dialog_window_size", window.get_size())
-        self.on_disconnect()
-
-    def on_info_bar_close(self, bar=None, resp=None):
-        self._info_bar.set_visible(False)
-
-    @run_idle
-    def show_info_message(self, text, message_type):
-        self._info_bar.set_visible(True)
-        self._info_bar.set_message_type(message_type)
-        self._info_message_label.set_text(text)
-
-    def on_text_view_realize(self, view):
-        self.init_profiles()
-        self.on_connect()
-
-    @run_idle
-    def init_profiles(self):
-        for p in self._settings.profiles:
-            self._profile_combo_box.append(p, p)
-        self._profile_combo_box.set_active_id(self._settings.current_profile)
-
-    @run_task
-    def on_connect(self, item=None):
-        try:
-            GLib.idle_add(self._connect_button.set_visible, False)
-            GLib.idle_add(self.on_info_bar_close)
-            user, password = self._settings.user, self._settings.password
-            timeout = self._settings.telnet_timeout
-
-            self._tn = ExtTelnet(self.append_output,
-                                 host=self._settings.host,
-                                 port=self._settings.telnet_port,
-                                 timeout=timeout)
-
-            if user != "":
-                self._tn.read_until(b"login: ")
-                self._tn.write(user.encode("utf-8") + b"\n")
-            if password != "":
-                self._tn.read_until(b"Password: ")
-                self._tn.write(password.encode("utf-8") + b"\n")
-
-            self._tn.interact()
-        except (OSError, EOFError, socket.timeout, ConnectionRefusedError) as e:
-            log("{}: {}".format(self.__class__.__name__, e))
-            self.show_info_message(str(e), Gtk.MessageType.ERROR)
-        finally:
-            GLib.idle_add(self._connect_button.set_visible, True)
-
-    @run_task
-    def on_disconnect(self, item=None):
-        if self._tn:
-            GLib.idle_add(self._connect_button.set_visible, True)
-            self._tn.close()
-
-    def on_profile_changed(self, button):
-        self._settings.current_profile = button.get_active_id()
-
-    def on_command_done(self, entry):
-        command = entry.get_text()
-        entry.set_text("")
-        if command and self._tn:
-            self._tn.write(command.encode("ascii") + b"\r")
-
-    def on_clear(self, item=None):
-        self._buf.delete(self._buf.get_start_iter(), self._buf.get_end_iter())
-
-    def on_view_key_press(self, view, event):
-        """  Handling  keystrokes on press """
-        if event.keyval == Gdk.KEY_Return:
-            self.do_command()
-            return True
-
-        key_code = event.hardware_keycode
-        if not KeyboardKey.value_exist(key_code):
-            return
-
-        key = KeyboardKey(key_code)
-        ctrl = event.state & MOD_MASK
-        if ctrl and key is KeyboardKey.C:
-            if self._tn and self._tn.sock:
-                self._tn.write(b"\x03")  # interrupt
-
-        # last commands navigation
-        if key is KeyboardKey.UP:
-            self.delete_last_command()
-            if self._commands:
-                cmd = self._commands.pop()
-                self._commands.appendleft(cmd)
-                self._buf.insert_at_cursor(cmd, -1)
-            return True
-        elif key is KeyboardKey.DOWN:
-            self.delete_last_command()
-            if self._commands:
-                cmd = self._commands.popleft()
-                self._commands.append(cmd)
-                self._buf.insert_at_cursor(cmd, -1)
-            return True
-
-    def delete_last_command(self):
-        end = self._buf.get_end_iter()
-        if end.ends_tag(self._end_tag):
-            return
-
-        if end.backward_to_tag_toggle(self._end_tag):
-            self._buf.delete(self._buf.get_end_iter(), end)
-
-    def do_command(self):
-        count = self._buf.get_line_count()
-        begin = self._buf.get_iter_at_line(count)
-        end = self._buf.get_end_iter()
-        command = []
-
-        while end.backward_to_tag_toggle(self._end_tag):
-            command.append(self._buf.get_text(end, begin, False))
-            break
-        else:  # if buf is empty
-            command.append(self._buf.get_text(begin, end, False))
-
-        # to preventing duplication of the command in the buf
-        self._buf.delete(end, begin)
-
-        if command and self._tn.sock:
-            cmd = command[0]
-            if cmd in self._NOT_SUPPORTED:
-                self.show_info_message("'{}' is not supported by this client.".format(cmd), Gtk.MessageType.ERROR)
-            else:
-                self._tn.write(cmd.encode("ascii") + b"\r")
-                self._commands.append(cmd)
-
-    @run_idle
-    def append_output(self, txt):
-        t = txt.decode("ascii", errors="ignore")
-
-        ap = re.search(self._APP_MODE_PATTERN, t)
-        if ap:
-            on, of = ap.group(1), ap.group(2)
-            if on:
-                self._app_mode = True
-            elif of:
-                self._app_mode = False
-                self.on_clear()
-
-        t = re.sub(self._ALL_PATTERN, "", t)  # removing [replacing] ascii escape sequences
-
-        if self._app_mode:
-            start, end = self._buf.get_start_iter(), self._buf.get_end_iter()
-            count = self._buf.get_line_count()
-            new_lines = t.split("\r\n")
-            ext_lines = self._buf.get_text(start, end, True).split("\r\n")
-            if count < len(new_lines):
-                self._buf.set_text(re.sub(self._ERASING_PATTERN, "", t))
-            else:
-                for i, line in enumerate(new_lines):
-                    if line:
-                        ext_lines[i] = re.sub(self._ERASING_PATTERN, "", line)
-                self._buf.set_text("\r\n".join(ext_lines))
-        else:
-            self._buf.insert_at_cursor(t, -1)
-
-        insert = self._buf.get_insert()
-        self._text_view.scroll_to_mark(insert, 0.0, True, 0.0, 1.0)
-        self._buf.apply_tag(self._end_tag, self._buf.get_start_iter(), self._buf.get_end_iter())
-
-
-if __name__ == "__main__":
-    pass

app/ui/timer_row.glade

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
-<interface domain="demon-editor">
-  <requires lib="gtk+" version="3.16"/>
-  <object class="GtkBox" id="timer_row_box">
-    <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="orientation">vertical</property>
-    <property name="spacing">5</property>
-    <child>
-      <object class="GtkBox" id="timer_name_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="timer_name_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="ellipsize">end</property>
-            <attributes>
-              <attribute name="weight" value="semibold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</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="timer_description_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="timer_description_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="ellipsize">end</property>
-            <attributes>
-              <attribute name="style" value="italic"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="timer_service_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="timer_service_name_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="ellipsize">end</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="timer_time_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <attributes>
-              <attribute name="size" value="8000"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator" id="timer_row_separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-  </object>
-</interface>

app/ui/transmitter.glade

@@ -42,6 +42,7 @@ Author: Dmitriy Yefremov
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="decorated">False</property>
+    <property name="gravity">center</property>
     <property name="has_resize_grip">True</property>
     <child>
       <placeholder/>

app/ui/transmitter.py

@@ -5,16 +5,14 @@ import gi
 from gi.repository import GLib
 
 from app.commons import log
-from app.connections import HttpAPI
-from app.settings import IS_WIN
+from app.connections import HttpRequestType
 from app.tools.yt import YouTube
-from app.ui.dialogs import get_builder
 from app.ui.iptv import get_yt_icon
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH
 
 
 class LinksTransmitter:
-    """ The main media bar class for the "send to" function..
+    """ The main class for the "send to" function.
 
          It used for direct playback of media links by the enigma2 media player.
     """
@@ -36,7 +34,9 @@ class LinksTransmitter:
         self._app_window = app_window
         self._is_status_icon = True
 
-        builder = get_builder(UI_RESOURCES_PATH + "transmitter.glade", handlers)
+        builder = Gtk.Builder()
+        builder.add_from_file(UI_RESOURCES_PATH + "transmitter.glade")
+        builder.connect_signals(handlers)
 
         self._main_window = builder.get_object("main_window")
         self._url_entry = builder.get_object("url_entry")
@@ -47,19 +47,16 @@ class LinksTransmitter:
         self._status_passive = None
         self._yt = YouTube.get_instance(settings)
 
-        if IS_WIN:
+        try:
+            gi.require_version("AppIndicator3", "0.1")
+            from gi.repository import AppIndicator3
+        except (ImportError, ValueError) as e:
+            log("{}: Load library error: {}".format(__class__.__name__, e))
             self._tray = builder.get_object("status_icon")
         else:
-            try:
-                gi.require_version("AppIndicator3", "0.1")
-                from gi.repository import AppIndicator3
-            except (ImportError, ValueError) as e:
-                log("{}: Load library error: {}".format(__class__.__name__, e))
-                self._tray = builder.get_object("status_icon")
-            else:
-                self._is_status_icon = False
-                self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
-                self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE
+            self._is_status_icon = False
+            self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
+            self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE
 
             category = AppIndicator3.IndicatorCategory.APPLICATION_STATUS
             path = Path(UI_RESOURCES_PATH + "/icons/hicolor/scalable/apps/demon-editor.svg")
@@ -127,7 +124,7 @@ class LinksTransmitter:
             else:
                 self._url_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
 
-            self._http_api.send(HttpAPI.Request.PLAY, url, self.on_done, self.__STREAM_PREFIX)
+            self._http_api.send(HttpRequestType.PLAY, url, self.on_done, self.__STREAM_PREFIX)
             yield True
 
     def on_done(self, res):
@@ -137,21 +134,21 @@ class LinksTransmitter:
         GLib.idle_add(self._tool_bar.set_sensitive, True)
 
     def on_previous(self, item):
-        self._http_api.send(HttpAPI.Request.PLAYER_PREV, None, self.on_done)
+        self._http_api.send(HttpRequestType.PLAYER_PREV, None, self.on_done)
 
     def on_next(self, item):
-        self._http_api.send(HttpAPI.Request.PLAYER_NEXT, None, self.on_done)
+        self._http_api.send(HttpRequestType.PLAYER_NEXT, None, self.on_done)
 
     def on_play(self, item):
-        self._http_api.send(HttpAPI.Request.PLAYER_PLAY, None, self.on_done)
+        self._http_api.send(HttpRequestType.PLAYER_PLAY, None, self.on_done)
 
     def on_stop(self, item):
-        self._http_api.send(HttpAPI.Request.PLAYER_STOP, None, self.on_done)
+        self._http_api.send(HttpRequestType.PLAYER_STOP, None, self.on_done)
 
     def on_clear(self, item):
         """ Remove added links in the playlist. """
         GLib.idle_add(self._tool_bar.set_sensitive, False)
-        self._http_api.send(HttpAPI.Request.PLAYER_LIST, None, self.clear_playlist)
+        self._http_api.send(HttpRequestType.PLAYER_LIST, None, self.clear_playlist)
 
     def clear_playlist(self, res):
         GLib.idle_add(self._tool_bar.set_sensitive, not res)
@@ -162,7 +159,7 @@ class LinksTransmitter:
 
         for ref in res:
             GLib.idle_add(self._tool_bar.set_sensitive, False)
-            self._http_api.send(HttpAPI.Request.PLAYER_REMOVE,
+            self._http_api.send(HttpRequestType.PLAYER_REMOVE,
                                 ref.get("e2servicereference", ""),
                                 self.on_done,
                                 self.__STREAM_PREFIX)

app/ui/uicommons.py

@@ -2,62 +2,52 @@ import locale
 import os
 from enum import Enum, IntEnum
 from functools import lru_cache
-
-from app.settings import Settings, SettingsException, IS_WIN, SEP
+from app.settings import Settings, SettingsException, IS_DARWIN
 
 import gi
 
 gi.require_version("Gtk", "3.0")
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+gi.require_version("Notify", "0.7")
+from gi.repository import Gtk, Gdk, Notify
 
-# Setting mod mask for keyboard depending on platform
-MOD_MASK = Gdk.ModifierType.CONTROL_MASK
-# Path to *.glade files
-UI_PATH = "app{}ui{}".format(SEP, SEP)
-UI_RESOURCES_PATH = UI_PATH if os.path.exists(UI_PATH) else "ui{}".format(SEP)
-LANG_PATH = UI_RESOURCES_PATH + "lang"
-GTK_PATH = os.environ.get("GTK_PATH", None)
-NOTIFY_IS_INIT = False
+# Init notify
+Notify.init("DemonEditor")
+# Setting mod mask for the keyboard depending on the platform.
+MOD_MASK = Gdk.ModifierType.MOD2_MASK if IS_DARWIN else Gdk.ModifierType.CONTROL_MASK
+# Path to *.glade files.
+UI_RESOURCES_PATH = "app/ui/" if os.path.exists("app/ui/") else "/usr/share/demoneditor/app/ui/"
 IS_GNOME_SESSION = int(bool(os.environ.get("GNOME_DESKTOP_SESSION_ID")))
 # Translation.
 TEXT_DOMAIN = "demon-editor"
-APP_FONT = None
 
 try:
     settings = Settings.get_instance()
 except SettingsException:
     pass
 else:
-    locale.setlocale(locale.LC_NUMERIC, "C")
     os.environ["LANGUAGE"] = settings.language
-
-    st = Gtk.Settings().get_default()
-    APP_FONT = st.get_property("gtk-font-name")
+    if UI_RESOURCES_PATH == "app/ui/":
+        locale.bindtextdomain(TEXT_DOMAIN, UI_RESOURCES_PATH + "lang")
 
     if settings.is_themes_support:
+        st = Gtk.Settings().get_default()
         st.set_property("gtk-theme-name", settings.theme)
         st.set_property("gtk-icon-theme-name", settings.icon_theme)
 
 theme = Gtk.IconTheme.get_default()
-theme.append_search_path(GTK_PATH + "{}share{}icons".format(SEP, SEP) if GTK_PATH else UI_RESOURCES_PATH + "icons")
+theme.append_search_path(UI_RESOURCES_PATH + "icons")
 
-
-def get_theme_icon(icon_theme, name, size):
-    try:
-        return icon_theme.load_icon(name, size, 0)
-    except GLib.Error:
-        pass
-
-
-_IMAGE_MISSING = get_theme_icon(theme, "image-missing", 16)
-CODED_ICON = get_theme_icon(theme, "emblem-readonly", 16) or _IMAGE_MISSING
-LOCKED_ICON = get_theme_icon(theme, "changes-prevent-symbolic", 16) or _IMAGE_MISSING
-HIDE_ICON = get_theme_icon(theme, "go-jump", 16) or _IMAGE_MISSING
-TV_ICON = get_theme_icon(theme, "tv-symbolic", 16) or _IMAGE_MISSING
-IPTV_ICON = get_theme_icon(theme, "emblem-shared", 16)
-EPG_ICON = get_theme_icon(theme, "gtk-index", 16)
-DEFAULT_ICON = get_theme_icon(theme, "emblem-default", 16)
+_IMAGE_MISSING = theme.load_icon("image-missing", 16, 0) if theme.lookup_icon("image-missing", 16, 0) else None
+CODED_ICON = theme.load_icon("emblem-readonly", 16, 0) if theme.lookup_icon(
+    "emblem-readonly", 16, 0) else _IMAGE_MISSING
+LOCKED_ICON = theme.load_icon("changes-prevent-symbolic", 16, 0) if theme.lookup_icon(
+    "system-lock-screen", 16, 0) else _IMAGE_MISSING
+HIDE_ICON = theme.load_icon("go-jump", 16, 0) if theme.lookup_icon("go-jump", 16, 0) else _IMAGE_MISSING
+TV_ICON = theme.load_icon("tv-symbolic", 16, 0) if theme.lookup_icon("tv-symbolic", 16, 0) else _IMAGE_MISSING
+IPTV_ICON = theme.load_icon("emblem-shared", 16, 0) if theme.lookup_icon("emblem-shared", 16, 0) else None
+EPG_ICON = theme.load_icon("gtk-index", 16, 0) if theme.lookup_icon("gtk-index", 16, 0) else None
+DEFAULT_ICON = theme.load_icon("emblem-default", 16, 0) if theme.lookup_icon("emblem-default", 16, 0) else None
 
 
 @lru_cache(maxsize=1)
@@ -71,17 +61,14 @@ def get_yt_icon(icon_name, size=24):
         return default_theme.load_icon(icon_name, size, 0)
 
     n_theme = Gtk.IconTheme.new()
-    p_path = "{}usr{}share{}icons{}*".format(SEP, SEP, SEP, SEP)
-
     import glob
 
-    for theme_name in map(os.path.basename, filter(os.path.isdir, glob.glob(p_path))):
-        theme.set_custom_theme(theme_name)
+    for theme_name in map(os.path.basename, filter(os.path.isdir, glob.glob("/usr/share/icons/*"))):
+        n_theme.set_custom_theme(theme_name)
         if n_theme.has_icon(icon_name):
             return n_theme.load_icon(icon_name, size, 0)
 
-    if default_theme.lookup_icon(Gtk.STOCK_APPLY, size, 0):
-        return default_theme.load_icon(Gtk.STOCK_APPLY, size, 0)
+    return default_theme.load_icon("info", size, 0)
 
 
 def show_notification(message, timeout=10000, urgency=1):
@@ -91,38 +78,40 @@ def show_notification(message, timeout=10000, urgency=1):
         @param timeout: milliseconds
         @param urgency: 0 - low, 1 - normal, 2 - critical
     """
-    pass
+    notify = Notify.Notification.new("DemonEditor", message, "demon-editor")
+    notify.set_urgency(urgency)
+    notify.set_timeout(timeout)
+    notify.show()
 
 
 class KeyboardKey(Enum):
     """ The raw(hardware) codes of the keyboard keys. """
-    E = 69 if IS_WIN else 26
-    R = 82 if IS_WIN else 27
-    T = 84 if IS_WIN else 28
-    P = 80 if IS_WIN else 33
-    S = 83 if IS_WIN else 39
-    F = 70 if IS_WIN else 41
-    X = 88 if IS_WIN else 53
-    C = 67 if IS_WIN else 54
-    V = 86 if IS_WIN else 55
-    W = 87 if IS_WIN else 25
-    Z = 90 if IS_WIN else 52
-    INSERT = 45 if IS_WIN else 118
-    HOME = 36 if IS_WIN else 110
-    END = 35 if IS_WIN else 115
-    UP = 38 if IS_WIN else 111
-    DOWN = 40 if IS_WIN else 116
-    PAGE_UP = 33 if IS_WIN else 112
-    PAGE_DOWN = 34 if IS_WIN else 117
-    LEFT = 37 if IS_WIN else 113
-    RIGHT = 39 if IS_WIN else 114
-    F2 = 113 if IS_WIN else 68
-    F7 = 118 if IS_WIN else 73
-    SPACE = 32 if IS_WIN else 65
-    DELETE = 46 if IS_WIN else 119
-    BACK_SPACE = 8 if IS_WIN else 22
-    CTRL_L = 17 if IS_WIN else 37
-    CTRL_R = 163 if IS_WIN else 105
+    E = 26
+    R = 27
+    T = 28
+    P = 33
+    S = 39
+    F = 41
+    X = 53
+    C = 54
+    V = 55
+    W = 25
+    Z = 52
+    INSERT = 118
+    HOME = 110
+    END = 115
+    UP = 111
+    DOWN = 116
+    PAGE_UP = 112
+    PAGE_DOWN = 117
+    LEFT = 113
+    RIGHT = 114
+    F2 = 68
+    SPACE = 65
+    DELETE = 119
+    BACK_SPACE = 22
+    CTRL_L = 37
+    CTRL_R = 105
     # Laptop codes
     HOME_KP = 79
     END_KP = 87
@@ -167,7 +156,7 @@ class BqGenType(Enum):
 
 class Column(IntEnum):
     """ Column nums in the views """
-    # Main view
+    # main view
     SRV_CAS_FLAGS = 0
     SRV_STANDARD = 1
     SRV_CODED = 2
@@ -190,7 +179,7 @@ class Column(IntEnum):
     SRV_TRANSPONDER = 19
     SRV_TOOLTIP = 20
     SRV_BACKGROUND = 21
-    # FAV view
+    # fav view
     FAV_NUM = 0
     FAV_CODED = 1
     FAV_SERVICE = 2
@@ -202,20 +191,11 @@ class Column(IntEnum):
     FAV_PICON = 8
     FAV_TOOLTIP = 9
     FAV_BACKGROUND = 10
-    # Bouquets view
+    # bouquets view
     BQ_NAME = 0
     BQ_LOCKED = 1
     BQ_HIDDEN = 2
     BQ_TYPE = 3
-    # Alternatives view
-    ALT_NUM = 0
-    ALT_PICON = 1
-    ALT_SERVICE = 2
-    ALT_TYPE = 3
-    ALT_POS = 4
-    ALT_FAV_ID = 5
-    ALT_ID = 6
-    ALT_ITER = 7
 
     def __index__(self):
         """ Overridden to get the index in slices directly """

build-deb.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+VER="1.0.0_Alpha"
+B_PATH="dist/DemonEditor"
+DEB_PATH="$B_PATH/usr/share/demoneditor"
+
+mkdir -p $B_PATH
+cp -TRv deb $B_PATH
+rsync --exclude=app/ui/lang --exclude=app/ui/icons -arv app $DEB_PATH
+
+cd dist
+fakeroot dpkg-deb --build DemonEditor
+mv DemonEditor.deb DemonEditor_$VER.deb
+
+rm -R DemonEditor
+
+
+
+

deb/DEBIAN/README.source

@@ -0,0 +1,58 @@
+demon-editor for Debian
+----------------------
+DemonEditor
+Enigma2 channel and satellites list editor for GNU/Linux.
+
+Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).
+Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc)
+
+Main features of the program:
+   Editing bouquets, channels, satellites.
+   Import function.
+   Backup function.
+   Extended support of IPTV.
+   Support of picons.
+   Downloading of picons and updating of satellites (transponders) from the web.
+   Import to bouquet(Neutrino WEBTV) from m3u.
+   Export of bouquets with IPTV services in m3u.
+   Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
+   Preview (playback) of IPTV or other streams directly from the bouquet list (should be installed VLC).
+
+Keyboard shortcuts:
+    Ctrl + Insert - copies the selected channels from the main list to the the bouquet beginning or inserts (creates) a new bouquet.
+    Ctrl + BackSpace - copies the selected channels from the main list to the bouquet end.
+    Ctrl + X - only in bouquet list. Ctrl + C - only in services list.
+    Clipboard is "rubber". There is an accumulation before the insertion!
+    Ctrl + E - edit.
+    Ctrl + R, F2 - rename.
+    Ctrl + S, T in Satellites edit tool for create satellite or transponder.
+    Ctrl + L - parental lock.
+    Ctrl + H - hide/skip.
+    Ctrl + P - start play IPTV or other stream in the bouquet list.
+    Ctrl + Z - switch (zap) the channel (works when the HTTP API is enabled, Enigma2 only).
+    Ctrl + W - switch to the channel and watch in the program.
+    Space - select/deselect.
+    Left/Right - remove selection.
+    Ctrl + Up, Down, PageUp, PageDown, Home, End - move selected items in the list.
+    Ctrl + O - (re)load user data from current dir.
+    Ctrl + D - load data from receiver.
+    Ctrl + U/B upload data/bouquets to receiver.
+    Ctrl + F - show/hide search bar.
+    Ctrl + Shift + F - show/hide filter bar.
+
+    For multiple mouse selection (including Drag and Drop), press and hold the **Ctrl** key!
+
+Minimum requirements:
+    Python >= 3.5.2 and GTK+ >= 3.16 with PyGObject bindings, python3-requests.
+
+Important:
+    Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2!
+    Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support!
+    For version **3** is only read mode available. When saving, version **4** format is used instead!
+
+    When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the
+    selected bouquets!** If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten),
+    just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services
+    (excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.
+
+

deb/DEBIAN/control

@@ -0,0 +1,9 @@
+Package: demon-editor
+Version: 1.0.0-Alpha
+Section: utils
+Priority: optional
+Architecture: all
+Essential: no
+Depends: python3 (>= 3.5)
+Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
+Description: Enigma2 channel and satellites list editor

deb/DEBIAN/copyright

@@ -0,0 +1,26 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
+Source: https://github.com/DYefremov/DemonEditor
+
+Files: *
+MIT License
+
+Copyright (c) 2018-2020 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.

deb/DEBIAN/demon-editor-docs.docs

@@ -0,0 +1 @@
+README.source

deb/usr/bin/demon-editor

@@ -0,0 +1,2 @@
+#!/bin/bash
+python3 /usr/share/demoneditor/start.py $1

deb/usr/share/applications/DemonEditor.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=DemonEditor
+Comment=Channels and satellites list editor for Enigma2
+Comment[ru]=Редактор списка каналов и спутников для Enigma2
+Icon=demon-editor
+Exec=/usr/bin/demon-editor
+Terminal=false
+Type=Application
+Categories=Utility;Application;
+StartupNotify=false

deb/usr/share/demoneditor/start.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+from app.ui.main_app_window import start_app
+
+start_app()

deb/usr/share/icons/hicolor/scalable/apps/demon-editor.svg

@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1541"
+   version="1.1"
+   viewBox="0 0 16.743339 16.72816"
+   height="63.224556"
+   width="63.281971"
+   sodipodi:docname="demon-editor.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     id="namedview127"
+     showgrid="true"
+     fit-margin-left="0"
+     inkscape:zoom="6.1714295"
+     inkscape:cx="40.088627"
+     inkscape:cy="31.742631"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1541"
+     fit-margin-top="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid128"
+       originx="-10.604603"
+       originy="-1.1727724" />
+  </sodipodi:namedview>
+  <title
+     id="title1088">DeamonEditor Icons</title>
+  <defs
+     id="defs1535">
+    <linearGradient
+       id="linearGradient2198">
+      <stop
+         id="stop2194"
+         style="stop-color:#ffb320;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2196"
+         style="stop-color:#e7ff00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2192">
+      <stop
+         offset="0"
+         style="stop-color:#ffb320;stop-opacity:1"
+         id="stop2188" />
+      <stop
+         offset="1"
+         style="stop-color:#b3c54c;stop-opacity:1"
+         id="stop2190" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3700-8">
+      <stop
+         offset="0"
+         style="stop-color:#2e4f84;stop-opacity:1"
+         id="stop2183" />
+      <stop
+         offset="1"
+         style="stop-color:#4c77c5;stop-opacity:1"
+         id="stop2185" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       spreadMethod="pad"
+       id="linearGradient1844">
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="0"
+         id="stop1826" />
+      <stop
+         id="stop1828"
+         offset="0.13293758"
+         style="stop-color:#b5bdcf;stop-opacity:1" />
+      <stop
+         style="stop-opacity:1;stop-color:#92979f"
+         offset="0.21261224"
+         id="stop1832" />
+      <stop
+         style="stop-opacity:1;stop-color:#737881"
+         offset="0.29780689"
+         id="stop1834" />
+      <stop
+         style="stop-opacity:1;stop-color:#70757e"
+         offset="0.29780689"
+         id="stop1836" />
+      <stop
+         style="stop-opacity:1;stop-color:#e4e6e8"
+         offset="0.45395693"
+         id="stop1838" />
+      <stop
+         style="stop-opacity:1;stop-color:#696c76"
+         offset="0.71871042"
+         id="stop1840" />
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="1"
+         id="stop1842" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1754"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1736"
+         offset="0"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         style="stop-color:#b5bdcf;stop-opacity:1"
+         offset="0.02582242"
+         id="stop1738" />
+      <stop
+         id="stop1740"
+         offset="0.14669065"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1742"
+         offset="0.21261224"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1744"
+         offset="0.29780689"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1746"
+         offset="0.29780689"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1748"
+         offset="0.45395693"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1750"
+         offset="0.71871042"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1752"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="1"
+       y2="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       spreadMethod="pad"
+       id="linearGradient1606">
+      <stop
+         style="stop-opacity:1;stop-color:#29282b"
+         offset="0"
+         id="stop1590" />
+      <stop
+         id="stop1608"
+         offset="0.03065561"
+         style="stop-color:#b5bdcf;stop-opacity:1" />
+      <stop
+         style="stop-opacity:1;stop-color:#868c95"
+         offset="0.1125849"
+         id="stop1592" />
+      <stop
+         style="stop-opacity:1;stop-color:#92979f"
+         offset="0.13955873"
+         id="stop1594" />
+      <stop
+         style="stop-opacity:1;stop-color:#737881"
+         offset="0.1915853"
+         id="stop1596" />
+      <stop
+         style="stop-opacity:1;stop-color:#70757e"
+         offset="0.25400829"
+         id="stop1598" />
+      <stop
+         style="stop-opacity:1;stop-color:#e4e6e8"
+         offset="0.45395693"
+         id="stop1600" />
+      <stop
+         style="stop-opacity:1;stop-color:#ffffff"
+         offset="0.71871042"
+         id="stop1602" />
+      <stop
+         style="stop-opacity:1;stop-color:#1d191a"
+         offset="1"
+         id="stop1604" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient886-0">
+      <stop
+         style="stop-color:#535353;stop-opacity:1"
+         offset="0"
+         id="stop888" />
+      <stop
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="1"
+         id="stop890" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1473">
+      <stop
+         id="stop1469"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         id="stop1471"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.96088022" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2447-35">
+      <stop
+         id="stop2449"
+         offset="0"
+         style="stop-color:#00c62e;stop-opacity:1" />
+      <stop
+         id="stop2451"
+         offset="1"
+         style="stop-color:#136100;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3795-1">
+      <stop
+         id="stop3797-1"
+         offset="0"
+         style="stop-color:#803400;stop-opacity:1" />
+      <stop
+         id="stop3799-3"
+         offset="1"
+         style="stop-color:#c87137;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2447-3">
+      <stop
+         style="stop-color:#c60300;stop-opacity:1"
+         offset="0"
+         id="stop2443" />
+      <stop
+         style="stop-color:#c40e00;stop-opacity:1"
+         offset="1"
+         id="stop2445" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2458">
+      <stop
+         id="stop2454"
+         offset="0"
+         style="stop-color:#c60300;stop-opacity:1" />
+      <stop
+         id="stop2456"
+         offset="1"
+         style="stop-color:#ee6000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3519">
+      <stop
+         id="stop3521"
+         offset="0"
+         style="stop-color:#1d2120;stop-opacity:1" />
+      <stop
+         id="stop3523"
+         offset="1"
+         style="stop-color:#545d5d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1446">
+      <stop
+         id="stop1442"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop1444"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1547"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1529"
+         offset="0"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1531"
+         offset="0.0263736"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         id="stop1533"
+         offset="0.263736"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1535"
+         offset="0.395604"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1537"
+         offset="0.39560401"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1539"
+         offset="0.42333773"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1541"
+         offset="0.56268591"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1543"
+         offset="0.62400264"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1545"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1527"
+       spreadMethod="pad"
+       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
+       gradientUnits="userSpaceOnUse"
+       y2="0"
+       x2="1"
+       y1="0"
+       x1="0">
+      <stop
+         id="stop1509"
+         offset="0"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1511"
+         offset="0.0527472"
+         style="stop-opacity:1;stop-color:#29282b" />
+      <stop
+         id="stop1513"
+         offset="0.142147"
+         style="stop-opacity:1;stop-color:#868c95" />
+      <stop
+         id="stop1515"
+         offset="0.19700864"
+         style="stop-opacity:1;stop-color:#92979f" />
+      <stop
+         id="stop1517"
+         offset="0.25031137"
+         style="stop-opacity:1;stop-color:#737881" />
+      <stop
+         id="stop1519"
+         offset="0.3710371"
+         style="stop-opacity:1;stop-color:#70757e" />
+      <stop
+         id="stop1521"
+         offset="0.53961843"
+         style="stop-opacity:1;stop-color:#e4e6e8" />
+      <stop
+         id="stop1523"
+         offset="0.76283824"
+         style="stop-opacity:1;stop-color:#ffffff" />
+      <stop
+         id="stop1525"
+         offset="1"
+         style="stop-opacity:1;stop-color:#1d191a" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-5.8254634,-78.732754)"
+       y2="1179.7145"
+       x2="66.791626"
+       y1="1188.7661"
+       x1="99.044022"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1485"
+       xlink:href="#linearGradient1473" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.2733744,-70.526334)"
+       gradientUnits="userSpaceOnUse"
+       y2="1155.8046"
+       x2="67.311417"
+       y1="1161.6112"
+       x1="77.19442"
+       id="linearGradient1448"
+       xlink:href="#linearGradient1446" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-18.198747,-79.859424)"
+       gradientUnits="userSpaceOnUse"
+       y2="1186.8096"
+       x2="146.16808"
+       y1="1186.8096"
+       x1="131.86871"
+       id="linearGradient2180"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       gradientTransform="matrix(0.20863982,0,0,0.20863982,-0.63935937,-13.031239)"
+       gradientUnits="userSpaceOnUse"
+       y2="1184.73"
+       x2="101.19952"
+       y1="1184.73"
+       x1="83.066002"
+       id="linearGradient2160"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-6.2370714,-102.12414)"
+       gradientUnits="userSpaceOnUse"
+       y2="1267.1335"
+       x2="117.99127"
+       y1="1267.1335"
+       x1="75.853806"
+       id="linearGradient2131"
+       xlink:href="#linearGradient886-0" />
+    <linearGradient
+       id="linearGradient3700-8-3">
+      <stop
+         id="stop3702-1"
+         style="stop-color:#2e4f84;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3704-8"
+         style="stop-color:#4c77c5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <defs
+       id="defs4922">
+      <filter
+         style="color-interpolation-filters:sRGB"
+         id="Adobe_OpacityMaskFilter"
+         filterUnits="userSpaceOnUse"
+         x="3.7850001"
+         y="4.6750002"
+         width="5.8829999"
+         height="73.013">
+        <feColorMatrix
+           type="matrix"
+           values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+           id="feColorMatrix4925" />
+      </filter>
+    </defs>
+    <mask
+       maskUnits="userSpaceOnUse"
+       x="3.785"
+       y="4.675"
+       width="5.883"
+       height="73.013"
+       id="SVGID_2_">
+      <g
+         style="filter:url(#Adobe_OpacityMaskFilter)"
+         id="g4928">
+        <linearGradient
+           id="SVGID_3_"
+           gradientUnits="userSpaceOnUse"
+           x1="3.7852001"
+           y1="41.181198"
+           x2="9.6680002"
+           y2="41.181198">
+          <stop
+             offset="0"
+             style="stop-color:#FFFFFF"
+             id="stop4931" />
+          <stop
+             offset="0.0029"
+             style="stop-color:#FAFBFB"
+             id="stop4933" />
+          <stop
+             offset="0.0756"
+             style="stop-color:#BBBDBF"
+             id="stop4935" />
+          <stop
+             offset="0.1438"
+             style="stop-color:#898B8E"
+             id="stop4937" />
+          <stop
+             offset="0.2053"
+             style="stop-color:#646567"
+             id="stop4939" />
+          <stop
+             offset="0.259"
+             style="stop-color:#444446"
+             id="stop4941" />
+          <stop
+             offset="0.3028"
+             style="stop-color:#1D1C1D"
+             id="stop4943" />
+          <stop
+             offset="0.3313"
+             style="stop-color:#000000"
+             id="stop4945" />
+        </linearGradient>
+        <rect
+           style="fill:url(#SVGID_3_)"
+           x="3.7850001"
+           y="4.6750002"
+           width="5.8829999"
+           height="73.013"
+           id="rect4947" />
+      </g>
+    </mask>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter1268"
+       filterUnits="userSpaceOnUse"
+       x="3.7850001"
+       y="4.6750002"
+       width="5.8829999"
+       height="73.013">
+      <feColorMatrix
+         type="matrix"
+         values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+         id="feColorMatrix1266" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="203.22046"
+       x2="23.551136"
+       y1="203.22046"
+       x1="13.487289"
+       id="linearGradient1160"
+       xlink:href="#linearGradient3519" />
+    <clipPath
+       id="clipPath1890"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         style="opacity:1;fill:#2d2d2d;fill-opacity:1;stroke:#434242;stroke-width:0.0575568;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle1892"
+         cx="78.548424"
+         cy="-31.019459"
+         r="6.4721422"
+         transform="scale(1,-1)" />
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(-0.24389927,14.877856)"
+       y2="27.314217"
+       x2="84.864914"
+       y1="27.314217"
+       x1="72.164909"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2134"
+       xlink:href="#linearGradient3700-8-3" />
+  </defs>
+  <metadata
+     id="metadata1538">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>DeamonEditor Icons</dc:title>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>mfgeg</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:date>7.1.2020</dc:date>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.1690805,0,0,1.1690805,-14.929261,-167.45253)"
+     id="layer1">
+    <g
+       transform="translate(0.86526724,-82.691658)"
+       id="g1351">
+      <path
+         d="m 13.715358,227.65981 h 2.97616 v 12.57332 h -2.97616 z m 5.79826,-1.73376 -0.327076,0.42227 c -0.179879,0.23226 -0.586303,0.67932 -0.903223,0.99412 -0.480677,0.47726 -0.640897,0.57235 -0.967777,0.57235 -0.223557,0 -0.380895,-0.0584 -0.624024,-0.25067 v 3.18307 c 0.172884,-0.0214 0.359647,-0.0333 0.575071,-0.0352 0.68403,-0.006 0.91815,0.0416 1.436333,0.29581 1.14586,0.56274 1.762492,1.5589 1.768251,2.8566 0.0094,2.10836 -1.870896,3.55161 -3.779655,3.16529 v 3.10345 c 4.345352,0.0758 4.093104,-2.37537 6.573781,-2.25837 1.486139,0.0748 1.333421,0.16555 1.796225,-1.064 l 0.259834,-0.6913 -0.803704,-0.66493 c -0.960855,-0.79478 -1.303983,-1.29079 -1.205013,-1.74132 0.06631,-0.30189 1.20818,-1.50093 1.779011,-1.86778 0.240181,-0.1543 0.244255,-0.17878 0.09575,-0.59661 -0.08522,-0.23979 -0.259522,-0.65746 -0.386789,-0.92744 l -0.23132,-0.49115 h -1.412666 c -1.868582,0 -1.802386,0.068 -1.805368,-1.82472 l -0.0021,-1.43582 -0.917745,-0.37171 z"
+         style="opacity:1;fill:#000000;fill-opacity:0.5372549;stroke:none;stroke-width:0.18460207;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         id="path2133"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2106"
+         style="opacity:1;fill:url(#linearGradient2131);fill-opacity:1;stroke:none;stroke-width:0.17733108;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         d="m 13.832581,227.93117 h 2.858936 v 12.07807 h -2.858936 z m 5.569881,-1.6655 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65257 -0.867647,0.95496 -0.46174,0.45847 -0.615654,0.5498 -0.929658,0.5498 -0.214752,0 -0.365893,-0.056 -0.599446,-0.24079 v 3.05768 c 0.166077,-0.0206 0.345483,-0.0319 0.55242,-0.0338 0.657089,-0.006 0.881987,0.0399 1.379764,0.28416 1.100724,0.54057 1.693073,1.49747 1.698606,2.74408 0.009,2.02535 -1.797211,3.41174 -3.63079,3.04061 v 2.98122 c 4.174205,0.0728 3.931888,-2.28179 6.314859,-2.1694 1.427604,0.0718 1.2809,0.15902 1.725477,-1.02213 l 0.249597,-0.66408 -0.772046,-0.63871 c -0.923009,-0.76345 -1.252622,-1.23996 -1.157552,-1.67277 0.0637,-0.29001 1.160592,-1.44177 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17174 0.09198,-0.57312 -0.08187,-0.23032 -0.249296,-0.63156 -0.371555,-0.89088 l -0.222207,-0.4718 h -1.357022 c -1.794983,0 -1.731396,0.0653 -1.734262,-1.75284 l -0.0021,-1.3793 -0.881603,-0.35705 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2151"
+         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575465,0.0354 v 6.28854 c 1.910653,0.38671 3.792716,-1.05815 3.783336,-3.16865 -0.0058,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482341,1.17002 c 0.433747,-0.004 0.582202,0.0265 0.910784,0.18761 0.726595,0.35682 1.117604,0.98848 1.121256,1.81134 0.0059,1.33694 -1.186343,2.25211 -2.396695,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364655,-0.0225 z"
+         style="opacity:1;fill:url(#linearGradient2160);fill-opacity:1;stroke:none;stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient2180);stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
+         d="m 17.266981,230.95753 c -0.215636,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28853 c 1.910652,0.38672 3.792715,-1.05815 3.783336,-3.16865 -0.0057,-1.29897 -0.623065,-2.29597 -1.77006,-2.85927 -0.518697,-0.2545 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482343,1.17001 c 0.433747,-0.004 0.5822,0.0265 0.910783,0.18762 0.726594,0.35681 1.117605,0.98848 1.121257,1.81133 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00716 v -3.98359 c 0.109628,-0.0135 0.228055,-0.0214 0.364657,-0.0225 z"
+         id="path2170"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1422"
+         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28854 c 1.910652,0.38671 3.792715,-1.05815 3.783335,-3.16865 -0.0057,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482342,1.17002 c 0.433748,-0.004 0.582201,0.0265 0.910784,0.18761 0.726594,0.35682 1.117605,0.98848 1.121257,1.81134 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364656,-0.0225 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1448);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1454"
+         d="m 19.402462,226.26149 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65259 -0.867644,0.95499 -0.461741,0.45847 -0.615657,0.54983 -0.929661,0.54983 -0.214752,0 -0.365893,-0.056 -0.599446,-0.2408 v -0.004 h -2.858741 v 12.0783 h 2.858741 c 4.174205,0.0728 3.931888,-2.28177 6.314861,-2.16937 1.427604,0.0718 1.280898,0.15899 1.725475,-1.02217 l 0.249597,-0.66402 -0.772046,-0.63873 c -0.923009,-0.76346 -1.252622,-1.23997 -1.157552,-1.67278 0.0637,-0.29001 1.160595,-1.44176 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17171 0.09198,-0.57309 -0.08187,-0.23032 -0.249296,-0.63158 -0.371555,-0.8909 l -0.222207,-0.47181 h -1.357025 c -1.794983,0 -1.731393,0.0653 -1.734259,-1.75286 l -0.0021,-1.37925 -0.8816,-0.35708 z"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1485);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(63.49728,-55.136805)"
+       id="g1174" />
+    <g
+       transform="translate(50.48327,11.624037)"
+       id="g1812" />
+  </g>
+</svg>

po/de/demon-editor.po

@@ -1,9 +1,8 @@
-# Copyright (C) 2018-2021 Dmitriy Yefremov
+# Copyright (C) 2018-2020 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 # Charly, 2019.
-# Dmitriy Yefremov, 2020-2021.
-# Thomas Schmidt, 2021
+# Dmitriy Yefremov, 2020.
 msgid ""
 msgstr ""
 "Last-Translator: Dmitriy Yefremov\n"
@@ -13,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "translator-credits"
-msgstr "Charly\nDmitriy Yefremov\nThomas Schmidt"
+msgstr "Charly, Dmitriy Yefremov"
 
 # Main
 msgid "Service"
@@ -23,7 +22,7 @@ msgid "Package"
 msgstr "Paket"
 
 msgid "Type"
-msgstr "Typ"
+msgstr "Model"
 
 msgid "Picon"
 msgstr "Picon"
@@ -32,7 +31,7 @@ msgid "Freq"
 msgstr "Freq"
 
 msgid "Rate"
-msgstr "SR"
+msgstr "Bewertung"
 
 msgid "Pol"
 msgstr "Pol."
@@ -106,9 +105,6 @@ msgstr "Standardbezeichnung setzen"
 msgid "Insert marker"
 msgstr "Marker einfügen"
 
-msgid "Insert space"
-msgstr "Leerzeichen einfügen"
-
 msgid "Locate in services"
 msgstr "In den Diensten suchen"
 
@@ -164,7 +160,7 @@ msgid "Remove"
 msgstr "Entfernen"
 
 msgid "Remove all unavailable"
-msgstr "Entfernen alle nicht verfügbaren"
+msgstr "Entfernt alle nicht verfügbaren"
 
 msgid "Satellites editor"
 msgstr "Satelliten-Editor"
@@ -205,8 +201,8 @@ msgstr "Aktueller Datenpfad:"
 msgid "Data:"
 msgstr "Daten:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Enigma2 Kanal- und Satellitenlisteneditor für GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Enigma2 Kanal- und Satellitenlisteneditor für GNU/Linux"
 
 msgid "Host:"
 msgstr "Host:"
@@ -520,9 +516,6 @@ msgstr "Bitte wählen Sie nur einen Eintrag aus!"
 msgid "No png file is selected!"
 msgstr "Es ist keine png-Datei ausgewählt!"
 
-msgid "No profile selected!"
-msgstr "Kein Profil ausgewählt!"
-
 msgid "No reference is present!"
 msgstr "Es liegt keine Referenz vor!"
 
@@ -667,22 +660,22 @@ msgid "Test connection"
 msgstr "Test Verbindung"
 
 msgid "Double click on the service in the bouquet list:"
-msgstr "Doppelklick auf das Service in der Bouquet-Liste:"
+msgstr "Doppelklicke auf das Service in der Bouquetliste:"
 
 msgid "Zap"
 msgstr "Zap"
 
 msgid "Play  stream"
-msgstr "Stream abspielen"
+msgstr "Play  Stream"
 
 msgid "Disabled"
-msgstr "Deaktiviert"
+msgstr "Ausgeschaltet"
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Lamedb ver. 5 Unterstützung aktivieren"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Lamedb ver. 5 Unterstützung aktivieren (experimentell)"
 
-msgid "Enable HTTP API"
-msgstr "HTTP-API aktivieren"
+msgid "Enable HTTP API (experimental)"
+msgstr "HTTP-API aktivieren (experimentell)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Umschalten des Kanals (Strg + Z)"
@@ -694,7 +687,7 @@ msgid "Play IPTV or other stream in the program(Ctrl + P)"
 msgstr "Wiedergabe von IPTV oder anderen Streams im Programm(Strg + P)"
 
 msgid "Export to m3u"
-msgstr "Exportieren nach m3u"
+msgstr "Export nach m3u"
 
 msgid "EPG configuration"
 msgstr "EPG Konfiguration"
@@ -721,13 +714,13 @@ msgid "Url to *.xml.gz file:"
 msgstr "Url zur *.xml.gz Datei:"
 
 msgid "Enable filtering"
-msgstr "Filter aktivieren"
+msgstr "Filterung einschalten"
 
 msgid "Filter by presence in the epg.dat file."
 msgstr "Filtern nach dem Vorhandensein in der epg.dat Datei."
 
 msgid "Paths to the epg.dat file:"
-msgstr "Pfad zur epg.dat Datei:"
+msgstr "Pfade zur epg.dat Datei:"
 
 msgid "Local path:"
 msgstr "Local path:"
@@ -751,7 +744,7 @@ msgid "Unsupported file type:"
 msgstr "Nicht unterstützter Dateityp:"
 
 msgid "Unpacking data error."
-msgstr "Fehler beim Entpacken der Daten."
+msgstr "Fehler beim Entpacken von Daten."
 
 msgid "XML parsing error:"
 msgstr "XML Parsing-Fehler:"
@@ -766,7 +759,7 @@ msgid "Use HTTP"
 msgstr "HTTP verwenden"
 
 msgid "Close playback"
-msgstr "Wiedergabe schließen"
+msgstr "Wiedergabe schliessen"
 
 msgid "Import YouTube playlist"
 msgstr "YouTube-Wiedergabeliste importieren"
@@ -775,8 +768,8 @@ msgid ""
 "Found a link to the YouTube resource!\n"
 "Try to get a direct link to the video?"
 msgstr ""
-"Link zur YouTube-Ressource gefunden!\n"
-"Soll versucht werden, einen Direkt-Link zum Video zu erzeugen?"
+"Ich habe einen Link zur YouTube-Ressource gefunden!\n"
+"Versuchen einen direkten Link zum Video zu bekommen?"
 
 msgid "Playlist import"
 msgstr "Playlist-Import"
@@ -785,7 +778,7 @@ msgid "Getting link error:"
 msgstr "Link-Fehler erhalten:"
 
 msgid "Extra"
-msgstr "Extras"
+msgstr "Extra"
 
 msgid "Apply profile settings"
 msgstr "Profileinstellungen anwenden"
@@ -794,7 +787,7 @@ msgid "Settings type:"
 msgstr "Art der Einstellungen:"
 
 msgid "Set default"
-msgstr "Standard wiederherstellen"
+msgstr "Standard setzen"
 
 msgid "Language:"
 msgstr "Sprache:"
@@ -802,20 +795,20 @@ msgstr "Sprache:"
 msgid "Load the last open configuration at program startup"
 msgstr "Laden der zuletzt geöffneten Konfiguration beim Programmstart"
 
-msgid "Enable direct playback bar"
-msgstr "Aktivieren der direkten Wiedergabeleiste"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Aktivieren der direkten Wiedergabeleiste (experimentell)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
-msgstr "Ermöglicht das direkte Senden und Abspielen von Medienlinks auf dem Receiver"
+msgstr "Ermöglicht das direkte Senden und Abspielen von Medienlinks auf dem Box"
 
 msgid "Watch the channel in the program"
-msgstr "Kanal im Programm ansehen"
+msgstr "Gucken den Kanal im Programm an"
 
 msgid "Zap and Play"
 msgstr "Zap und Abspielen"
 
 msgid "Drag  or paste the link here"
-msgstr "Link hineinziehen oder einfügen"
+msgstr "Ziehe den Link hierher oder füge ihn ein"
 
 msgid "Remove added links in the playlist"
 msgstr "Hinzugefügte Links in der Wiedergabeliste entfernen"
@@ -833,13 +826,13 @@ msgid "Reset"
 msgstr "Reset"
 
 msgid "File"
-msgstr "Datei"
+msgstr "Ablage"
 
 msgid "Picons manager"
 msgstr "Picons-Manager"
 
 msgid "Explorer"
-msgstr "Explorer"
+msgstr ""
 
 msgid "Satellite url:"
 msgstr "Satellit URL:"
@@ -917,40 +910,40 @@ msgid "Height (px):"
 msgstr "Höhe (px):"
 
 msgid "Channels:"
-msgstr "Kanäle:"
+msgstr "Kanälen:"
 
 msgid "Sample rate (Hz):"
-msgstr "Sample-Rate (Hz):"
+msgstr "Samplerate (Hz):"
 
 msgid "Play streams mode:"
-msgstr "Stream-Abspielmodus:"
+msgstr "Streams Abspielen-Modus:"
 
 msgid "Built-in player"
 msgstr "Integrierter Player"
 
-msgid "In a separate window"
-msgstr "In einem separaten Fenster"
+msgid "VLC media player"
+msgstr "VLC Media Player"
 
 msgid "Only get m3u file"
 msgstr "Nur m3u-Datei erhalten"
 
 msgid "Save and restart the program to apply the settings."
-msgstr "Änderungen speichern und anschließend das Programm neustarten, um die Einstellungen zu übernehmen."
+msgstr "Speicher und starte das Programm neu, um die Einstellungen zu übernehmen."
 
 msgid "Some images may have problems displaying the favorites list!"
-msgstr "Einige Bilder können Probleme in der Anzeige der Favoritenliste haben!"
+msgstr "Einige Images können Probleme mit der Anzeige der Favoritenliste haben!"
 
 msgid "Operates in standby mode or current active transponder!"
-msgstr "Arbeitet im Standby-Modus oder der Transponder ist bereits in Verwendung!"
+msgstr "Arbeitet im Standby-Modus oder auf dem aktuell aktiven Transponder!"
 
 msgid "No connection to the receiver!"
-msgstr "Keine Verbindung zum Receiver!"
+msgstr "Keine Verbindung zum Box!"
 
 msgid "Signal level"
 msgstr "Signalpegel"
 
 msgid "Receiver info"
-msgstr "Receiver-Info"
+msgstr "Box-Info"
 
 msgid "A profile with that name exists!"
 msgstr "Ein Profil mit diesem Namen existiert!"
@@ -959,10 +952,10 @@ msgid "Show short info as hints in the main services list"
 msgstr "Kurzinfos als Tooltips in der Hauptliste anzeigen"
 
 msgid "Show detailed info as hints in the bouquet list"
-msgstr "Detaillierte Informationen als Tooltips in der Bouquetliste anzeigen"
+msgstr "Detaillierteinfos als Tooltips in der Bouquetliste anzeigen"
 
 msgid "Enable alternate bouquet file naming"
-msgstr "Aktivieren der alternativen Benennung für Bouquet-Dateien"
+msgstr "Aktivieren der Alternativerbenennung für Bouquet-Dateien"
 
 msgid "Allows you to name bouquet files using their names."
 msgstr "Ermöglicht Bouquet-Dateien mit ihren Namen zu benennen."
@@ -971,7 +964,7 @@ msgid "Appearance"
 msgstr "Aussehen"
 
 msgid "Enable Themes support"
-msgstr "Theme Unterstützung aktivieren"
+msgstr "Unterstützung von Themen aktivieren"
 
 msgid "Gtk3 Theme:"
 msgstr "Gtk3-Theme:"
@@ -980,7 +973,7 @@ msgid "Icon Theme:"
 msgstr "Icon-Theme:"
 
 msgid "Gtk3 Themes and Icons:"
-msgstr "Gtk3 Themes und Icons:"
+msgstr "Gtk3 Themes and Icons:"
 
 msgid "Deleting data..."
 msgstr "Daten löschen..."
@@ -989,7 +982,7 @@ msgid "Download from the receiver"
 msgstr "Downloaden vom Receiver"
 
 msgid "Remove all picons from the receiver"
-msgstr "Alle Picons vom dem Receiver entfernen"
+msgstr "Alle Picons aus dem Receiver entfernen"
 
 msgid "Service reference"
 msgstr "Kanalreferenz"
@@ -1022,7 +1015,7 @@ msgid "Are you sure you want to change the order\n\t of services in this bouquet
 msgstr "Bist du sicher, dass du die Reihenfolge der Dienstleistungen\n\t in diesem Bouquet ändern willst?"
 
 msgid "Remove from the receiver"
-msgstr "Vom Receiver entfernen"
+msgstr "Aus dem Receiver entfernen"
 
 msgid "Screenshot"
 msgstr "Screenshot"
@@ -1030,236 +1023,3 @@ msgstr "Screenshot"
 msgid "Video"
 msgstr "Video"
 
-msgid "The Neutrino has only experimental support. Not all features are supported!"
-msgstr "Die Neutrino hat nur experimentelle Unterstützung. Nicht alle Funktionen werden unterstützt!"
-
-msgid "Enable experimental features"
-msgstr "Experimentelle Funktionen aktivieren"
-
-msgid "Can't Playback!"
-msgstr "Kann nicht abgespielt werden!"
-
-msgid "Enable Dark Mode"
-msgstr "Dunkler Modus aktivieren"
-
-msgid "Extract..."
-msgstr "Entpacken..."
-
-msgid "Unsupported format!"
-msgstr "Nicht unterstütztes Format!"
-
-msgid "Combine with the current data?"
-msgstr "Mit den aktuellen Daten kombinieren?"
-
-msgid "Importing data done!"
-msgstr "Daten-Import abgeschlossen!"
-
-msgid "Current service"
-msgstr "Aktueller Service"
-
-msgid "Open folder"
-msgstr "Ordner öffnen"
-
-msgid "Open archive"
-msgstr "Archiv öffnen"
-
-msgid "Import from Web"
-msgstr "Import aus dem Internet"
-
-msgid "Control"
-msgstr "Steuerung"
-
-msgid "Timers"
-msgstr "Timer"
-
-msgid "Timer"
-msgstr "Timer"
-
-msgid "Add timer"
-msgstr "Timer hinzufügen"
-
-msgid "Hr."
-msgstr "Std."
-
-msgid "Min."
-msgstr "Min."
-
-msgid "Power"
-msgstr "Power"
-
-msgid "Standby"
-msgstr "Standby"
-
-msgid "Wake Up"
-msgstr "Aufwachen"
-
-msgid "Reboot"
-msgstr "Neustarten"
-
-msgid "Restart GUI"
-msgstr "GUI neustarten"
-
-msgid "Shutdown"
-msgstr "Ausschalten"
-
-msgid "Shut down"
-msgstr "Ausschalten"
-
-msgid "Do Nothing"
-msgstr "Nichts tun"
-
-msgid "Auto"
-msgstr "Auto"
-
-msgid "Grab screenshot"
-msgstr "Screenshot aufnehmen"
-
-msgid "Enabled:"
-msgstr "Aktiviert:"
-
-msgid "Name:"
-msgstr "Name:"
-
-msgid "Description:"
-msgstr "Beschreibung:"
-
-msgid "Service:"
-msgstr "Service"
-
-msgid "Service reference:"
-msgstr "Kanalreferenz"
-
-msgid "Event ID:"
-msgstr "Ereignis-ID:"
-
-msgid "Begins:"
-msgstr "Beginnt:"
-
-msgid "Ends:"
-msgstr "Endet:"
-
-msgid "Repeated:"
-msgstr "Wiederholt:"
-
-msgid "Action:"
-msgstr "Aktion:"
-
-msgid "After event:"
-msgstr "Nach dem Ereignis:"
-
-msgid "Location:"
-msgstr "Zielverzeichnis:"
-
-msgid "Mo"
-msgstr "Mo"
-
-msgid "Tu"
-msgstr "Di"
-
-msgid "We"
-msgstr "Mi"
-
-msgid "Th"
-msgstr "Do"
-
-msgid "Fr"
-msgstr "Fr"
-
-msgid "Sa"
-msgstr "Sa"
-
-msgid "Su"
-msgstr "So"
-
-msgid "Set"
-msgstr "Einstellen"
-
-msgid "Services update"
-msgstr "Dienste-Update"
-
-msgid "Create folder"
-msgstr "Ordner erstellen"
-
-msgid "FTP client"
-msgstr "FTP-Client"
-
-msgid "The file size is too large!"
-msgstr "Die Datei ist zu groß!"
-
-msgid "Connect"
-msgstr "Verbinden"
-
-msgid "Disconnect"
-msgstr "Verbindung trennen"
-
-msgid "Size"
-msgstr "Größe"
-
-msgid "Date"
-msgstr "Datum"
-
-msgid "Attr."
-msgstr "Attr."
-
-msgid "Toggle display position"
-msgstr "Anzeigeposition umschalten"
-
-msgid "Alternatives"
-msgstr "Alternativen"
-
-msgid "Add alternatives"
-msgstr "Alternativen hinzufügen"
-
-msgid "DreamOS only!"
-msgstr "Nur DreamOS!"
-
-msgid "A similar service is already in this list!"
-msgstr "Ein ähnlicher Dienst ist bereits in dieser Liste enthalten!"
-
-msgid "Play mode has been changed!\nRestart the program to apply the settings."
-msgstr "Abspiel-Modus wurde geändert!\nStarte  das Programm neu, um die Einstellungen zu übernehmen."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Stelle die Werte für TID, NID und Namespace für die korrekte Benennung der Picons ein!"
-
-msgid "Streams detected:"
-msgstr "Streams gefunden:"
-
-msgid "Download picons"
-msgstr "Download picons"
-
-msgid "Errors:"
-msgstr "Fehler:"
-
-msgid "Use to play streams:"
-msgstr "Zum Abspielen von Streams verwenden:"
-
-msgid "Font in the lists:"
-msgstr "Schrift in den Listen:"
-
-msgid "Picons size in the lists:"
-msgstr "Picons Größe in den Listen:"
-
-msgid "Logo size in tooltips:"
-msgstr "Logo-Größe in Tooltips:"
-
-msgid "Save as"
-msgstr "Speichern als"
-
-msgid "Mark duplicates"
-msgstr "Duplikate markieren"
-
-msgid "Load only for selected bouquet"
-msgstr "Nur für ausgewähltes Bouquet laden"
-
-msgid "The task is canceled!"
-msgstr "Der Task wird abgebrochen!"
-
-msgid "Data loading in progress!"
-msgstr "Daten werden geladen!"
-
-msgid "Recordings"
-msgstr "Aufnahmen"
-
-msgid "Help"
-msgstr "Hilfe"

po/es/demon-editor.po

@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2020 Frank Neirynck
 # This file is distributed under the MIT license.
 #
-# Frank Neirynck <frank@insink.be>, 2018-2020.
+# Frank Neirynck <frank@insink.be>, 2018-2019.
 #
 msgid ""
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Current IP:"
 msgstr "IP actual:"
 
 msgid "Assign"
-msgstr "Asignar"
+msgstr "Assignar"
 
 msgid "Bouquet details"
 msgstr "Detalles bouquet"
@@ -66,7 +66,7 @@ msgid "Copy"
 msgstr "Copiar"
 
 msgid "Copy reference"
-msgstr "Copiar referencia"
+msgstr "Copia de referencia"
 
 msgid "Download"
 msgstr "Descargar"
@@ -123,7 +123,7 @@ msgid "New"
 msgstr "Nuevo"
 
 msgid "New bouquet"
-msgstr "Nuevo bouquet"
+msgstr "Bouquet nuevo"
 
 msgid "Create bouquet"
 msgstr "Crear bouquet"
@@ -156,10 +156,10 @@ msgid "Picons"
 msgstr "Picons"
 
 msgid "Picons downloader"
-msgstr "Descarga de picons"
+msgstr "Descargar picons"
 
 msgid "Satellites downloader"
-msgstr "Descarga de satélites"
+msgstr "Descargar satélites"
 
 msgid "Remove"
 msgstr "Quitar"
@@ -206,11 +206,11 @@ msgstr "Ruta de datos actual:"
 msgid "Data:"
 msgstr "Datos:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Editor de canales y satélites Enigma2 para GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Editor de canales y satélites Enigma2 para GNU/Linux"
 
 msgid "Host:"
-msgstr "Host:"
+msgstr "Anfitrión:"
 
 msgid "Loading data..."
 msgstr "Cargando datos..."
@@ -256,7 +256,7 @@ msgstr "Extra:"
 
 # Filter bar
 msgid "Only free"
-msgstr "Solamente libres"
+msgstr "Solamente gratis"
 
 msgid "All positions"
 msgstr "Todas las posiciones"
@@ -272,10 +272,10 @@ msgid "Stop playback"
 msgstr "Detener la reproducción"
 
 msgid "Previous stream in the list"
-msgstr "Anterior stream en la lista"
+msgstr "Anterior flujo en la lista"
 
 msgid "Next stream in the list"
-msgstr "Siguiente stream en la lista"
+msgstr "Siguiente flujo en la lista"
 
 msgid "Toggle in fullscreen"
 msgstr "Cambiar a pantalla completa"
@@ -294,7 +294,7 @@ msgid "Receive picons"
 msgstr "Recibir picons"
 
 msgid "Picons name format:"
-msgstr "Formato del nombre de los picons:"
+msgstr "Picons formato nombres:"
 
 msgid "Resize:"
 msgstr "Redimensionar:"
@@ -433,7 +433,7 @@ msgstr "Buscar"
 
 # IPTV dialog
 msgid "Stream data"
-msgstr "Transmitir stream"
+msgstr "Transmitir flujo"
 
 # IPTV list configuration dialog
 msgid "Starting values"
@@ -443,7 +443,7 @@ msgid "Reset to default"
 msgstr "Restablecer a predeterminado"
 
 msgid "IPTV streams list configuration"
-msgstr "Configurar lista de streams IPTV"
+msgstr "Configurar lista de flujos IPTV"
 
 # Settings dialog
 msgid "Preferences"
@@ -511,13 +511,13 @@ msgid "No m3u file is selected!"
 msgstr "¡No se ha seleccionado ningún fichero m3u!"
 
 msgid "Not implemented yet!"
-msgstr "¡No implementado!"
+msgstr "¡Aún sin implementar!"
 
 msgid "The text of marker is empty, please try again!"
 msgstr "¡El texto del marcador está vacío, inténtalo de nuevo!"
 
 msgid "Please, select only one item!"
-msgstr "¡Por favor, seleccione un único elemento!"
+msgstr "¡Por favor, seleccione sólo un elemento!"
 
 msgid "No png file is selected!"
 msgstr "¡No se ha seleccionado ningún fichero png!"
@@ -526,7 +526,7 @@ msgid "No reference is present!"
 msgstr "¡Ninguna referencia presente!"
 
 msgid "No selected item!"
-msgstr "¡No se ha seleccionado ningún elemento!"
+msgstr "¡Ningún elemento seleccionado!"
 
 msgid "The task is already running!"
 msgstr "¡La tarea ya se está ejecutando!"
@@ -562,23 +562,23 @@ msgid "Operation not allowed in this context!"
 msgstr "¡Operación no permitida en este contexto!"
 
 msgid "No VLC is found. Check that it is installed!"
-msgstr "VLC no encontrado. ¡Compruebe que está instalado!"
+msgstr "VLC no encontrado. ¡Verifique que está instalado!"
 
 # Search unavailable streams dialog
 msgid "Please wait,  streams testing  in progress..."
-msgstr "Por favor espere, hay una prueba de stream en progreso..."
+msgstr "Por favor espere, hay una prueba de flujo en progreso..."
 
 msgid "Found"
 msgstr "Encontrado"
 
 msgid "unavailable streams."
-msgstr "Streams no presentes."
+msgstr "Flujos no presentes."
 
 msgid "No changes required!"
-msgstr "¡No se requieren cambios!"
+msgstr "¡Ningún cambio requerido!"
 
 msgid "This list does not contains IPTV streams!"
-msgstr "¡La lista no contiene streams IPTV!"
+msgstr "¡La lista no contiene flujos IPTV!"
 
 msgid "New empty configuration"
 msgstr "Nueva configuración vacía"
@@ -672,16 +672,16 @@ msgid "Zap"
 msgstr "Zapear"
 
 msgid "Play  stream"
-msgstr "Reproducir stream"
+msgstr "Reproducir flujo"
 
 msgid "Disabled"
 msgstr "Desactivado"
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Soporte para lamedb ver. 5"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Soporte para ver. 5 (experimental)"
 
-msgid "Enable HTTP API"
-msgstr "Habilitar API HTTP"
+msgid "Enable HTTP API (experimental)"
+msgstr "Habilitar API HTTP (experimental)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Poner el canal (Ctrl + Z)"
@@ -690,7 +690,7 @@ msgid "Switch the channel and watch in the program(Ctrl + W)"
 msgstr "Poner el canal y ver en el programa (Ctrl + W)"
 
 msgid "Play IPTV or other stream in the program(Ctrl + P)"
-msgstr "Reproducir IPTV u otro stream en el programa (Ctrl + P)"
+msgstr "Reproducir IPTV u otro flujo en el programa (Ctrl + P)"
 
 msgid "Export to m3u"
 msgstr "Exportar a m3u"
@@ -795,10 +795,10 @@ msgid "Language:"
 msgstr "Idioma:"
 
 msgid "Load the last open configuration at program startup"
-msgstr "Cargar la última configuración usada al iniciar el programa"
+msgstr "Cargar la última configuración abierta al iniciar el programa"
 
-msgid "Enable direct playback bar"
-msgstr "Habilitar la barra de reproducción directa"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Habilitar la barra de reproducción directa (experimental)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Habilita el envío directo y la reproducción de enlaces de medios en el receptor"
@@ -828,16 +828,16 @@ msgid "Reset"
 msgstr "Reset"
 
 msgid "File"
-msgstr "Fichero"
+msgstr "Archivo"
 
 msgid "Picons manager"
-msgstr "Gestor de picons"
+msgstr "Picons manager"
 
 msgid "Explorer"
 msgstr "Explorador"
 
 msgid "Satellite url:"
-msgstr "Url satélite:"
+msgstr "Url Satelite:"
 
 msgid "Cut"
 msgstr "Cortar"
@@ -867,43 +867,43 @@ msgid "IPTV tools"
 msgstr "Intrumentos IPTV"
 
 msgid "Make profile folder as default for the additional data"
-msgstr "Usar por defecto el directorio de perfil para los datos adionales"
+msgstr "Has folder de perfil estandar para datos adicionales"
 
 msgid "Default data path:"
-msgstr "Ruta estándar de datos:"
+msgstr "Ruta estandar de datos:"
 
 msgid "Streams record path:"
-msgstr "Ruta de grabación del stream:"
+msgstr "Ruta de gravacion de stream:"
 
 msgid "Record"
-msgstr "Grabación"
+msgstr "Gravar"
 
 msgid "Record:"
-msgstr "Grabación:"
+msgstr "Gravar:"
 
 msgid "Record to disk:"
-msgstr "Grabación en disco:"
+msgstr "Gravar en disco:"
 
 msgid "Streaming"
-msgstr "Streaming"
+msgstr "Streameando"
 
 msgid "Activate transcoding"
-msgstr "Activar transcodificación"
+msgstr "Activer transcodificacion"
 
 msgid "Presets:"
-msgstr "Preajustes:"
+msgstr "Presets:"
 
 msgid "Video options:"
-msgstr "Opciones vídeo:"
+msgstr "Opciones Video:"
 
 msgid "Audio options:"
-msgstr "Opciones audio:"
+msgstr "Opciones Audio:"
 
 msgid "Bitrate (kb/s):"
 msgstr "Bitrate (kb/s):"
 
 msgid "Codec:"
-msgstr "Códec:"
+msgstr "Codec:"
 
 msgid "Width (px):"
 msgstr "Ancho (px):"
@@ -915,10 +915,10 @@ msgid "Channels:"
 msgstr "Canales:"
 
 msgid "Sample rate (Hz):"
-msgstr "Frecuencia de muestreo (Hz):"
+msgstr "Sample rate (Гц):"
 
 msgid "Play streams mode:"
-msgstr "Modo de reproducción de los streams:"
+msgstr "Tocar en modo streams:"
 
 msgid "Built-in player"
 msgstr "Reproductor interno"
@@ -927,40 +927,40 @@ msgid "VLC media player"
 msgstr "Reproductor VLC"
 
 msgid "Only get m3u file"
-msgstr "Sólo bajar fichero m3u"
+msgstr "Solo bajar archivo *.m3u"
 
 msgid "Save and restart the program to apply the settings."
-msgstr "Guardar y reiniciar el programa para aplicar la configuración."
+msgstr "Guarde y reinicie el programa para aplicar la configuración."
 
 msgid "Some images may have problems displaying the favorites list!"
-msgstr "Algunas imágenes pueden tener problemas al mostrar la lista de favoritos!"
+msgstr "Algunas imágenes pueden tener problemas para mostrar la lista de favoritos!"
 
 msgid "Operates in standby mode or current active transponder!"
-msgstr "¡Funciona en modo de espera o transpondedor activo actual!"
+msgstr "Funciona en modo de espera o transpondedor activo actual!"
 
 msgid "No connection to the receiver!"
-msgstr "¡Desconectado del receptor!"
+msgstr "Sin conexión al receptor!"
 
 msgid "Signal level"
 msgstr "Nivel de señal"
 
 msgid "Receiver info"
-msgstr "Información sobre el receptor"
+msgstr "Informacion sobre receptor"
 
 msgid "A profile with that name exists!"
-msgstr "¡Ya existe un perfil con ese nombre!"
+msgstr "Existe un perfil con ese nombre!"
 
 msgid "Show short info as hints in the main services list"
 msgstr "Mostrar información breve como sugerencias en la lista de servicios principal"
 
 msgid "Show detailed info as hints in the bouquet list"
-msgstr "Mostrar información detallada como consejo en la lista de bouquets"
+msgstr "Mostrar información detallada como pistas en la lista de bouquet"
 
 msgid "Enable alternate bouquet file naming"
-msgstr "Habilitar nombres alternativos para los ficheros de bouquets"
+msgstr "Habilitar nombres alternativos de archivos de bouquet"
 
 msgid "Allows you to name bouquet files using their names."
-msgstr "Permite nombrar ficheros de bouquets usando sus propios nombres."
+msgstr "Le permite nombrar archivos de bouquet usando sus nombres."
 
 msgid "Appearance"
 msgstr "Apariencia"
@@ -969,16 +969,16 @@ msgid "Enable Themes support"
 msgstr "Habilitar compatibilidad con temas"
 
 msgid "Gtk3 Theme:"
-msgstr "Теma Gtk3:"
+msgstr "Тема Gtk3:"
 
 msgid "Icon Theme:"
-msgstr "Icono del tema:"
+msgstr "Тема Icono:"
 
 msgid "Gtk3 Themes and Icons:"
-msgstr "Tema Gtk3 e iconos:"
+msgstr "Tema Gtk3 e Iconos:"
 
 msgid "Deleting data..."
-msgstr "Borrando datos..."
+msgstr "Borrando datos ..."
 
 msgid "Download from the receiver"
 msgstr "Descargar desde el receptor"
@@ -987,13 +987,13 @@ msgid "Remove all picons from the receiver"
 msgstr "Eliminar todos los picons del receptor"
 
 msgid "Service reference"
-msgstr "Referencia del servicio"
+msgstr "Referencia de servicio"
 
 msgid "Enable support for"
 msgstr "Habilitar soporte para"
 
 msgid "Auto-check for updates"
-msgstr "Comprobación automática de actualizaciones"
+msgstr "Verificación automática de actualizaciones"
 
 msgid "Filter services"
 msgstr "Filtrar servicios"
@@ -1005,23 +1005,23 @@ msgid "Destination:"
 msgstr "Destino:"
 
 msgid "EXPERIMENTAL!"
-msgstr "¡EXPERIMENTAL!"
+msgstr "EXPERIMENTAL!"
 
 msgid "Sorting data..."
 msgstr "Ordenando datos..."
 
 msgid "There are unsaved changes.\n\n\t Save them now?"
-msgstr "Hay cambios sin guardar.\n\n\t ¿Desea guardarlos ahora?"
+msgstr "Hay cambios sin guardar.\n\n\t ¿Guardarlos ahora?"
 
 msgid "Are you sure you want to change the order\n\t of services in this bouquet?"
-msgstr "¿Está seguro de querer cambiar el orden\n\t de servicios en este bouquet?"
+msgstr "¿Está seguro de que desea cambiar el orden\n\t de servicios en este bouquet?"
 
 msgid "Remove from the receiver"
-msgstr "Eliminar del receptor"
+msgstr "Retirar del receptor"
 
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
 msgid "Video"
-msgstr "Vídео"
+msgstr "Vidео"
 

po/nl/demon-editor.po

@@ -201,8 +201,8 @@ msgstr "Huidig datapad:"
 msgid "Data:"
 msgstr "Data:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Enigma2 kanaal and satelliet lijst editor voor GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Enigma2 kanaal and satelliet lijst editor voor GNU/Linux"
 
 msgid "Host:"
 msgstr "Host:"
@@ -671,11 +671,11 @@ msgstr "Speel stream af"
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Ondersteuning voor lamedb ver. 5 inschakelen"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Ondersteuning voor ver. 5 inschakelen (experimenteel)"
 
-msgid "Enable HTTP API"
-msgstr "HTTP API inschakelen"
+msgid "Enable HTTP API (experimental)"
+msgstr "HTTP API inschakelen (experimenteel)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Schakelaar (ZAP) naar het kanaal (CTRL + Z)"
@@ -791,8 +791,8 @@ msgstr "Taal:"
 msgid "Load the last open configuration at program startup"
 msgstr "Laad de laatst geopende configuratie op bij opstart programma"
 
-msgid "Enable direct playback bar"
-msgstr "Laat onmiddelijk playback bar toe"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Laat onmiddelijk playback bar toe (experimenteel)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Laat rechtstreeks versturen van and playback en media links op de ontvanger toe"

po/pl/demon-editor.po

@@ -1,7 +1,6 @@
-# Copyright (C) 2018-2020 Dmitriy Yefremov
+# Copyright (C) 2018-2019 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
-#
 msgid ""
 msgstr ""
 "Last-Translator: wwns\n"
@@ -206,8 +205,8 @@ msgstr "Aktualna ścieżka danych:"
 msgid "Data:"
 msgstr "Dane:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Edytor kanałów Enigma2 i listy satelitów dla GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Edytor kanałów Enigma2 i listy satelitów dla GNU/Linux"
 
 msgid "Host:"
 msgstr "Host:"
@@ -266,9 +265,6 @@ msgstr "Ukryj/Pomiń"
 msgid "Parent lock"
 msgstr "Blokada rodzicielska"
 
-msgid "There are unsaved changes.\n\n\t Save them now?"
-msgstr "Istnieją niezapisane zmiany.\n\n\t Zapisać je teraz?"
-
 # Filter bar
 msgid "Only free"
 msgstr "Tylko FTA"
@@ -390,12 +386,6 @@ msgid "Remove selection"
 msgstr "Usuń wybrane"
 
 # Service details dialog
-msgid "To the top"
-msgstr "Przenieś na góre bukietu"
-
-msgid "To the end"
-msgstr "Przenieś na koniec bukietu"
-
 msgid "Service data:"
 msgstr "Dane usług:"
 
@@ -606,6 +596,9 @@ msgstr "Brak danych do zapisania!"
 msgid "Network"
 msgstr "Sieć"
 
+msgid "Program"
+msgstr "Program"
+
 msgid "Backup"
 msgstr "Kopia"
 
@@ -633,15 +626,6 @@ msgstr "Wyjście"
 msgid "Tools"
 msgstr "Narzędzia"
 
-msgid "Cut"
-msgstr "Wytnij"
-
-msgid "Paste"
-msgstr "Wklej"
-
-msgid "Insert space"
-msgstr "Wstaw spację"
-
 # Import
 msgid "Import"
 msgstr "Importuj"
@@ -664,12 +648,12 @@ msgstr "Usuń wszystkie nieużywane"
 msgid "Test"
 msgstr "Test"
 
-msgid "Details"
-msgstr "Właściwości"
-
 msgid "Test connection"
 msgstr "Testuj połączenie"
 
+msgid "Double click on the service in the bouquet list:"
+msgstr "Kliknij dwukrotnie usługę na liście bukietów:"
+
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Przełącz(zap) kanał(Ctrl + Z)"
 
@@ -683,7 +667,7 @@ msgid "Export to m3u"
 msgstr "Eksportuj do m3u"
 
 msgid "EPG configuration"
-msgstr "Konfiguruj EPG"
+msgstr "Koniguruj EPG"
 
 msgid "Apply"
 msgstr "Zatwierdź"
@@ -770,11 +754,17 @@ msgstr "Import listy odtwarzania"
 msgid "Getting link error:"
 msgstr "Błąd pobierania łącza:"
 
+msgid "Apply profile settings"
+msgstr "Zastosuj ustawienia profilu"
+
 msgid "Settings type:"
 msgstr "Ustawienia dla:"
 
 msgid "Set default"
-msgstr "Ustaw domyślnie"
+msgstr "Uataw domyślnie"
+
+msgid "Enable direct playback bar (experimental)"
+msgstr "Włącz pasek bezpośredniego odtwarzania (eksperymentalnie)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Umożliwia bezpośrednie wysyłanie i odtwarzanie łączy multimedialnych w odbiorniku"
@@ -795,10 +785,7 @@ msgid "Remove picons from the receiver"
 msgstr "Usuń pikony z odbiornika"
 
 msgid "Use http to reload data in the receiver."
-msgstr "Użyj http aby przeładować dane w odbiorniku."
-
-msgid "Apply profile settings"
-msgstr "Zastosuj ustawienia profilu"
+msgstr "Użyj http aby ponownie załadować dane do odbiornika."
 
 msgid "Drag  or paste the link here"
 msgstr "Przeciągnij lub wklej tutaj link"
@@ -821,16 +808,10 @@ msgstr "Pobierz z odbiornika"
 msgid "The Neutrino has only experimental support. Not all features are supported!"
 msgstr "Neutrino ma jedynie wsparcie eksperymentalne. Nie wszystkie funkcje są obsługiwane!"
 
-msgid "Some images may have problems displaying the favorites list!"
-msgstr "Niektóre obrazy mogą mieć problemy z wyświetlaniem listy ulubionych!"
-
 # Appearance
 msgid "Appearance"
 msgstr "Wygląd"
 
-msgid "Enable Dark Mode"
-msgstr "Włącz tryb ciemny"
-
 msgid "Enable Themes support"
 msgstr "Włącz obsługę motywów"
 
@@ -853,17 +834,23 @@ msgstr "Zapisz i uruchom ponownie program, aby zastosować ustawienia."
 msgid "Extra"
 msgstr "Ekstra"
 
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Włącz wer. 5 wsparcie (eksperymentalne)"
+
 msgid "Enable alternate bouquet file naming"
 msgstr "Włącz alternatywne nazewnictwo plików bukietów"
 
+msgid "Some images may have problems displaying the favorites list!"
+msgstr "Niektóre obrazy mogą mieć problemy z wyświetlaniem listy ulubionych!"
+
 msgid "Allows you to name bouquet files using their names."
 msgstr "Pozwala nazwać pliki bukietów przy użyciu ich nazw."
 
-msgid "Enable HTTP API"
-msgstr "Włącz API HTTP"
+msgid "Enable HTTP API (experimental)"
+msgstr "Włącz API HTTP (eksperymentalne)"
 
-msgid "Double click on the service in the bouquet list:"
-msgstr "Kliknij dwukrotnie usługę na liście bukietów:"
+msgid "Enable send to receiver (experimental)"
+msgstr "Włącz wysyłanie do odbiornika (eksperymentalne)"
 
 msgid "Zap"
 msgstr "Przełącz"
@@ -880,28 +867,6 @@ msgstr "Odtwórz strumień"
 msgid "Disabled"
 msgstr "Wyłączone"
 
-msgid "Enable experimental features"
-msgstr "Włącz funkcje eksperymentalne"
-
-msgid "Enable lamedb ver. 5 support"
-msgstr "Włącz wsparcie dla lamedb w wer.5"
-
-msgid "Enable support for"
-msgstr "Włącz obsługę"
-
-msgid "Enables parsing links using youtube-dl to get direct links to media"
-msgstr "Umożliwia analizowanie linków za pomocą youtube-dl, aby uzyskać bezpośrednie linki do multimediów"
-
-msgid "Auto-check for updates"
-msgstr "Automatyczne sprawdzanie aktualizacji"
-
-msgid "Enable direct playback bar"
-msgstr "Włącz pasek bezpośredniego odtwarzania"
-
-#Program
-msgid "Program"
-msgstr "Program"
-
 msgid "Language:"
 msgstr "Język:"
 
@@ -911,7 +876,7 @@ msgstr "Załaduj ostatnią otwartą konfigurację podczas uruchamiania programu"
 msgid "Show short info as hints in the main services list"
 msgstr "Pokaż krótkie informacje jako wskazówki na głównej liście usług"
 
-msgid "Show detailed info as hints in the bouquet list" 
+msgid "Show detailed info as hints in the bouquet list"
 msgstr "Pokaż szczegółowe informacje jako wskazówki na liście bukietów"
 
 msgid "Set background color for the services"
@@ -997,8 +962,8 @@ msgstr "Ustawia folder profilu jako domyślny do przechowywania pikonów, kopii
 msgid "Default data path:"
 msgstr "Domyślna ścieżka danych:"
 
-msgid "Record:"
-msgstr "Nagrania:"
+msgid "Record"
+msgstr "Nagrania"
 
 msgid "Streams record path:"
 msgstr "Ścieżka zapisu nagrań:"

po/pt/demon-editor.po

@@ -201,8 +201,8 @@ msgstr "Rota de dados atual:"
 msgid "Data:"
 msgstr "Dados:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Editor de Canais e Satélites Enigma2 para GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Editor de Canais e Satélites Enigma2 para GNU/Linux"
 
 msgid "Host:"
 msgstr "Anfitrião:"
@@ -663,11 +663,11 @@ msgstr "Play  stream"
 msgid "Disabled"
 msgstr "Desativado"
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Ativar lamedb ver. 5 suporte"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Ativar ver. 5 suporte (experimental)"
 
-msgid "Enable HTTP API"
-msgstr "Ativar HTTP API"
+msgid "Enable HTTP API (experimental)"
+msgstr "Ativar HTTP API (experimental)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Mudar(zap) o canal(Ctrl + Z)"
@@ -783,8 +783,8 @@ msgstr "Idioma:"
 msgid "Load the last open configuration at program startup"
 msgstr "Cargar la última configuración abierta al iniciar el programa"
 
-msgid "Enable direct playback bar"
-msgstr "Habilitar la barra de reproducción directa"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Habilitar la barra de reproducción directa (experimental)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Habilita el envío directo y la reproducción de enlaces de medios en el receptor"

po/ru/demon-editor.po

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Dmitriy Yefremov
+# Copyright (C) 2018-2020 Dmitriy Yefremov
 # This file is distributed under the MIT license.
 #
 #
@@ -104,9 +104,6 @@ msgstr "Имя по умолчанию"
 msgid "Insert marker"
 msgstr "Вставить маркер"
 
-msgid "Insert space"
-msgstr "Вставить пробел"
-
 msgid "Locate in services"
 msgstr "Найти в списке сервисов"
 
@@ -203,8 +200,8 @@ msgstr "Текущий путь к данным:"
 msgid "Data:"
 msgstr "Данные:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "Редактор списка каналов и спутников Enigma2\n для GNU/Linux."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "Редактор списка каналов и спутников Enigma2\n для GNU/Linux"
 
 msgid "Host:"
 msgstr "Адрес ресивера:"
@@ -510,9 +507,6 @@ msgstr "Пожалуйста, выберите только один элеме
 msgid "No png file is selected!"
 msgstr "Не выбран png файл!"
 
-msgid "No profile selected!"
-msgstr "Не выбран профиль!"
-
 msgid "No reference is present!"
 msgstr "Ссылка не найдена!"
 
@@ -668,17 +662,17 @@ msgstr "Воспр. потока"
 msgid "Disabled"
 msgstr "Выкл."
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Включить поддержку lamedb вер. 5"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Включить поддержку lamedb вер. 5 (экспериментально)"
 
-msgid "Enable HTTP API"
-msgstr "Включить HTTP API"
+msgid "Enable HTTP API (experimental)"
+msgstr "Включить HTTP API (экспериментально)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Переключить канал(Ctrl + Z)"
 
 msgid "Switch the channel and watch in the program(Ctrl + W)"
-msgstr "Переключить канал и просмотр в программе(Ctrl + W)."
+msgstr "Переклють канал и просмотр в программе(Ctrl + W)."
 
 msgid "Play IPTV or other stream in the program(Ctrl + P)"
 msgstr "Воспроизведение IPTV или другого потока в программе(Ctrl + P)"
@@ -788,8 +782,8 @@ msgstr "Язык:"
 msgid "Load the last open configuration at program startup"
 msgstr "Загружать последнюю открытую конфигурацию при запуске программы"
 
-msgid "Enable direct playback bar"
-msgstr "Включить панель прямого воспроизведения"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Включить панель прямого воспроизведения (экспериментально)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Включает прямую отправку и воспроизведение медиа-ссылок на ресивере"
@@ -914,8 +908,8 @@ msgstr "Режим воспроизведения потоков:"
 msgid "Built-in player"
 msgstr "Встроенный плеер"
 
-msgid "In a separate window"
-msgstr "В отдельном окне"
+msgid "VLC media player"
+msgstr "VLC медиаплеер"
 
 msgid "Only get m3u file"
 msgstr "Получить файл *.m3u"
@@ -1016,233 +1010,3 @@ msgstr "Скриншот"
 msgid "Video"
 msgstr "Видео"
 
-msgid "The Neutrino has only experimental support. Not all features are supported!"
-msgstr "Neutrino имеет только экспериментальную поддержку. Поддерживаются не все функции!"
-
-msgid "Enable experimental features"
-msgstr "Включить экспериментальные функции"
-
-msgid "Can't Playback!"
-msgstr "Не удается воспроизвести!"
-
-msgid "Enable Dark Mode"
-msgstr "Включить темный режим"
-
-msgid "Extract..."
-msgstr "Извлечь..."
-
-msgid "Unsupported format!"
-msgstr "Неподдерживаемый формат!"
-
-msgid "Combine with the current data?"
-msgstr "Объединить с текущими данными?"
-
-msgid "Importing data done!"
-msgstr "Импорт данных завершен!"
-
-msgid "Current service"
-msgstr "Текущий сервис"
-
-msgid "Open folder"
-msgstr "Открыть папку"
-
-msgid "Open archive"
-msgstr "Открыть архив"
-
-msgid "Import from Web"
-msgstr "Импорт из сети"
-
-msgid "Control"
-msgstr "Управление"
-
-msgid "Timers"
-msgstr "Таймеры"
-
-msgid "Timer"
-msgstr "Таймер"
-
-msgid "Add timer"
-msgstr "Добавить таймер"
-
-msgid "Hr."
-msgstr "ч."
-
-msgid "Min."
-msgstr "мин."
-
-msgid "Power"
-msgstr "Питание"
-
-msgid "Standby"
-msgstr "Режим ожидания"
-
-msgid "Wake Up"
-msgstr "Пробуждение"
-
-msgid "Reboot"
-msgstr "Перезагрузка"
-
-msgid "Restart GUI"
-msgstr "Перезагрузить графический интерфейс"
-
-msgid "Shutdown"
-msgstr "Выключение"
-
-msgid "Shut down"
-msgstr "Выключить"
-
-msgid "Do Nothing"
-msgstr "Ничего не делать"
-
-msgid "Auto"
-msgstr "Авто"
-
-msgid "Grab screenshot"
-msgstr "Сделать скриншот"
-
-msgid "Enabled:"
-msgstr "Включен:"
-
-msgid "Name:"
-msgstr "Имя:"
-
-msgid "Description:"
-msgstr "Описание:"
-
-msgid "Service:"
-msgstr "Сервис:"
-
-msgid "Service reference:"
-msgstr "Сервисная ссылка:"
-
-msgid "Event ID:"
-msgstr "ID события:"
-
-msgid "Begins:"
-msgstr "Начало:"
-
-msgid "Ends:"
-msgstr "Окончание:"
-
-msgid "Repeated:"
-msgstr "Повтор:"
-
-msgid "Action:"
-msgstr "Действие:"
-
-msgid "After event:"
-msgstr "После события:"
-
-msgid "Location:"
-msgstr "Расположение:"
-
-msgid "Mo"
-msgstr "Пн"
-
-msgid "Tu"
-msgstr "Вт"
-
-msgid "We"
-msgstr "Ср"
-
-msgid "Th"
-msgstr "Чт"
-
-msgid "Fr"
-msgstr "Пт"
-
-msgid "Sa"
-msgstr "Сб"
-
-msgid "Su"
-msgstr "Вс"
-
-msgid "Set"
-msgstr "Установить"
-
-msgid "Services update"
-msgstr "Обновление сервисов"
-
-msgid "Create folder"
-msgstr "Создать папку"
-
-msgid "FTP client"
-msgstr "FTP-клиент"
-
-msgid "The file size is too large!"
-msgstr "Размер файла слишком велик!"
-
-msgid "Connect"
-msgstr "Соединение"
-
-msgid "Disconnect"
-msgstr "Разъединить"
-
-msgid "Size"
-msgstr "Размер"
-
-msgid "Date"
-msgstr "Дата"
-
-msgid "Toggle display position"
-msgstr "Переключить позицию отображения"
-
-msgid "Alternatives"
-msgstr "Альтернативы"
-
-msgid "Add alternatives"
-msgstr "Добавить альтернативы"
-
-msgid "DreamOS only!"
-msgstr "Только DreamOS!"
-
-msgid "A similar service is already in this list!"
-msgstr "Подобный сервис уже есть в этом списке!"
-
-msgid "Play mode has been changed!\nRestart the program to apply the settings."
-msgstr "Изменен режим воспроизведения!\nПерезапустите программу для применения настроек."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Установите значения TID, NID и пр. имен для правильного именования пиконов!"
-
-msgid "Streams detected:"
-msgstr "Обнаружено потоков:"
-
-msgid "Download picons"
-msgstr "Загрузить пиконы"
-
-msgid "Errors:"
-msgstr "Ошибок:"
-
-msgid "Use to play streams:"
-msgstr "Использовать для воспроизведения потоков:"
-
-msgid "Font in the lists:"
-msgstr "Шрифт в списках:"
-
-msgid "Picons size in the lists:"
-msgstr "Размер пиконов в списках:"
-
-msgid "Logo size in tooltips:"
-msgstr "Размер логотипа во всплывающих подсказках:"
-
-msgid "Save as"
-msgstr "Сохранить как"
-
-msgid "Mark duplicates"
-msgstr "Отметить дубликаты"
-
-msgid "Load only for selected bouquet"
-msgstr "Загрузить только для выбранного букета"
-
-msgid "The task is canceled!"
-msgstr "Задание отменено!"
-
-msgid "Data loading in progress!"
-msgstr "Выполняется загрузка данных!"
-
-msgid "Recordings"
-msgstr "Записи"
-
-msgid "Help"
-msgstr "Справка"

po/tr/demon-editor.po

@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: DemonEditor\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-16 15:59+0300\n"
-"PO-Revision-Date: 2021-06-13 14:54+0300\n"
+"PO-Revision-Date: 2020-06-08 21:53+0300\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: audi06_19 <info@dreamosat-forum.com>\n"
 "Language-Team: \n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: tr\n"
 
@@ -107,9 +107,6 @@ msgstr "Varsayılan adı ayarla"
 msgid "Insert marker"
 msgstr "İşaretçi ekle"
 
-msgid "Insert space"
-msgstr "Boşluk ekle"
-
 msgid "Locate in services"
 msgstr "Hizmetlerde bulun"
 
@@ -206,8 +203,8 @@ msgstr "Mevcut veri yolu:"
 msgid "Data:"
 msgstr "Veri:"
 
-msgid "Enigma2 channel and satellite list editor for GNU/Linux."
-msgstr "GNU/Linux için Enigma2 kanalı ve uydu listesi editörü."
+msgid "Enigma2 channel and satellites list editor for GNU/Linux"
+msgstr "GNU/Linux için Enigma2 kanalı ve uydu listesi editörü"
 
 msgid "Host:"
 msgstr "Ana bilgisayar:"
@@ -521,9 +518,6 @@ msgstr "Lütfen sadece bir ürün seçiniz!"
 msgid "No png file is selected!"
 msgstr "Hiçbir png dosyası seçilmedi!"
 
-msgid "No profile selected!"
-msgstr "Profil seçilmedi!"
-
 msgid "No reference is present!"
 msgstr "Referans yok!"
 
@@ -679,11 +673,11 @@ msgstr "Akışı oynat"
 msgid "Disabled"
 msgstr "Devre dışı"
 
-msgid "Enable lamedb ver. 5 support"
-msgstr "Sürüm 5 desteğini etkinleştir"
+msgid "Enable ver. 5 support (experimental)"
+msgstr "Sürüm 5 desteğini etkinleştir (deneysel)"
 
-msgid "Enable HTTP API"
-msgstr "HTTP API'sini etkinleştir"
+msgid "Enable HTTP API (experimental)"
+msgstr "HTTP API'sini etkinleştir (deneysel)"
 
 msgid "Switch(zap) the channel(Ctrl + Z)"
 msgstr "Kanalı değiştir (zap) (Ctrl + Z)"
@@ -803,8 +797,8 @@ msgstr "Dil:"
 msgid "Load the last open configuration at program startup"
 msgstr "Program açılışında son açık yapılandırmayı yükle"
 
-msgid "Enable direct playback bar"
-msgstr "Doğrudan oynatma çubuğunu etkinleştir"
+msgid "Enable direct playback bar (experimental)"
+msgstr "Doğrudan oynatma çubuğunu etkinleştir (deneysel)"
 
 msgid "Enables direct sending and playback of media links on the receiver"
 msgstr "Alıcıdaki medya bağlantılarının doğrudan gönderilmesini ve oynatılmasını sağlar"
@@ -929,8 +923,8 @@ msgstr "Akışları oynatma modu:"
 msgid "Built-in player"
 msgstr "Dahili oynatıcı"
 
-msgid "In a separate window"
-msgstr "Ayrı bir pencerede"
+msgid "VLC media player"
+msgstr "VLC media player"
 
 msgid "Only get m3u file"
 msgstr "Sadece m3u dosyası al"
@@ -994,278 +988,3 @@ msgstr "Alıcıdaki tüm piconları kaldırın"
 
 msgid "Service reference"
 msgstr "Servis referansı"
-
-msgid "Enable support for"
-msgstr "Temalar için desteği etkinleştir"
-
-msgid "Auto-check for updates"
-msgstr "Güncellemeleri otomatik kontrol et"
-
-msgid "Filter services"
-msgstr "Services filtrele"
-
-msgid "Filter services in the main list."
-msgstr "Ana listedeki services filtreleyin."
-
-msgid "Destination:"
-msgstr "Hedef:"
-
-msgid "EXPERIMENTAL!"
-msgstr "EXPERIMENTAL!"
-
-msgid "Sorting data..."
-msgstr "Verilerin sıralanması..."
-
-msgid ""
-"There are unsaved changes.\n"
-"\n"
-"\t Save them now?"
-msgstr ""
-"Kaydedilmemiş değişiklikler var.\n"
-"\n"
-"\t Şimdi kaydedilsin mi?"
-
-msgid ""
-"Are you sure you want to change the order\n"
-"\t of services in this bouquet?"
-msgstr ""
-"Sırayı değiştirmek istediğinizden emin misiniz\n"
-"\t Bu buketdeki hizmetlerin sayısı?"
-
-msgid "Remove from the receiver"
-msgstr "Alıcıdaki tüm piconları kaldırın"
-
-msgid "Screenshot"
-msgstr "Ekran görüntüsü"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "The Neutrino has only experimental support. Not all features are supported!"
-msgstr "Neutrino'nun yalnızca experimental desteği var. Tüm özellikler desteklenmiyor!"
-
-msgid "Enable experimental features"
-msgstr "Experimental özellikleri etkinleştirin"
-
-msgid "Can't Playback!"
-msgstr "Oynatılamıyor!"
-
-msgid "Enable Dark Mode"
-msgstr "Koyu Modu Etkinleştir"
-
-msgid "Extract..."
-msgstr "Çıkart..."
-
-msgid "Unsupported format!"
-msgstr "Desteklenmeyen format!"
-
-msgid "Combine with the current data?"
-msgstr "Mevcut verilerle birleştirilsin mi?"
-
-msgid "Importing data done!"
-msgstr "Verilerin içe aktarılması tamamlandı!"
-
-msgid "Current service"
-msgstr "Mevcut service"
-
-msgid "Open folder"
-msgstr "Dosya aç"
-
-msgid "Open archive"
-msgstr "Arşiv aç"
-
-msgid "Import from Web"
-msgstr "Web'den içe aktar"
-
-msgid "Control"
-msgstr "Control"
-
-msgid "Timers"
-msgstr "Zamanlayıcılar"
-
-msgid "Timer"
-msgstr "Zamanlayıcı"
-
-msgid "Add timer"
-msgstr "Zamanlayıcı ekle"
-
-msgid "Hr."
-msgstr "Hr."
-
-msgid "Min."
-msgstr "Min."
-
-msgid "Power"
-msgstr "Power"
-
-msgid "Standby"
-msgstr "Standby"
-
-msgid "Wake Up"
-msgstr "Wake Up"
-
-msgid "Reboot"
-msgstr "Reboot"
-
-msgid "Restart GUI"
-msgstr "Restart GUI"
-
-msgid "Shutdown"
-msgstr "Shutdown"
-
-msgid "Shut down"
-msgstr "Kapat"
-
-msgid "Do Nothing"
-msgstr "Hiçbir şey yapma"
-
-msgid "Auto"
-msgstr "Auto"
-
-msgid "Grab screenshot"
-msgstr "Ekran görüntüsü al"
-
-msgid "Enabled:"
-msgstr "Etkin:"
-
-msgid "Name:"
-msgstr "Ad:"
-
-msgid "Description:"
-msgstr "Açıklama:"
-
-msgid "Service:"
-msgstr "Service:"
-
-msgid "Service reference:"
-msgstr "Servis referansı:"
-
-msgid "Event ID:"
-msgstr "Olay Kimliği:"
-
-msgid "Begins:"
-msgstr "Başlıyor:"
-
-msgid "Ends:"
-msgstr "Bitiş:"
-
-msgid "Repeated:"
-msgstr "Tekrar:"
-
-msgid "Action:"
-msgstr "Aksiyon:"
-
-msgid "After event:"
-msgstr "Olaydan sonra:"
-
-msgid "Location:"
-msgstr "Konum:"
-
-msgid "Mo"
-msgstr "Pzt"
-
-msgid "Tu"
-msgstr "Sal"
-
-msgid "We"
-msgstr "Çar"
-
-msgid "Th"
-msgstr "Per"
-
-msgid "Fr"
-msgstr "Cum"
-
-msgid "Sa"
-msgstr "Cmt"
-
-msgid "Su"
-msgstr "Paz"
-
-msgid "Set"
-msgstr "Yüklemek"
-
-msgid "Services update"
-msgstr "Servisleri güncelle"
-
-msgid "Create folder"
-msgstr "Klasör oluştur"
-
-msgid "FTP client"
-msgstr "FTP istemcisi"
-
-msgid "The file size is too large!"
-msgstr "Dosya boyutu çok büyük!"
-
-msgid "Connect"
-msgstr "Bağlan"
-
-msgid "Disconnect"
-msgstr "Bağlantıyı kes"
-
-msgid "Size"
-msgstr "Boyut"
-
-msgid "Date"
-msgstr "Saat"
-
-msgid "Attr."
-msgstr "Özellik."
-
-msgid "Toggle display position"
-msgstr "Görüntü konumunu değiştir"
-
-msgid "Alternatives"
-msgstr "Alternatifler"
-
-msgid "Add alternatives"
-msgstr "Alternatif ekleyin"
-
-msgid "DreamOS only!"
-msgstr "Sadece DreamOS!"
-
-msgid "A similar service is already in this list!"
-msgstr "Bu listede zaten benzer bir hizmet var!"
-
-msgid ""
-"Play mode has been changed!\n"
-"Restart the program to apply the settings."
-msgstr ""
-"Oynatma modu değiştirildi!\n"
-"Ayarları uygulamak için programı yeniden başlatın."
-
-msgid "Set values for TID, NID and Namespace for correct naming of the picons!"
-msgstr "Piconların doğru isimlendirilmesi için TID, NID ve Namespace değerlerini ayarlayın!"
-
-msgid "Streams detected:"
-msgstr "Akışlar algılandı:"
-
-msgid "Download picons"
-msgstr "Picon'lar indirin"
-
-msgid "Errors:"
-msgstr "Hatalar:"
-
-msgid "Use to play streams:"
-msgstr "Akışları oynatmak için kullanın:"
-
-msgid "Font in the lists:"
-msgstr "Listelerdeki yazı tipi:"
-
-msgid "Picons size in the lists:"
-msgstr "Listelerdeki Piconların boyutu:"
-
-msgid "Logo size in tooltips:"
-msgstr "Araç ipuçlarındaki logo boyutu:"
-
-msgid "Save as"
-msgstr "Farklı kaydet"
-
-msgid "Mark duplicates"
-msgstr "Yinelenenleri işaretle"
-
-msgid "Load only for selected bouquet"
-msgstr "Yalnızca seçilen buket için yükle"
-
-msgid "The task is canceled!"
-msgstr "Görev iptal edildi!"

start.py

@@ -1,7 +1,29 @@
 #!/usr/bin/env python3
+import os
+
+
+def update_icon():
+    need_update = False
+    icon_name = "DemonEditor.desktop"
+
+    with open(icon_name, "r") 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())
+                if icon_path != current_path:
+                    need_update = True
+                    lines[i] = "Icon={}\n".format(current_path)
+                break
+
+    if need_update:
+        with open(icon_name, "w") as f:
+            f.writelines(lines)
+
+
 if __name__ == "__main__":
-    from multiprocessing import freeze_support
     from app.ui.main_app_window import start_app
 
-    freeze_support()
+    update_icon()
     start_app()