Russian, Belarusian and German translations update

* Turkish translations update

* Update: Turkish translations update

Co-authored-by: audi06_19 <info@dreamosat-forum.com>

DemonEditor.spec

@@ -6,6 +6,15 @@ 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'),
@@ -18,10 +27,10 @@ a = Analysis([EXE_NAME],
              pathex=PATH_EXE,
              binaries=[],
              datas=ui_files,
-             hiddenimports=[],
+             hiddenimports=['fileinput', 'uuid', 'ctypes.wintypes'],
              hookspath=[],
              runtime_hooks=[],
-             excludes=['youtube_dl', 'tkinter'],
+             excludes=excludes,
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

README.md

@@ -2,6 +2,8 @@
 [![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).  
 
+[<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)!**
@@ -16,7 +18,7 @@ Focused on the convenience of working in lists from the keyboard. The mouse is a
 * 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](https://www.videolan.org/vlc/)).
+* 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). 
 
@@ -48,7 +50,7 @@ Clipboard is **"rubber"**. There is an accumulation before the insertion!
 For **multiple** selection with the mouse, press and hold the **Ctrl** key!
 
 ## Minimum requirements
-*Python >= 3.4.4, GTK+ >= 3.16 with PyGObject bindings, python3-requests.*
+*Python >= 3.5.2, GTK+ >= 3.22 with PyGObject bindings, python3-requests.*
                                                                     
 ## Important
 **This version is not fully tested and has experimental status!**

app/connections.py

@@ -509,6 +509,7 @@ class HttpAPI:
         INFO = "about"
         SIGNAL = "signal"
         STREAM = "stream.m3u?ref="
+        STREAM_TS = "ts.m3u?file="
         STREAM_CURRENT = "streamcurrent.m3u"
         CURRENT = "getcurrent"
         TEST = None
@@ -530,6 +531,10 @@ class HttpAPI:
         # Timer
         TIMER = ""
         TIMER_LIST = "timerlist"
+        # Recordings
+        RECORDINGS = "movielist?dirname="
+        REC_DIRS = "getlocations"
+        REC_CURRENT = "getcurrlocation"
         # Screenshot
         GRUB = "grab?format=jpg&"
 
@@ -556,6 +561,17 @@ class HttpAPI:
         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)
@@ -576,18 +592,14 @@ class HttpAPI:
         url = self._base_url + req_type.value
         data = self._data
 
-        if req_type is self.Request.ZAP or req_type is self.Request.STREAM:
+        if req_type is self.Request.ZAP or req_type in self.STREAM_REQUESTS:
             url += urllib.parse.quote(ref)
         elif req_type is self.Request.PLAY or req_type is self.Request.PLAYER_REMOVE:
             url += "{}{}".format(ref_prefix, urllib.parse.quote(ref).replace("%3A", "%253A"))
         elif req_type is self.Request.GRUB:
             data = None  # Must be disabled for token-based security.
             url = "{}/{}{}".format(self._main_url, req_type.value, ref)
-        elif req_type in (self.Request.REMOTE,
-                          self.Request.POWER,
-                          self.Request.VOL,
-                          self.Request.EPG,
-                          self.Request.TIMER):
+        elif req_type in self.PARAM_REQUESTS:
             url += ref
 
         def done_callback(f):
@@ -631,7 +643,7 @@ class HttpAPI:
 def get_response(req_type, url, data=None):
     try:
         with urlopen(Request(url, data=data), timeout=10) as f:
-            if req_type is HttpAPI.Request.STREAM or req_type is HttpAPI.Request.STREAM_CURRENT:
+            if req_type in HttpAPI.STREAM_REQUESTS:
                 return {"m3u": f.read().decode("utf-8")}
             elif req_type is HttpAPI.Request.GRUB:
                 return {"img_data": f.read()}
@@ -647,6 +659,11 @@ def get_response(req_type, url, data=None):
             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:

app/eparser/__init__.py

@@ -1,3 +1,30 @@
+# -*- 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
@@ -32,6 +59,15 @@ def get_bouquets(path, s_type):
         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:

app/eparser/enigma/bouquets.py

@@ -1,3 +1,31 @@
+# -*- 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
@@ -166,6 +194,11 @@ class BouquetsReader:
 
             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")
@@ -186,7 +219,7 @@ class BouquetsReader:
                 else:
                     fav_id = "{}:{}:{}:{}".format(srv_data[3], srv_data[4], srv_data[5], srv_data[6])
                     name = None
-                    if len(srv_data) == 12:
+                    if data_len == 12:
                         name, sep, desc = str(srv_data[-1]).partition("\n#DESCRIPTION")
                     services.append(BouquetService(name, BqServiceType.DEFAULT, fav_id.upper(), num))
 

app/settings.py

@@ -25,7 +25,7 @@ class Defaults(Enum):
     BACKUP_BEFORE_SAVE = True
     V5_SUPPORT = False
     FORCE_BQ_NAMES = False
-    HTTP_API_SUPPORT = False
+    HTTP_API_SUPPORT = IS_WIN
     ENABLE_YT_DL = False
     ENABLE_SEND_TO = False
     USE_COLORS = True
@@ -35,7 +35,7 @@ class Defaults(Enum):
     LIST_PICON_SIZE = 32
     FAV_CLICK_MODE = 0
     PLAY_STREAMS_MODE = 1 if IS_DARWIN else 0
-    STREAM_LIB = "gst" if IS_WIN else "vlc"
+    STREAM_LIB = "mpv" if IS_WIN else "vlc"
     PROFILE_FOLDER_DEFAULT = False
     RECORDS_PATH = DATA_PATH + "records{}".format(SEP)
     ACTIVATE_TRANSCODING = False

app/tools/media.py

@@ -1,9 +1,39 @@
+# -*- 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 sys
 from abc import ABC, abstractmethod
 from datetime import datetime
 
-from app.commons import run_task, log, _DATE_FORMAT
+from gi.repository import Gdk, Gtk
+
+from app.commons import run_task, log, _DATE_FORMAT, run_with_delay
 
 
 class Player(ABC):
@@ -69,11 +99,10 @@ class Player(ABC):
                 return get_pointer(gpointer)
 
     def get_video_widget(self, widget):
-        from gi.repository import Gtk, Gdk
-
         area = Gtk.DrawingArea(visible=True)
         area.connect("draw", self.on_drawing_area_draw)
-        area.set_events(Gdk.ModifierType.BUTTON1_MASK)
+        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
@@ -83,6 +112,19 @@ class Player(ABC):
         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.
@@ -118,7 +160,10 @@ class MpvPlayer(Player):
         try:
             from app.tools import mpv
 
-            self._player = mpv.MPV(wid=str(self.get_window_handle(self.get_video_widget(widget))))
+            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!")
@@ -311,12 +356,17 @@ class VlcPlayer(Player):
 
     def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         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
 
             args = "--quiet {}".format("" if sys.platform == "darwin" else "--no-xlib")
             self._player = vlc.Instance(args).media_player_new()
-        except (OSError, AttributeError) as e:
+            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:
@@ -395,7 +445,7 @@ class VlcPlayer(Player):
         elif sys.platform == "darwin":
             self._player.set_nsobject(self.get_window_handle(video_widget))
         else:
-            log("Video widget initialization error: platform '{}' is not supported. ".format(sys.platform))
+            self._player.set_hwnd(self.get_window_handle(video_widget))
 
 
 class Recorder:
@@ -406,6 +456,9 @@ 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:
@@ -431,7 +484,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(" ", "_"))
+        path = "{}{}_{}".format(path, name.replace(" ", "_"), d_now.replace(" ", "_").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,14 +1,43 @@
+# -*- 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
+from app.settings import SettingsType, IS_WIN
 from .satellites import _HEADERS
 
 _ENIGMA2_PICON_KEY = "{:X}:{:X}:{}"
@@ -18,6 +47,187 @@ Provider = namedtuple("Provider", ["logo", "name", "pos", "url", "on_id", "ssid"
 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",
+                }
+
+
 class PiconsParser(HTMLParser):
     """ Parser for package html page. (https://www.lyngsat.com/packages/*provider-name*.html) """
     _BASE_URL = "https://www.lyngsat.com"
@@ -173,20 +383,11 @@ class ProviderParser(HTMLParser):
             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':
@@ -208,32 +409,34 @@ class ProviderParser(HTMLParser):
 
             len_row = len(row)
             if len_row > 2:
-                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(row[1])
+                m = self._TRANSPONDER_FREQUENCY_PATTERN.match(row[0])
                 if m:
                     self._freq = m.group().split()[0]
 
-            if len_row == 14:
+            if len_row > 12:
                 # Providers
-                name = row[6]
+                name = row[5]
                 self._prv_names.add(name)
-                m = self._ONID_TID_PATTERN.match(str(row[9]))
+                m = self._ONID_TID_PATTERN.match(str(row[-5]))
                 if m:
                     on_id, tid = m.group().split("-")
                     if on_id not in self._ids:
+                        self._on_id = on_id
                         row[-2] = on_id
                         self._ids.add(on_id)
                         row[0] = self._positon
                     if name + on_id not in self._prv_names:
                         self._prv_names.add(name + on_id)
                         logo_data = None
-                        req = requests.get(self._BASE_URL + row[3], 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[5], on_id=on_id,
+                        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,
                                                   ssid=None, single=False, selected=True))
-            elif 6 < len_row < 14:
+            elif 6 < len_row < 12:
                 # Single services
                 name, url, ssid = None, None, None
                 if row[0].startswith("http"):

app/tools/satellites.py

@@ -77,6 +77,8 @@ class Cell:
 class SatellitesParser(HTMLParser):
     """ Parser for satellite html page. """
 
+    POS_PAT = re.compile(r".*?(\d+\.\d°?[EW]).*")
+
     def __init__(self, source=SatelliteSource.FLYSAT, entities=False, separator=' '):
 
         HTMLParser.__init__(self)
@@ -150,40 +152,21 @@ 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(r"^https://www\.lyngsat\.com/[\w-]+\.html")
                 base_url = "https://www.lyngsat.com/"
                 sats = []
-                names = set()
-                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("-", " ")
-                        if name not in names:
-                            # [all in one] satellites
-                            sats.append((name, current_pos, row[5], base_url + row[1], False))
-                            names.add(name)
-                        name = row[4]
-                        if name not in names:
-                            sats.append((name, current_pos, row[5], base_url + row[3], False))
-                            names.add(name)
-                    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))
+                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
                 return sats
             elif source is SatelliteSource.KINGOFSAT:
                 def get_sat(r):
@@ -321,11 +304,10 @@ class SatellitesParser(HTMLParser):
             Since the *.ini file contains incomplete information, it is not used.
         """
         zeros = "000"
-        pos_pat = re.compile(r".*?(\d+\.\d°[EW]).*")
         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 pos_pat.match(r[0]), self._rows):
+        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)
@@ -343,9 +325,10 @@ class ServicesParser(HTMLParser):
 
         HTMLParser.__init__(self)
 
-        self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "SD": "1", "MPEG-4 SD": "22", "HEVC SD": "22", "MPEG-4 HD": "25",
-                         "MPEG-4 HD 1080": "25", "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC UHD": "31",
-                         "HEVC UHD 4K": "31"}
+        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]).*")
@@ -421,8 +404,8 @@ class ServicesParser(HTMLParser):
             log(e)
         else:
             url = "https://www.lyngsat.com/muxes/"
-            return [row[1] for row in
-                    filter(lambda x: x and len(x) > 8 and x[1].url and x[1].url.startswith(url), self._rows)]
+            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):

app/tools/yt.py

@@ -300,6 +300,9 @@ 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)
@@ -307,14 +310,8 @@ 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(SEP, SEP))
+                            pref, sep, f = info.filename.partition("{}youtube_dl{}".format("/", "/"))
                             if sep:
                                 arch.extract(info.filename)
                                 shutil.move(info.filename, "{}{}{}".format(self._path, sep, f))
@@ -323,7 +320,10 @@ class YouTubeDL:
                         show_notification(msg)
                         log(msg)
                         self._callback(msg, False)
-                        return True
+
+                    if os.path.isfile(zip_file):
+                        os.remove(zip_file)
+                    return True
         except URLError as e:
             log("YouTubeDLHelper error: {}".format(e))
             raise YouTubeException(e)

app/ui/app_menu_bar.ui

@@ -3,6 +3,8 @@
   <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>
@@ -39,6 +41,10 @@
           <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>
@@ -61,6 +67,8 @@
     </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>
@@ -74,6 +82,8 @@
     </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>
@@ -87,6 +97,8 @@
     </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>
@@ -103,43 +115,52 @@
       </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>
-        <submenu>
-          <attribute name="label" translatable="yes">IPTV</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>
+        <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>

app/ui/backup.py

@@ -8,7 +8,7 @@ from enum import Enum
 
 from app.commons import run_idle
 from app.settings import SettingsType
-from app.ui.dialogs import show_dialog, DialogType
+from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import append_text_to_tview
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
 
@@ -30,10 +30,7 @@ class BackupDialog:
                     "on_resize": self.on_resize,
                     "on_key_release": self.on_key_release}
 
-        builder = Gtk.Builder()
-        builder.set_translation_domain("demon-editor")
-        builder.add_from_file(UI_RESOURCES_PATH + "backup_dialog.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "backup_dialog.glade", handlers)
 
         self._settings = settings
         self._s_type = settings.setting_type

app/ui/backup_dialog.glade

@@ -115,7 +115,6 @@ Author: Dmitriy Yefremov
     <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/>

app/ui/control.glade

@@ -325,6 +325,11 @@ Author: Dmitriy Yefremov
     <property name="icon_name">view-refresh</property>
     <property name="icon_size">1</property>
   </object>
+  <object class="GtkImage" id="remove_recording_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">user-trash-symbolic</property>
+  </object>
   <object class="GtkImage" id="restart_gui_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -386,8 +391,8 @@ Author: Dmitriy Yefremov
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">10</property>
             <property name="stack">stack</property>
@@ -1722,6 +1727,103 @@ audio-volume-medium-symbolic</property>
                 <property name="position">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="recordings_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="recordings_view_scrolled_window">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkViewport" id="recordings_view_port">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkListBox" id="recordings_list_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="selection_mode">multiple</property>
+                            <property name="activate_on_single_click">False</property>
+                            <signal name="button-press-event" handler="on_recordings_press" swapped="no"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="recordings_dir_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <signal name="changed" handler="on_recordings_dir_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="GtkBox" id="recordings_action_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="recordings_filter_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="primary_icon_name">edit-find-replace-symbolic</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">False</property>
+                        <property name="placeholder_text" translatable="yes">Filter</property>
+                        <signal name="search-changed" handler="on_recording_filter_changed" 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="recordings_remove_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>
+                        <property name="action_name">app.on_recording_remove</property>
+                        <property name="image">remove_recording_image</property>
+                        <property name="always_show_image">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="name">recordings</property>
+                <property name="title" translatable="yes">Recordings</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>

app/ui/control.py

@@ -7,10 +7,11 @@ from urllib.parse import quote
 from gi.repository import GLib
 
 from app.settings import IS_WIN
-from .dialogs import get_dialogs_string, show_dialog, DialogType, get_message
+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
+from ..connections import HttpAPI, UtfFTP
 from ..eparser.ecommons import BqServiceType
 
 
@@ -23,6 +24,7 @@ class ControlBox(Gtk.HBox):
         EPG = "epg"
         TIMERS = "timers"
         TIMER = "timer"
+        RECORDINGS = "recordings"
 
     class EpgRow(Gtk.ListBoxRow):
         def __init__(self, event: dict, **properties):
@@ -85,8 +87,7 @@ class ControlBox(Gtk.HBox):
 
             self._timer = timer
 
-            builder = Gtk.Builder()
-            builder.add_from_string(get_dialogs_string(self._UI_PATH))
+            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")
@@ -113,6 +114,75 @@ class ControlBox(Gtk.HBox):
         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)
 
@@ -129,11 +199,12 @@ class ControlBox(Gtk.HBox):
                     "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_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 = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "control.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "control.glade", handlers)
 
         self.add(builder.get_object("main_box_frame"))
         self._stack = builder.get_object("stack")
@@ -187,6 +258,11 @@ class ControlBox(Gtk.HBox):
         # 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)
@@ -224,6 +300,8 @@ class ControlBox(Gtk.HBox):
         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):
@@ -236,6 +314,9 @@ class ControlBox(Gtk.HBox):
         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
 
@@ -681,3 +762,66 @@ class ControlBox(Gtk.HBox):
                 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

@@ -40,7 +40,7 @@ Author: Dmitriy Yefremov
     <property name="icon_name">system-help</property>
     <property name="type_hint">normal</property>
     <property name="program_name">DemonEditor</property>
-    <property name="version">1.0.7 Alpha</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.
@@ -92,7 +92,6 @@ Author: Dmitriy Yefremov
     <property name="type_hint">utility</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>
@@ -182,7 +181,6 @@ 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>
     <child>
       <object class="GtkBox" id="wait_dialog_box">
         <property name="width_request">100</property>

app/ui/dialogs.py

@@ -1,11 +1,40 @@
+# -*- 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
 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
+from app.settings import SEP, IS_WIN
 from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN, IS_GNOME_SESSION
 
 
@@ -23,7 +52,6 @@ class Dialog(Enum):
         <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>
@@ -181,9 +209,48 @@ def get_message(message):
 
 
 @lru_cache(maxsize=5)
-def get_dialogs_string(path):
-    with open(path, "r", encoding="utf-8") as f:
-        return "".join(f)
+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")
 
 
 if __name__ == "__main__":

app/ui/download_dialog.glade

@@ -55,7 +55,6 @@ Author: Dmitriy Yefremov
     <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/>
     </child>

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
+from .dialogs import show_dialog, DialogType, get_message, get_builder
 from .uicommons import Gtk, UI_RESOURCES_PATH
 
 
@@ -27,9 +27,7 @@ class DownloadDialog:
                     "on_remove_unused_bouquets_toggled": self.on_remove_unused_bouquets_toggled,
                     "on_info_bar_close": self.on_info_bar_close}
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "download_dialog.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "download_dialog.glade", handlers)
 
         self._dialog_window = builder.get_object("download_dialog_window")
         self._dialog_window.set_transient_for(transient)

app/ui/epg_dialog.glade

@@ -601,7 +601,6 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</property>
     <property name="skip_taskbar_hint">True</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>

app/ui/epg_dialog.py

@@ -8,13 +8,14 @@ from enum import Enum
 from urllib.error import HTTPError, URLError
 
 from gi.repository import GLib
+
 from app.commons import run_idle, run_task
 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
+from app.ui.dialogs import get_message, show_dialog, DialogType, get_builder
 from .main_helper import on_popup_menu, update_entry_data
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, Column, EPG_ICON, KeyboardKey, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, MOD_MASK
 
 
 class RefsSource(Enum):
@@ -66,10 +67,7 @@ class EpgDialog:
         self._show_tooltips = True
         self._download_xml_is_active = False
 
-        builder = Gtk.Builder()
-        builder.set_translation_domain(TEXT_DOMAIN)
-        builder.add_from_file(UI_RESOURCES_PATH + "epg_dialog.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "epg_dialog.glade", handlers)
 
         self._dialog = builder.get_object("epg_dialog_window")
         self._dialog.set_transient_for(transient)

app/ui/ftp.glade

@@ -93,27 +93,97 @@ Author: Dmitriy Yefremov
     <property name="label_xalign">0</property>
     <property name="shadow_type">in</property>
     <child>
-      <object class="GtkPaned" id="paned">
-        <property name="width_request">320</property>
-        <property name="height_request">240</property>
+      <object class="GtkBox" id="main_ftp_box">
         <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="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="wide_handle">True</property>
+        <property name="spacing">2</property>
         <child>
-          <object class="GtkBox" id="ftp_bpx">
+          <object class="GtkBox" id="ftp_button_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</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="GtkBox">
+              <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>
@@ -123,9 +193,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkLabel" id="ftp_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">10</property>
                         <property name="label">FTP:</property>
-                        <property name="yalign">1</property>
                         <attributes>
                           <attribute name="weight" value="semibold"/>
                         </attributes>
@@ -141,7 +209,7 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="ellipsize">end</property>
-                        <property name="max_width_chars">25</property>
+                        <property name="max_width_chars">75</property>
                         <property name="yalign">1</property>
                       </object>
                       <packing>
@@ -158,24 +226,158 @@ Author: Dmitriy Yefremov
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="ftp_button_box">
+                  <object class="GtkScrolledWindow" id="ftp_view_scrolled_window">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">2</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <property name="min_content_height">100</property>
                     <child>
-                      <object class="GtkButton" id="connect_button">
+                      <object class="GtkTreeView" id="ftp_view">
                         <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>
+                        <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>
@@ -184,18 +386,11 @@ Author: Dmitriy Yefremov
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="disconnect_button">
+                      <object class="GtkLabel" id="pc_info_label">
+                        <property name="visible">True</property>
                         <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>
+                        <property name="ellipsize">end</property>
+                        <property name="max_width_chars">75</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -203,189 +398,6 @@ Author: Dmitriy Yefremov
                         <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="pack_type">end</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">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</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">50</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="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>
@@ -394,150 +406,137 @@ Author: Dmitriy Yefremov
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="pc_info_label">
+                  <object class="GtkScrolledWindow" id="file_view_scrolled_window">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="ellipsize">end</property>
-                    <property name="max_width_chars">32</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">False</property>
+                    <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">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>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="resize">True</property>
-            <property name="shrink">True</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>

app/ui/ftp.py

@@ -12,7 +12,8 @@ from gi.repository import GLib
 
 from app.commons import log, run_task, run_idle
 from app.connections import UtfFTP
-from app.ui.dialogs import show_dialog, DialogType
+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
 
@@ -68,9 +69,7 @@ class FtpClientBox(Gtk.HBox):
                     "on_view_press": self.on_view_press,
                     "on_view_release": self.on_view_release}
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "ftp.glade")
-        builder.connect_signals(handlers)
+        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")
@@ -233,22 +232,21 @@ class FtpClientBox(Gtk.HBox):
     def open_file(self, path):
         GLib.idle_add(self._file_view.set_sensitive, False)
         try:
-            cmd = ["open" if self._settings.is_darwin else "xdg-open", path]
-            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            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):
-        is_darwin = self._settings.is_darwin
         GLib.idle_add(self._ftp_view.set_sensitive, False)
 
         try:
             import tempfile
             import os
-            path = os.path.expanduser("~/Desktop") if is_darwin else None
+            path = os.path.expanduser("~/Desktop") if IS_WIN else None
 
-            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=not is_darwin) as tf:
+            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)
@@ -257,8 +255,8 @@ class FtpClientBox(Gtk.HBox):
                     self.update_ftp_info(msg.format(f_path, e))
 
                 tf.flush()
-                cmd = ["open" if is_darwin else "xdg-open", tf.name]
-                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+                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)
 
@@ -429,11 +427,12 @@ class FtpClientBox(Gtk.HBox):
     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 self._settings.is_darwin else "\n"
+            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:
-                    uris.append(Path("/{}:{}".format(r[self.Column.NAME], r[self.Column.ATTR])).as_uri())
+                    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
@@ -446,12 +445,12 @@ class FtpClientBox(Gtk.HBox):
             GLib.idle_add(self._app._wait_dialog.show)
 
             uris = data.get_uris()
-            if self._settings.is_darwin and len(uris) == 1:
+            if IS_WIN and len(uris) == 1:
                 uris = uris[0].split(self.URI_SEP)
 
             for uri in uris:
-                uri = urlparse(unquote(uri)).path
-                path = Path(uri)
+                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)
@@ -473,18 +472,18 @@ class FtpClientBox(Gtk.HBox):
     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 self._settings.is_darwin else "\n"
+            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) + "/"
+        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 self._settings.is_darwin and len(uris) == 1:
+            if IS_WIN and len(uris) == 1:
                 uris = uris[0].split(self.URI_SEP)
 
             for uri in uris:

app/ui/import_dialog.glade

@@ -101,7 +101,6 @@ Author: Dmitriy Yefremov
     <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/>

app/ui/imports.py

@@ -6,7 +6,7 @@ from app.eparser import get_bouquets, get_services, BouquetsReader
 from app.eparser.ecommons import BqType, BqServiceType, 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
+from app.ui.dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
 from app.ui.main_helper import on_popup_menu
 from .uicommons import Gtk, UI_RESOURCES_PATH, KeyboardKey, Column
 
@@ -84,10 +84,7 @@ class ImportDialog:
                     "on_resize": self.on_resize,
                     "on_key_press": self.on_key_press}
 
-        builder = Gtk.Builder()
-        builder.set_translation_domain("demon-editor")
-        builder.add_from_file(UI_RESOURCES_PATH + "import_dialog.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "import_dialog.glade", handlers)
 
         self._bq_services = {}
         self._services = {}
@@ -128,8 +125,15 @@ class ImportDialog:
                 for bq in bqs.bouquets:
                     self._main_model.append((bq.name, bq.type, True))
                     self._bq_services[(bq.name, bq.type)] = bq.services
-            # Note! Getting default format ver. 4
-            services = get_services(path, self._profile, 4 if self._profile is SettingsType.ENIGMA_2 else 0)
+
+            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
+
             for srv in services:
                 self._services[srv.fav_id] = srv
         except FileNotFoundError as e:

app/ui/iptv.glade

@@ -75,7 +75,6 @@ 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>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="search_unavailable_dialog_box">
@@ -268,7 +267,6 @@ 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>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="iptv_list_configuration_dialog_box">
@@ -309,6 +307,19 @@ Author: Dmitriy Yefremov
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="list_configuration_ok_button">
+                <property name="label" translatable="yes">OK</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">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -766,6 +777,7 @@ Author: Dmitriy Yefremov
     <action-widgets>
       <action-widget response="-6">cancel_config_list_button</action-widget>
       <action-widget response="-10">list_configuration_apply_button</action-widget>
+      <action-widget response="-5">list_configuration_ok_button</action-widget>
     </action-widgets>
   </object>
   <object class="GtkImage" id="yt_import_image">
@@ -1337,7 +1349,6 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</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>

app/ui/iptv.py

@@ -1,3 +1,31 @@
+# -*- 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
@@ -15,10 +43,9 @@ from app.eparser.iptv import (NEUTRINO_FAV_ID_FORMAT, StreamType, ENIGMA2_FAV_ID
                               parse_m3u)
 from app.settings import SettingsType
 from app.tools.yt import YouTubeException, YouTube
-from app.ui.dialogs import Action, show_dialog, DialogType, get_dialogs_string, get_message
+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, TEXT_DOMAIN, UI_RESOURCES_PATH, IPTV_ICON, Column, IS_GNOME_SESSION,
-                              KeyboardKey, get_yt_icon)
+from app.ui.uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, IPTV_ICON, Column, KeyboardKey, get_yt_icon)
 
 _DIGIT_ENTRY_NAME = "digit-entry"
 _ENIGMA2_REFERENCE = "{}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
@@ -67,11 +94,8 @@ class IptvDialog:
         self._yt_links = None
         self._yt_dl = None
 
-        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)
+        builder = get_builder(_UI_PATH, handlers, use_str=True,
+                              objects=("iptv_dialog", "stream_type_liststore", "yt_quality_liststore"))
 
         self._dialog = builder.get_object("iptv_dialog")
         self._dialog.set_transient_for(transient)
@@ -323,10 +347,8 @@ class SearchUnavailableDialog:
     def __init__(self, transient, model, fav_bouquet, iptv_rows, s_type):
         handlers = {"on_response": self.on_response}
 
-        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)
+        builder = get_builder(UI_RESOURCES_PATH + "iptv.glade", handlers,
+                              objects=("search_unavailable_streams_dialog",))
 
         self._dialog = builder.get_object("search_unavailable_streams_dialog")
         self._dialog.set_transient_for(transient)
@@ -421,11 +443,8 @@ class IptvListDialog:
 
         self._s_type = s_type
 
-        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)
+        builder = get_builder(_UI_PATH, handlers, use_str=True,
+                              objects=("iptv_list_configuration_dialog", "stream_type_liststore"))
 
         self._dialog = builder.get_object("iptv_list_configuration_dialog")
         self._dialog.set_transient_for(transient)
@@ -446,6 +465,8 @@ class IptvListDialog:
         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")
@@ -607,6 +628,8 @@ class M3uImportDialog(IptvListDialog):
         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)
@@ -688,6 +711,7 @@ class M3uImportDialog(IptvListDialog):
 
             self.download_picons(picons)
         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)
@@ -771,7 +795,9 @@ class M3uImportDialog(IptvListDialog):
             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):
@@ -813,13 +839,10 @@ class YtListImportDialog:
         self._settings = settings
         self._yt = None
 
-        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", "yt_receive_image",
-                                         "yt_import_image"))
-        builder.connect_signals(handlers)
+        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"))
 
         self._dialog = builder.get_object("yt_import_dialog_window")
         self._dialog.set_transient_for(transient)

app/ui/main_app_window.py

@@ -1,3 +1,31 @@
+# -*- 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 sys
 from contextlib import suppress
@@ -11,7 +39,7 @@ from gi.repository import GLib, Gio
 from app.commons import run_idle, log, run_task, run_with_delay, init_logger
 from app.connections import (HttpAPI, download_data, DownloadType, upload_data, test_http, TestException,
                              HttpApiException, STC_XML_FILE)
-from app.eparser import get_blacklist, write_blacklist
+from app.eparser import get_blacklist, write_blacklist, write_bouquet
 from app.eparser import get_services, get_bouquets, write_bouquets, write_services, Bouquets, Bouquet, Service
 from app.eparser.ecommons import CAS, Flag, BouquetService
 from app.eparser.enigma.bouquets import BqServiceType
@@ -22,7 +50,7 @@ from app.tools.media import Player, Recorder
 from app.ui.epg_dialog import EpgDialog
 from app.ui.transmitter import LinksTransmitter
 from .backup import BackupDialog, backup_data, clear_data_path
-from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog, get_message
+from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog, get_message, get_builder
 from .download_dialog import DownloadDialog
 from .imports import ImportDialog, import_bouquet
 from .iptv import IptvDialog, SearchUnavailableDialog, IptvListConfigurationDialog, YtListImportDialog, M3uImportDialog
@@ -36,7 +64,8 @@ from .search import SearchProvider
 from .service_details_dialog import ServiceDetailsDialog, Action
 from .settings_dialog import show_settings_dialog
 from .uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, LOCKED_ICON, HIDE_ICON, IPTV_ICON, MOVE_KEYS, KeyboardKey, Column,
-                        FavClickMode, MOD_MASK, TEXT_DOMAIN, APP_FONT)
+                        FavClickMode, MOD_MASK, APP_FONT)
+
 
 class Application(Gtk.Application):
     SERVICE_MODEL_NAME = "services_list_store"
@@ -45,8 +74,8 @@ class Application(Gtk.Application):
     ALT_MODEL_NAME = "alt_list_store"
     DRAG_SEP = "::::"
 
-    DEL_FACTOR = 50  # Batch size to delete in one pass.
-    FAV_FACTOR = DEL_FACTOR * 2
+    DEL_FACTOR = 100  # Batch size to delete in one pass.
+    FAV_FACTOR = DEL_FACTOR * 5
 
     _TV_TYPES = ("TV", "TV (HD)", "TV (UHD)", "TV (H264)")
 
@@ -57,8 +86,8 @@ class Application(Gtk.Application):
 
     _FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item",
                      "fav_insert_marker_popup_item", "fav_insert_space_popup_item", "fav_edit_sub_menu_popup_item",
-                     "fav_edit_popup_item", "fav_picon_popup_item", "fav_copy_popup_item",
-                     "fav_epg_configuration_popup_item", "fav_add_alt_popup_item")
+                     "fav_edit_popup_item", "fav_picon_popup_item", "fav_copy_popup_item", "fav_add_alt_popup_item",
+                     "fav_epg_configuration_popup_item", "fav_mark_dup_popup_item")
 
     _BOUQUET_ELEMENTS = ("bouquets_new_popup_item", "bouquets_edit_popup_item", "bouquets_cut_popup_item",
                          "bouquets_copy_popup_item", "bouquets_paste_popup_item", "bouquet_import_popup_item",
@@ -126,6 +155,7 @@ class Application(Gtk.Application):
                           "on_model_changed": self.on_model_changed,
                           "on_import_yt_list": self.on_import_yt_list,
                           "on_import_m3u": self.on_import_m3u,
+                          "on_bouquet_export": self.on_bouquet_export,
                           "on_export_to_m3u": self.on_export_to_m3u,
                           "on_import_bouquet": self.on_import_bouquet,
                           "on_import_bouquets": self.on_import_bouquets,
@@ -134,6 +164,7 @@ class Application(Gtk.Application):
                           "on_insert_space": self.on_insert_space,
                           "on_fav_press": self.on_fav_press,
                           "on_locate_in_services": self.on_locate_in_services,
+                          "on_mark_duplicates": self.on_mark_duplicates,
                           "on_picons_manager_show": self.on_picons_manager_show,
                           "on_filter_changed": self.on_filter_changed,
                           "on_filter_type_toggled": self.on_filter_type_toggled,
@@ -185,6 +216,7 @@ class Application(Gtk.Application):
         self._alt_file = set()
         self._alt_counter = 1
         self._data_hash = 0
+        self._filter_cache = {}
         # For bouquets with different names of services in bouquet and main list
         self._extra_bouquets = {}
         self._picons = {}
@@ -216,9 +248,7 @@ class Application(Gtk.Application):
         self._NEW_COLOR = None  # Color for new services in the main list
         self._EXTRA_COLOR = None  # Color for services with a extra name for the bouquet
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "main_window.glade")
-        builder.connect_signals(self._handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "main_window.glade", self._handlers)
         self._main_window = builder.get_object("main_window")
         main_window_size = self._settings.get("window_size")
         # Setting the last size of the window if it was saved
@@ -234,19 +264,27 @@ class Application(Gtk.Application):
         self._status_bar_box = builder.get_object("status_bar_box")
         self._services_main_box = builder.get_object("services_main_box")
         self._bq_name_label = builder.get_object("bq_name_label")
-        tool_bar = builder.get_object("top_toolbar")
-        self._main_data_box.bind_property("visible", tool_bar, "visible")
+        self._main_data_box.bind_property("visible", builder.get_object("top_toolbar"), "visible")
         self._telnet_tool_button = builder.get_object("telnet_tool_button")
         self._top_box = builder.get_object("top_box")
+        self._toolbar_extra_tools_box = builder.get_object("toolbar_extra_tools_box")
+        self._add_bouquet_button = builder.get_object("add_bouquet_tool_button")
         # Setting custom sort function for position column.
         self._services_view.get_model().set_sort_func(Column.SRV_POS, self.position_sort_func, Column.SRV_POS)
+        # Tool bar elements.
+        self._main_box = builder.get_object("main_box")
+        self._toolbar_search_box = builder.get_object("toolbar_search_box")
+        toolbar_tools_box = builder.get_object("toolbar_tools_box")
+        self._toolbar_search_box.bind_property("visible", toolbar_tools_box, "visible")
+        self._toolbar_search_box.bind_property("visible", self._toolbar_extra_tools_box, "visible")
         # App info
         self._app_info_box = builder.get_object("app_info_box")
         self._app_info_box.bind_property("visible", builder.get_object("main_paned"), "visible", 4)
-        self._app_info_box.bind_property("visible", builder.get_object("toolbar_extra_box"), "visible", 4)
-        self._app_info_box.bind_property("visible", builder.get_object("toolbar_tools_box"), "visible", 4)
+        self._app_info_box.bind_property("visible", self._toolbar_search_box, "visible", 4)
+        self._app_info_box.bind_property("visible", self._toolbar_extra_tools_box, "visible", 4)
+        self._app_info_box.bind_property("visible", toolbar_tools_box, "visible", 4)
         self._app_info_box.bind_property("visible", builder.get_object("save_tool_button"), "visible", 4)
-        self._app_info_box.bind_property("visible", builder.get_object("add_bouquet_tool_button"), "visible", 4)
+        self._app_info_box.bind_property("visible", self._add_bouquet_button, "visible", 4)
         # Status bar
         self._profile_combo_box = builder.get_object("profile_combo_box")
         self._receiver_info_box = builder.get_object("receiver_info_box")
@@ -263,8 +301,9 @@ class Application(Gtk.Application):
         self._tv_count_label = builder.get_object("tv_count_label")
         self._radio_count_label = builder.get_object("radio_count_label")
         self._data_count_label = builder.get_object("data_count_label")
+        self._services_load_spinner = builder.get_object("services_load_spinner")
         self._signal_level_bar.bind_property("visible", builder.get_object("play_current_service_button"), "visible")
-        # self._signal_level_bar.bind_property("visible", builder.get_object("record_button"), "visible")
+        self._signal_level_bar.bind_property("visible", builder.get_object("record_button"), "visible")
         self._receiver_info_box.bind_property("visible", self._http_status_image, "visible", 4)
         self._receiver_info_box.bind_property("visible", self._signal_box, "visible")
         # Alternatives
@@ -280,6 +319,9 @@ class Application(Gtk.Application):
         self._ftp_button = builder.get_object("ftp_button")
         self._ftp_revealer = builder.get_object("ftp_revealer")
         self._ftp_button.bind_property("active", self._ftp_revealer, "visible")
+        self._ftp_revealer.bind_property("visible", self._main_box, "visible", 4)
+        self._ftp_revealer.bind_property("visible", builder.get_object("toolbar_main_box"), "visible", 4)
+        self._ftp_button.connect("toggled", self.on_ftp_toggle)
         # Force Ctrl press event for view. Multiple selections in lists only with Space key(as in file managers)!!!
         self._services_view.connect("key-press-event", self.force_ctrl)
         self._fav_view.connect("key-press-event", self.force_ctrl)
@@ -290,11 +332,14 @@ class Application(Gtk.Application):
         # Filter
         self._services_model_filter = builder.get_object("services_model_filter")
         self._services_model_filter.set_visible_func(self.services_filter_function)
+        self._filter_tool_button = builder.get_object("filter_tool_button")
         self._filter_entry = builder.get_object("filter_entry")
-        self._filter_bar = builder.get_object("filter_bar")
+        self._filter_box = builder.get_object("filter_box")
         self._filter_types_model = builder.get_object("filter_types_list_store")
         self._filter_sat_pos_model = builder.get_object("filter_sat_pos_list_store")
         self._filter_only_free_button = builder.get_object("filter_only_free_button")
+        self._services_load_spinner.bind_property("active", self._filter_tool_button, "sensitive", 4)
+        self._services_load_spinner.bind_property("active", self._filter_box, "sensitive", 4)
         # Player
         self._player_box = builder.get_object("player_box")
         self._player_event_box = builder.get_object("player_event_box")
@@ -305,18 +350,18 @@ class Application(Gtk.Application):
         self._player_tool_bar = builder.get_object("player_tool_bar")
         self._player_prev_button = builder.get_object("player_prev_button")
         self._player_next_button = builder.get_object("player_next_button")
+        self._player_box.bind_property("visible", self._top_box, "visible", 4)
         self._player_box.bind_property("visible", self._services_main_box, "visible", 4)
         self._fav_bouquets_paned = builder.get_object("fav_bouquets_paned")
         self._player_box.bind_property("visible", builder.get_object("fav_pos_column"), "visible", 4)
         self._player_box.bind_property("visible", builder.get_object("fav_pos_column"), "visible", 4)
         self._player_box.bind_property("visible", self._player_event_box, "visible")
-        self._player_box.bind_property("visible", tool_bar, "sensitive", 4)
         self._fav_view.bind_property("sensitive", self._player_prev_button, "sensitive")
         self._fav_view.bind_property("sensitive", self._player_next_button, "sensitive")
         # Record
         self._record_image = builder.get_object("record_button_image")
         # Search
-        self._search_bar = builder.get_object("search_bar")
+        self._search_box = builder.get_object("search_box")
         self._search_entry = builder.get_object("search_entry")
         self._search_provider = SearchProvider((self._services_view, self._fav_view, self._bouquets_view),
                                                builder.get_object("search_down_button"),
@@ -333,8 +378,7 @@ class Application(Gtk.Application):
 
         # Menu bar
         main_box = builder.get_object("main_window_box")
-        builder.set_translation_domain(TEXT_DOMAIN)
-        builder.add_from_file(UI_RESOURCES_PATH + "app_menu_bar.ui")
+        builder = get_builder(UI_RESOURCES_PATH + "app_menu_bar.ui", tag="attribute")
         menu_bar = Gtk.MenuBar.new_from_model(builder.get_object("menu_bar"))
         menu_bar.set_visible(True)
         main_box.pack_start(menu_bar, False, False, 0)
@@ -415,10 +459,23 @@ class Application(Gtk.Application):
         # Save
         self._app_info_box.bind_property("visible", self.set_action("on_data_save", self.on_data_save, False),
                                          "enabled", 4)
+        self._app_info_box.bind_property("visible", self.set_action("on_data_save_as", self.on_data_save_as, False),
+                                         "enabled", 4)
+
         # Control
         remote_action = Gio.SimpleAction.new_stateful("on_remote", None, GLib.Variant.new_boolean(False))
         remote_action.connect("change-state", self.on_control)
         self.add_action(remote_action)
+        # FTP client. Hiding the app menu bar when the client is shown.
+        # We are working with the "hidden-when" submenu attribute. See 'app_menu_bar.ui' file.
+        hide_bar_action = Gio.SimpleAction.new("hide_menu_bar", None)
+        self._ftp_revealer.bind_property("visible", hide_bar_action, "enabled", 4)
+        self.add_action(hide_bar_action)
+        show_ftp_menu_action = Gio.SimpleAction.new("show_ftp_menu", None)
+        show_ftp_menu_action.set_enabled(False)
+        self._ftp_revealer.bind_property("visible", show_ftp_menu_action, "enabled")
+        self.add_action(show_ftp_menu_action)
+        self.set_action("on_ftp_client_close", lambda a, v: self._ftp_button.set_active(False))
         # Layout
         self.set_action("on_switch_fav_position", self.on_switch_fav_position)
 
@@ -617,7 +674,14 @@ class Application(Gtk.Application):
     def on_close_app(self, *args):
         """ Performing operations before closing the application. """
         # Saving the current size of the application window.
-        self._settings.add("window_size", self._main_window.get_size())
+        self._main_window.unfullscreen()
+        if not self._main_window.is_maximized():
+            self._settings.add("window_size", self._main_window.get_size())
+
+        if self._services_load_spinner.get_property("active"):
+            msg = "{}\n\n\t{}".format(get_message("Data loading in progress!"), get_message("Are you sure?"))
+            if show_dialog(DialogType.QUESTION, self._main_window, msg) == Gtk.ResponseType.CANCEL:
+                return True
 
         if self._recorder:
             if self._recorder.is_record():
@@ -665,10 +729,9 @@ class Application(Gtk.Application):
         model, paths = view.get_selection().get_selected_rows()
 
         if target is ViewTarget.FAV:
-            rows = []
-            for in_itr in [model.get_iter(path) for path in paths]:
-                v1, v2, v3, v4, v5, v6, v7, v8 = model.get(in_itr, 2, 3, 4, 5, 7, 16, 18, 8)
-                rows.append((0, v1, v2, v3, v4, v5, v6, v7, v8))
+            self._rows_buffer.extend((0, *model.get(model.get_iter(path), Column.SRV_CODED, Column.SRV_SERVICE,
+                                                    Column.SRV_LOCKED, Column.SRV_HIDE, Column.SRV_TYPE, Column.SRV_POS,
+                                                    Column.SRV_FAV_ID, Column.SRV_PICON), None, None) for path in paths)
         elif target is ViewTarget.SERVICES:
             self._rows_buffer.extend(model[path][:] for path in paths)
         elif target is ViewTarget.BOUQUET:
@@ -757,6 +820,10 @@ class Application(Gtk.Application):
 
             returns deleted rows list!
         """
+        if self._services_load_spinner.get_property("active"):
+            show_dialog(DialogType.ERROR, self._main_window, get_message("Data loading in progress!"))
+            return
+
         selection = view.get_selection()
         model, paths = selection.get_selected_rows()
         model_name = get_base_model(model).get_name()
@@ -795,6 +862,7 @@ class Application(Gtk.Application):
                         yield True
                 self.update_fav_num_column(model)
 
+        self.on_model_changed(self._fav_model)
         self._wait_dialog.hide()
         yield True
 
@@ -821,6 +889,7 @@ class Application(Gtk.Application):
         for f_itr in filter(lambda r: r[Column.FAV_ID] in srv_ids_to_delete, self._fav_model):
             self._fav_model.remove(f_itr.iter)
 
+        self.on_model_changed(self._services_model)
         self.update_fav_num_column(self._fav_model)
         self.update_sat_positions()
         self._wait_dialog.hide()
@@ -844,6 +913,7 @@ class Application(Gtk.Application):
 
         self._bq_selected = ""
         self._bq_name_label.set_text(self._bq_selected)
+        self.on_model_changed(model)
         self._wait_dialog.hide()
         yield True
 
@@ -941,6 +1011,8 @@ class Application(Gtk.Application):
             if not is_marker:
                 num += 1
             row[Column.FAV_NUM] = 0 if is_marker else num
+
+        self.on_model_changed(model)
         yield True
 
     def update_bouquet_list(self):
@@ -1220,15 +1292,18 @@ class Application(Gtk.Application):
 
         if txt:
             if txt.startswith("file://") and name == self.SERVICE_MODEL_NAME:
-                self.on_import_data(urlparse(unquote(txt)).path.strip())
+                path = urlparse(unquote(txt)).path
+                self.on_import_data(path.lstrip("/") if IS_WIN else path.strip())
             elif name == self.FAV_MODEL_NAME:
                 self.receive_selection(view=view, drop_info=view.get_dest_row_at_pos(x, y), data=txt)
 
         if uris:
             src, sep, dest = uris[0].partition("::::")
             src_path = urlparse(unquote(src)).path
+            src_path = src_path.lstrip("/") if IS_WIN else src_path.strip()
             if dest:
-                dest_path = urlparse(unquote(dest)).path + "/"
+                dest_path = urlparse(unquote(dest)).path
+                dest_path = dest_path.lstrip("/") + "/" if IS_WIN else dest_path.strip()
                 self.picons_buffer = self.on_assign_picon(view, src_path, dest_path)
             elif name == self.SERVICE_MODEL_NAME:
                 self.on_import_data(src_path)
@@ -1240,7 +1315,9 @@ class Application(Gtk.Application):
 
         uris = data.get_uris()
         if uris:
-            self.on_import_bouquet(None, file_path=urlparse(unquote(uris[0])).path.strip())
+            path = urlparse(unquote(uris[0])).path
+            path = path.lstrip("/") if IS_WIN else path.strip()
+            self.on_import_bouquet(None, file_path=path)
             return
 
         data = data.get_text()
@@ -1248,7 +1325,9 @@ class Application(Gtk.Application):
             return
 
         if data.startswith("file://"):
-            self.on_import_bouquet(None, file_path=urlparse(unquote(data)).path.strip())
+            path = urlparse(unquote(data)).path
+            path = path.lstrip("/") if IS_WIN else path.strip()
+            self.on_import_bouquet(None, file_path=path)
             return
 
         itr_str, sep, source = data.partition(self.DRAG_SEP)
@@ -1380,7 +1459,7 @@ class Application(Gtk.Application):
                 self.delete_selection(self._services_view, self._fav_view)
                 self.on_view_focus(self._bouquets_view)
 
-            menu.popup(None, None, None, None, event.button, event.time)
+            menu.popup_at_pointer(None)
             return True
 
     def on_satellite_editor_show(self, action, value=None):
@@ -1451,8 +1530,12 @@ class Application(Gtk.Application):
         """ Opening the data archive via "File/Open archive". """
         file_filter = Gtk.FileFilter()
         file_filter.set_name("*.zip, *.gz")
-        file_filter.add_mime_type("application/zip")
-        file_filter.add_mime_type("application/gzip")
+        if IS_WIN:
+            file_filter.add_pattern("*.zip")
+            file_filter.add_pattern("*.gz")
+        else:
+            file_filter.add_mime_type("application/zip")
+            file_filter.add_mime_type("application/gzip")
 
         response = show_dialog(DialogType.CHOOSER, self._main_window,
                                action_type=Gtk.FileChooserAction.OPEN,
@@ -1465,6 +1548,9 @@ class Application(Gtk.Application):
 
     def open_data(self, data_path=None, callback=None):
         """ Opening data and fill views. """
+        if self._ftp_button.get_active():
+            return
+
         if data_path and os.path.isfile(data_path):
             self.open_compressed_data(data_path)
         else:
@@ -1496,8 +1582,10 @@ class Application(Gtk.Application):
                         except (UnicodeEncodeError, UnicodeDecodeError) as e:
                             log("Filename [{}] error in zip archive: {}".format(zip_info.filename, e))
                         else:
-                            zip_info.filename = os.path.basename(f_name)
-                            zip_file.extract(zip_info, path=tmp_path_name)
+                            base_name = os.path.basename(f_name)
+                            if base_name:
+                                zip_info.filename = os.path.basename(f_name)
+                                zip_file.extract(zip_info, path=tmp_path_name)
         elif tarfile.is_tarfile(data_path):
             with tarfile.open(data_path) as tar:
                 for mb in tar.getmembers():
@@ -1515,6 +1603,7 @@ class Application(Gtk.Application):
     def update_data(self, data_path, callback=None):
         self._profile_combo_box.set_sensitive(False)
         self._alt_revealer.set_visible(False)
+        self._filter_tool_button.set_active(False)
         self._wait_dialog.show()
 
         yield from self.clear_current_data()
@@ -1567,8 +1656,6 @@ class Application(Gtk.Application):
         else:
             self.append_blacklist(black_list)
             yield from self.append_data(bouquets, services)
-        finally:
-            self._wait_dialog.hide()
             self._profile_combo_box.set_sensitive(True)
             if callback:
                 callback()
@@ -1577,9 +1664,11 @@ class Application(Gtk.Application):
             yield True
             self._data_hash = self.get_data_hash()
             yield True
-            if self._filter_bar.get_visible():
+            if self._filter_box.get_visible():
                 self.on_filter_changed()
             yield True
+        finally:
+            self._wait_dialog.hide()
 
     def append_data(self, bouquets, services):
         if self._app_info_box.get_visible():
@@ -1620,7 +1709,7 @@ class Application(Gtk.Application):
         bq_id = "{}:{}".format(name, bq_type)
         services = []
         extra_services = {}  # for services with different names in bouquet and main list
-
+        agr = [None] * 7
         for srv in bq.services:
             fav_id = srv.data
             # IPTV and MARKER services
@@ -1639,13 +1728,12 @@ class Application(Gtk.Application):
                         picon_id = "{}_{}_{}_{}_{}_{}_{}_{}_{}_{}.png".format(*fav_id_data[:10])
                         locked = LOCKED_ICON if data_id in self._blacklist else None
                 srv = Service(None, None, icon, srv.name, locked, None, None, s_type.name,
-                              self._picons.get(picon_id, None), picon_id, None, None, None, None, None, None, None,
-                              data_id, fav_id, None)
+                              self._picons.get(picon_id, None), picon_id, *agr, data_id, fav_id, None)
                 self._services[fav_id] = srv
             elif s_type is BqServiceType.ALT:
                 self._alt_file.add("{}:{}".format(srv.data, bq_type))
                 srv = Service(None, None, None, srv.name, locked, None, None, s_type.name,
-                              None, None, None, None, None, None, None, None, None, srv.data, fav_id, srv.num)
+                              None, None, *agr, srv.data, fav_id, srv.num)
                 self._services[fav_id] = srv
             elif srv.name:
                 extra_services[fav_id] = srv.name
@@ -1672,7 +1760,9 @@ class Application(Gtk.Application):
             #  Adding channels to dict with fav_id as keys.
             self._services[srv.fav_id] = srv
         self.update_services_counts(len(self._services.values()))
-        factor = self.DEL_FACTOR * 2
+        self._wait_dialog.hide()
+        self._services_load_spinner.start()
+        factor = self.DEL_FACTOR
 
         for index, srv in enumerate(services):
             tooltip, background = None, None
@@ -1687,11 +1777,13 @@ class Application(Gtk.Application):
             self._services_model.append(s)
             if index % factor == 0:
                 yield True
+
+        self._services_load_spinner.stop()
         yield True
 
     def clear_current_data(self):
         """ Clearing current data from lists """
-        if len(self._services_model) > self.DEL_FACTOR * 100:
+        if len(self._services_model) > self.DEL_FACTOR * 50:
             self._wait_dialog.set_text("Deleting data...")
 
         self._bouquets_model.clear()
@@ -1737,12 +1829,32 @@ class Application(Gtk.Application):
         gen = self.save_data()
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
-    def save_data(self, callback=None):
+    def on_data_save_as(self, action=None, value=None):
+        if len(self._bouquets_model) == 0:
+            self.show_error_dialog("No data to save!")
+            return
+
+        response = show_dialog(DialogType.CHOOSER, self._main_window, settings=self._settings,
+                               buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK),
+                               create_dir=True)
+        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
+            return
+
+        if os.listdir(response):
+            msg = "{}\n\n\t\t{}".format(get_message("The selected folder already contains files!"),
+                                        get_message("Are you sure?"))
+            if show_dialog(DialogType.QUESTION, self._main_window, msg) != Gtk.ResponseType.OK:
+                return
+
+        gen = self.save_data(lambda: show_dialog(DialogType.INFO, self._main_window, "Done!"), response)
+        GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
+
+    def save_data(self, callback=None, ext_path=None):
         profile = self._s_type
-        path = self._settings.data_local_path
+        path = ext_path or self._settings.data_local_path
         backup_path = self._settings.backup_local_path
         # Backup data or clearing data path
-        backup_data(path, backup_path) if self._settings.backup_before_save else clear_data_path(path)
+        backup_data(path, backup_path) if not ext_path and self._settings.backup_before_save else clear_data_path(path)
         yield True
 
         bouquets = []
@@ -1753,21 +1865,9 @@ class Application(Gtk.Application):
                 bqs = []
                 num_of_children = model.iter_n_children(itr)
                 for num in range(num_of_children):
-                    bq_itr = model.iter_nth_child(itr, num)
-                    bq_name, locked, hidden, bq_type = model.get(bq_itr, Column.BQ_NAME, Column.BQ_LOCKED,
-                                                                 Column.BQ_HIDDEN, Column.BQ_TYPE)
-                    bq_id = "{}:{}".format(bq_name, bq_type)
-                    favs = self._bouquets[bq_id]
-                    ex_s = self._extra_bouquets.get(bq_id, None)
-                    bq_s = list(filter(None, [self._services.get(f_id, None) for f_id in favs]))
-
-                    if profile is SettingsType.ENIGMA_2:
-                        bq_s = self.get_enigma_bq_services(bq_s, ex_s)
-
-                    bq = Bouquet(bq_name, bq_type, bq_s, locked, hidden, self._bq_file.get(bq_id, None))
-                    bqs.append(bq)
+                    bqs.append(self.get_bouquet(model.iter_nth_child(itr, num), model))
             if len(b_path) == 1:
-                bouquets.append(Bouquets(model.get_value(itr, 0), model.get_value(itr, 3), bqs if bqs else []))
+                bouquets.append(Bouquets(*model.get(itr, Column.BQ_NAME, Column.BQ_TYPE), bqs if bqs else []))
 
         # Getting bouquets
         self._bouquets_view.get_model().foreach(parse_bouquets)
@@ -1788,6 +1888,20 @@ class Application(Gtk.Application):
         if callback:
             callback()
 
+    def get_bouquet(self, itr, model):
+        """ Constructs and returns Bouquet class instance. """
+        bq_name, locked, hidden, bq_type = model.get(itr, Column.BQ_NAME, Column.BQ_LOCKED, Column.BQ_HIDDEN,
+                                                     Column.BQ_TYPE)
+        bq_id = "{}:{}".format(bq_name, bq_type)
+        favs = self._bouquets[bq_id]
+        ex_s = self._extra_bouquets.get(bq_id, None)
+        bq_s = list(filter(None, [self._services.get(f_id, None) for f_id in favs]))
+
+        if self._s_type is SettingsType.ENIGMA_2:
+            bq_s = self.get_enigma_bq_services(bq_s, ex_s)
+
+        return Bouquet(bq_name, bq_type, bq_s, locked, hidden, self._bq_file.get(bq_id, None))
+
     def get_enigma_bq_services(self, services, ext_services):
         """ Preparing a list of services for the Enigma2 bouquet. """
         s_list = []
@@ -1922,7 +2036,8 @@ class Application(Gtk.Application):
                     alt_servs = srv.transponder
                     if alt_servs:
                         alt_srv = self._services.get(alt_servs[0].data, None)
-                        picon = self._picons.get(alt_srv.picon_id, None) if srv else None
+                        if alt_srv:
+                            picon = self._picons.get(alt_srv.picon_id, None) if srv else None
 
                 self._fav_model.append((0 if is_marker else num, srv.coded, ex_srv_name if ex_srv_name else srv.service,
                                         srv.locked, srv.hide, srv_type, srv.pos, srv.fav_id,
@@ -1930,6 +2045,7 @@ class Application(Gtk.Application):
 
         yield True
         self._fav_view.set_model(self._fav_model)
+        self.on_model_changed(self._fav_model)
         self._bouquets_view.set_sensitive(True)
         self._bouquets_view.grab_focus()
         yield True
@@ -1962,9 +2078,7 @@ class Application(Gtk.Application):
 
     def delete_selection(self, view, *args):
         """ Used for clear selection on given view(s) """
-        views = [view, ]
-        views.extend(args)
-        for v in views:
+        for v in [view, *args]:
             v.get_selection().unselect_all()
 
     def on_settings(self, action, value=None):
@@ -2090,7 +2204,7 @@ class Application(Gtk.Application):
 
     def on_view_focus(self, view, focus_event=None):
         model_name, model = get_model_data(view)
-        not_empty = len(model) > 0  # if  > 0 model has items
+        not_empty = len(model) > 0 if model else False
         is_service = model_name == self.SERVICE_MODEL_NAME
 
         if model_name == self.BQ_MODEL_NAME:
@@ -2146,8 +2260,7 @@ class Application(Gtk.Application):
             value = None if value else LOCKED_ICON if flag is Flag.LOCK else HIDE_ICON
             model.set_value(itr, 1 if flag is Flag.LOCK else 2, value)
 
-    @run_idle
-    def on_model_changed(self, model, path, itr=None):
+    def on_model_changed(self, model, path=None, itr=None):
         model_name = model.get_name()
 
         if model_name == self.FAV_MODEL_NAME:
@@ -2266,7 +2379,7 @@ class Application(Gtk.Application):
         bq = self._bouquets.get(self._bq_selected)
         EpgDialog(self._main_window, self._settings, self._services, bq, self._fav_model, self._current_bq_name).show()
 
-    # ***************** Import  ********************#
+    # ***************** Import ******************** #
 
     def on_import_yt_list(self, action, value=None):
         """ Import playlist from YouTube """
@@ -2298,30 +2411,6 @@ class Application(Gtk.Application):
         gen = self.update_bouquet_services(self._fav_model, None, self._bq_selected)
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
-    @run_idle
-    def on_export_to_m3u(self, action, value=None):
-        i_types = (BqServiceType.IPTV.value, BqServiceType.MARKER.value)
-        bq_services = [BouquetService(r[Column.FAV_SERVICE],
-                                      BqServiceType(r[Column.FAV_TYPE]),
-                                      r[Column.FAV_ID],
-                                      r[Column.FAV_NUM]) for r in self._fav_model if r[Column.FAV_TYPE] in i_types]
-
-        if not any(s.type is BqServiceType.IPTV for s in bq_services):
-            self.show_error_dialog("This list does not contains IPTV streams!")
-            return
-
-        response = show_dialog(DialogType.CHOOSER, self._main_window, settings=self._settings)
-        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
-            return
-
-        try:
-            bq = Bouquet(self._current_bq_name, None, bq_services, None, None)
-            export_to_m3u(response, bq, self._s_type)
-        except Exception as e:
-            self.show_error_dialog(str(e))
-        else:
-            show_dialog(DialogType.INFO, self._main_window, "Done!")
-
     def on_import_data(self, path):
         msg = "Combine with the current data?"
         if len(self._services_model) > 0 and show_dialog(DialogType.QUESTION, self._main_window,
@@ -2349,6 +2438,7 @@ class Application(Gtk.Application):
         self.import_data(response)
 
     def import_data(self, path, force=None, callback=None):
+        path = os.path.normpath(path)
         if os.path.isdir(path) and not path.endswith(os.sep):
             path += os.sep
         elif os.path.isfile(path):
@@ -2365,6 +2455,7 @@ class Application(Gtk.Application):
 
         dialog = ImportDialog(self._main_window, path, self._settings, self._services.keys(), append)
         dialog.import_data() if force else dialog.show()
+        self.update_picons()
 
     def append_imported_data(self, bouquets, services, callback=None):
         try:
@@ -2402,6 +2493,61 @@ class Application(Gtk.Application):
         yield True
         self._wait_dialog.hide()
 
+    # ***************** Export  ******************** #
+
+    def on_bouquet_export(self, item=None):
+        """ Exports single bouquet to file. """
+        bq_selected = self.check_bouquet_selection()
+        if not bq_selected:
+            return
+
+        model, paths = self._bouquets_view.get_selection().get_selected_rows()
+        if len(paths) > 1:
+            self.show_error_dialog("Please, select only one bouquet!")
+            return
+
+        response = show_dialog(DialogType.CHOOSER, self._main_window, settings=self._settings,
+                               buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
+        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
+            return
+
+        try:
+            itr = model.get_iter(paths)
+            bq = self.get_bouquet(itr, model)
+            if self._s_type is SettingsType.NEUTRINO_MP:
+                bq = Bouquets(*model.get(itr, Column.BQ_NAME, Column.BQ_TYPE), [bq])
+                response += bq.name
+            write_bouquet(response, bq, self._s_type)
+        except OSError as e:
+            self.show_error_dialog(str(e))
+        else:
+            show_dialog(DialogType.INFO, self._main_window, "Done!")
+
+    @run_idle
+    def on_export_to_m3u(self, action, value=None):
+        i_types = (BqServiceType.IPTV.value, BqServiceType.MARKER.value)
+        bq_services = [BouquetService(r[Column.FAV_SERVICE],
+                                      BqServiceType(r[Column.FAV_TYPE]),
+                                      r[Column.FAV_ID],
+                                      r[Column.FAV_NUM]) for r in self._fav_model if r[Column.FAV_TYPE] in i_types]
+
+        if not any(s.type is BqServiceType.IPTV for s in bq_services):
+            self.show_error_dialog("This list does not contains IPTV streams!")
+            return
+
+        response = show_dialog(DialogType.CHOOSER, self._main_window, settings=self._settings,
+                               buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK))
+        if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
+            return
+
+        try:
+            bq = Bouquet(self._current_bq_name, None, bq_services, None, None)
+            export_to_m3u(response, bq, self._s_type)
+        except Exception as e:
+            self.show_error_dialog(str(e))
+        else:
+            show_dialog(DialogType.INFO, self._main_window, "Done!")
+
     # ***************** Backup  ******************** #
 
     def on_backup_tool_show(self, action, value=None):
@@ -2599,6 +2745,8 @@ class Application(Gtk.Application):
     def update_state_on_full_screen(self, visible):
         self._main_data_box.set_visible(visible)
         self._player_tool_bar.set_visible(visible)
+        if self._control_box:
+            self._control_box.set_visible(visible)
         self._status_bar_box.set_visible(visible and not self._app_info_box.get_visible())
 
     @run_idle
@@ -2728,7 +2876,7 @@ class Application(Gtk.Application):
             GLib.idle_add(self._player_box.set_visible, True)
             GLib.idle_add(self._app_info_box.set_visible, False)
 
-        self._http_api.send(HttpAPI.Request.STREAM_CURRENT, None, self.watch)
+        self._http_api.send(HttpAPI.Request.STREAM_CURRENT, "", self.watch)
 
     def watch(self, data):
         url = self.get_url_from_m3u(data)
@@ -2902,6 +3050,10 @@ class Application(Gtk.Application):
 
     # ****************** FTP client ********************* #
 
+    def on_ftp_toggle(self, button):
+        if not self._app_info_box.get_visible():
+            self._toolbar_search_box.set_visible(not button.get_active())
+
     def on_ftp_realize(self, revealer):
         if not self._ftp_client:
             from app.ui.ftp import FtpClientBox
@@ -2912,14 +3064,14 @@ class Application(Gtk.Application):
     # ***************** Filter and search ********************* #
 
     def on_filter_toggled(self, action, value):
-        if self._app_info_box.get_visible():
+        if self._app_info_box.get_visible() or self._services_load_spinner.get_property("active"):
             return True
 
         action.set_state(value)
 
         self._filter_entry.grab_focus() if value else self.on_filter_changed()
         self.filter_set_default()
-        self._filter_bar.set_visible(value)
+        self._filter_box.set_visible(value)
 
     @run_idle
     def filter_set_default(self):
@@ -2974,25 +3126,36 @@ class Application(Gtk.Application):
 
     @run_with_delay(2)
     def on_filter_changed(self, item=None):
+        self._services_load_spinner.start()
         model = self._services_view.get_model()
         self._services_view.set_model(None)
+        self.update_filter_cache()
+        self.update_filter_state(model)
+
+    @run_idle
+    def update_filter_state(self, model):
         self._services_model_filter.refilter()
         self._services_view.set_model(model)
+        GLib.idle_add(self._services_load_spinner.stop)
+
+    def update_filter_cache(self):
+        self._filter_cache.clear()
+        if not self._filter_box.is_visible():
+            return
+
+        txt = self._filter_entry.get_text().upper()
+        for r in self._services_model:
+            free = not r[Column.SRV_CODED] if self._filter_only_free_button.get_active() else True
+            self._filter_cache[r[Column.SRV_FAV_ID]] = all((r[Column.SRV_TYPE] in self._service_types,
+                                                            r[Column.SRV_POS] in self._sat_positions, free,
+                                                            txt in "".join((r[Column.SRV_SERVICE],
+                                                                            r[Column.SRV_PACKAGE],
+                                                                            r[Column.SRV_TYPE],
+                                                                            r[Column.SRV_SSID],
+                                                                            r[Column.SRV_POS])).upper()))
 
     def services_filter_function(self, model, itr, data):
-        if not self._filter_bar.is_visible():
-            return True
-        else:
-            r_txt = str(model.get(itr, Column.SRV_SERVICE, Column.SRV_PACKAGE, Column.SRV_TYPE, Column.SRV_SSID,
-                                  Column.SRV_FREQ, Column.SRV_RATE, Column.SRV_POL, Column.SRV_FEC, Column.SRV_SYSTEM,
-                                  Column.SRV_POS)).upper()
-            txt = self._filter_entry.get_text().upper() in r_txt
-            free = not model.get(itr, Column.SRV_CODED)[0] if self._filter_only_free_button.get_active() else True
-            srv_type, pos = model.get(itr, Column.SRV_TYPE, Column.SRV_POS)
-
-            return all((srv_type in self._service_types,
-                        pos in self._sat_positions,
-                        txt, free))
+        return self._filter_cache.get(model.get_value(itr, Column.SRV_FAV_ID), True)
 
     def on_filter_type_toggled(self, toggle, path):
         self.update_filter_toogle_model(self._filter_types_model, toggle, path, self._service_types)
@@ -3020,7 +3183,7 @@ class Application(Gtk.Application):
             return True
 
         action.set_state(value)
-        self._search_bar.set_visible(value)
+        self._search_box.set_visible(value)
         if value:
             self._search_entry.grab_focus()
         else:
@@ -3178,6 +3341,17 @@ class Application(Gtk.Application):
     def on_locate_in_services(self, view):
         locate_in_services(view, self._services_view, self._main_window)
 
+    def on_mark_duplicates(self, item):
+        """ Marks services with duplicate [names] in the fav list.  """
+        from collections import Counter
+
+        dup = Counter(r[Column.FAV_SERVICE] for r in self._fav_model if r[Column.FAV_TYPE] not in self._marker_types)
+        dup = {k for k, v in dup.items() if v > 1}
+
+        for r in self._fav_model:
+            if r[Column.FAV_SERVICE] in dup:
+                r[Column.FAV_BACKGROUND] = self._NEW_COLOR
+
     # ***************** Picons *********************#
 
     def on_picons_manager_show(self, action, value=None):
@@ -3454,6 +3628,10 @@ class Application(Gtk.Application):
     def current_services(self):
         return self._services
 
+    @property
+    def current_bouquets(self):
+        return self._bouquets
+
     @property
     def picons_buffer(self):
         """ Returns a copy and clears the current buffer. """

app/ui/main_helper.py

@@ -625,7 +625,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()
+    model_name = model.get_name() if model else ""
     return model_name, model
 
 

app/ui/picons_manager.glade

@@ -28,9 +28,10 @@ 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-copyright 2018-2020 Dmitriy Yefremov -->
+  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkImage" id="cancel_image">
     <property name="visible">True</property>
@@ -54,12 +55,6 @@ Author: Dmitriy Yefremov
     <property name="can_focus">False</property>
     <property name="icon_name">emblem-important-symbolic</property>
   </object>
-  <object class="GtkImage" id="load_providers">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">network-server-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkListStore" id="picons_dest_list_store">
     <columns>
       <!-- column-name picon -->
@@ -275,7 +270,6 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <property name="gravity">center</property>
     <signal name="delete-event" handler="on_close" swapped="no"/>
     <child>
       <placeholder/>
@@ -515,7 +509,7 @@ Author: Dmitriy Yefremov
                               </object>
                               <packing>
                                 <property name="resize">True</property>
-                                <property name="shrink">True</property>
+                                <property name="shrink">False</property>
                               </packing>
                             </child>
                             <child>
@@ -669,7 +663,7 @@ Author: Dmitriy Yefremov
                               </object>
                               <packing>
                                 <property name="resize">True</property>
-                                <property name="shrink">True</property>
+                                <property name="shrink">False</property>
                               </packing>
                             </child>
                           </object>
@@ -832,13 +826,12 @@ Author: Dmitriy Yefremov
                             <property name="margin_right">5</property>
                             <property name="margin_top">5</property>
                             <property name="margin_bottom">5</property>
+                            <property name="orientation">vertical</property>
                             <property name="wide_handle">True</property>
                             <child>
                               <object class="GtkBox" id="satellites_box">
-                                <property name="width_request">180</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_right">2</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">2</property>
                                 <child>
@@ -846,10 +839,12 @@ Author: Dmitriy Yefremov
                                     <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="spacing">2</property>
                                     <child>
                                       <object class="GtkLabel" id="satellite_label">
                                         <property name="can_focus">False</property>
+                                        <property name="valign">end</property>
                                         <property name="label" translatable="yes">Satellite</property>
                                       </object>
                                       <packing>
@@ -862,6 +857,7 @@ Author: Dmitriy Yefremov
                                       <object class="GtkLabel" id="loading_data_label">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="valign">end</property>
                                         <property name="label" translatable="yes">Loading data...</property>
                                       </object>
                                       <packing>
@@ -874,6 +870,7 @@ Author: Dmitriy Yefremov
                                       <object class="GtkSpinner" id="loading_data_spinner">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="valign">end</property>
                                         <property name="active">True</property>
                                       </object>
                                       <packing>
@@ -882,6 +879,86 @@ Author: Dmitriy Yefremov
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
+                                    <child type="center">
+                                      <object class="GtkBox" id="download_source_box">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">5</property>
+                                        <child>
+                                          <object class="GtkLabel" id="download_source_label">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Source:</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="download_source_button">
+                                            <property name="visible">True</property>
+                                            <property name="sensitive">False</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="halign">center</property>
+                                            <property name="active">0</property>
+                                            <items>
+                                              <item id="piconcz" translatable="yes">Picon.cz</item>
+                                              <item id="lyngsat" translatable="yes">LyngSat</item>
+                                            </items>
+                                            <signal name="changed" handler="on_download_source_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">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkGrid" id="satellite_filter_grid">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="valign">end</property>
+                                        <property name="column_spacing">5</property>
+                                        <child>
+                                          <object class="GtkLabel" id="satellite_filter_label">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Filter</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSwitch" id="satellite_filter_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="active">True</property>
+                                            <signal name="state-set" handler="on_satellite_filter_toggled" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -891,6 +968,7 @@ Author: Dmitriy Yefremov
                                 </child>
                                 <child>
                                   <object class="GtkScrolledWindow" id="satellites_scrolled_window">
+                                    <property name="height_request">55</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="shadow_type">in</property>
@@ -954,22 +1032,70 @@ Author: Dmitriy Yefremov
                                 </child>
                               </object>
                               <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
+                                <property name="resize">True</property>
+                                <property name="shrink">False</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="proveders_pox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">2</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Satellite url:</property>
+                                    <property name="margin_left">5</property>
+                                    <property name="margin_right">5</property>
+                                    <property name="spacing">10</property>
+                                    <child>
+                                      <object class="GtkLabel" id="provider_header_label">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="halign">start</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="GtkGrid" id="bouquet_filter_grid">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="column_spacing">5</property>
+                                        <child>
+                                          <object class="GtkSwitch" id="bouquet_filter_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="top_attach">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="bouquet_filter_label">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="label" translatable="yes">Load only for selected bouquet</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">0</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>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -977,25 +1103,8 @@ Author: Dmitriy Yefremov
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkEntry" id="url_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="primary_icon_name">network-workgroup-symbolic</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="placeholder_text" translatable="yes">https://www.lyngsat.com/*satellite*.html</property>
-                                    <property name="input_purpose">url</property>
-                                    <signal name="changed" handler="on_url_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="GtkScrolledWindow" id="providers_scrolled_window">
-                                    <property name="height_request">150</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="margin_bottom">2</property>
@@ -1006,7 +1115,9 @@ Author: Dmitriy Yefremov
                                         <property name="can_focus">True</property>
                                         <property name="model">providers_list_store</property>
                                         <property name="search_column">1</property>
+                                        <property name="tooltip_column">0</property>
                                         <signal name="button-press-event" handler="on_popup_menu" object="providers_popup_menu" swapped="no"/>
+                                        <signal name="query-tooltip" handler="on_providers_view_query_tooltip" swapped="no"/>
                                         <signal name="select-all" handler="on_select_all" swapped="no"/>
                                         <child internal-child="selection">
                                           <object class="GtkTreeSelection"/>
@@ -1014,9 +1125,10 @@ Author: Dmitriy Yefremov
                                         <child>
                                           <object class="GtkTreeViewColumn" id="provider_column">
                                             <property name="spacing">15</property>
-                                            <property name="title" translatable="yes">Providers</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="logo_cellrendererpixbuf"/>
                                               <attributes>
@@ -1100,6 +1212,7 @@ Author: Dmitriy Yefremov
                                         <child>
                                           <object class="GtkTreeViewColumn" id="selected_column">
                                             <property name="title" translatable="yes">Selected</property>
+                                            <property name="sort_column_id">7</property>
                                             <child>
                                               <object class="GtkCellRendererToggle" id="cellrenderer_toggle">
                                                 <signal name="toggled" handler="on_selected_toggled" swapped="no"/>
@@ -1119,66 +1232,6 @@ Author: Dmitriy Yefremov
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">2</property>
-                                    <property name="margin_bottom">2</property>
-                                    <property name="column_spacing">2</property>
-                                    <property name="column_homogeneous">True</property>
-                                    <child>
-                                      <object class="GtkEntry" id="ip_entry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="primary_icon_name">network-transmit-receive-symbolic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="picons_entry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="ip_label">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Receiver IP:</property>
-                                        <property name="xalign">0.05000000074505806</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="res_picons_label">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Receiver picons path:</property>
-                                        <property name="xalign">0.05000000074505806</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
                                 <child>
                                   <object class="GtkLabel" id="picons_dir_label">
                                     <property name="visible">True</property>
@@ -1209,7 +1262,7 @@ Author: Dmitriy Yefremov
                               </object>
                               <packing>
                                 <property name="resize">True</property>
-                                <property name="shrink">True</property>
+                                <property name="shrink">False</property>
                               </packing>
                             </child>
                           </object>
@@ -1225,7 +1278,7 @@ Author: Dmitriy Yefremov
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -1668,25 +1721,6 @@ Author: Dmitriy Yefremov
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="load_providers_button">
-                    <property name="label" translatable="yes">Load providers</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Load providers</property>
-                    <property name="valign">center</property>
-                    <property name="image">load_providers</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_load_providers" 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="receive_button">
                     <property name="label" translatable="yes">Receive picons</property>

app/ui/picons_manager.py

@@ -1,7 +1,35 @@
+# -*- 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
-import tempfile
+from enum import Enum
 from pathlib import Path
 from urllib.parse import urlparse, unquote
 
@@ -10,20 +38,24 @@ from gi.repository import GLib, GdkPixbuf, Gio
 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
+from app.tools.picons import (PiconsParser, parse_providers, Provider, convert_to, download_picon, PiconsCzDownloader,
+                              PiconsError)
 from app.tools.satellites import SatellitesParser, SatelliteSource
-from .dialogs import show_dialog, DialogType, get_message
+from .dialogs import show_dialog, DialogType, get_message, get_builder
 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, GTK_PATH, KeyboardKey
+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]?$")
@@ -33,9 +65,14 @@ class PiconsDialog:
         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,
@@ -64,7 +101,10 @@ 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,
@@ -76,9 +116,7 @@ class PiconsDialog:
                     "on_tree_view_key_press": self.on_tree_view_key_press,
                     "on_popup_menu": on_popup_menu}
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "picons_manager.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "picons_manager.glade", handlers)
 
         self._dialog = builder.get_object("picons_dialog")
         self._dialog.set_transient_for(transient)
@@ -100,15 +138,12 @@ 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._message_label = builder.get_object("info_bar_message_label")
         self._info_toggle_button = builder.get_object("info_toggle_button")
         self._picon_info_image = builder.get_object("picon_info_image")
         self._picon_info_label = builder.get_object("picon_info_label")
-        self._load_providers_button = builder.get_object("load_providers_button")
+        self._download_source_button = builder.get_object("download_source_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")
@@ -122,12 +157,19 @@ 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._satellite_label = builder.get_object("satellite_label")
         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._cancel_button.bind_property("visible", self._load_providers_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)
@@ -143,15 +185,9 @@ class PiconsDialog:
         self._info_toggle_button.bind_property("active", explorer_info_bar, "visible")
         # Init drag-and-drop
         self.init_drag_and_drop()
-        # 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)
+        # Settings
         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")
@@ -467,73 +503,168 @@ 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):
-        sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
-        if not sats:
+        self._sats = SatellitesParser().get_satellites_list(SatelliteSource.LYNGSAT)
+        if not self._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 sats:
+            for sat in sorted(sats):
                 pos = sat[1]
                 name = "{} ({})".format(sat[0], pos)
-
-                if not self._terminate and model:
-                    if pos in self._sat_positions:
-                        yield model.append((name, sat[3], pos))
+                if is_filter and pos not in self._sat_positions:
+                    continue
+                if not model:
+                    return
+                yield model.append((name, sat[3], pos))
         finally:
             self._satellite_label.show()
 
     def on_satellite_selection(self, view, path, column):
-        model = view.get_model()
-        self._url_entry.set_text(model.get(model.get_iter(path), 1)[0])
-
-    def on_load_providers(self, item):
         self.on_info_bar_close()
         model = self._providers_view.get_model()
         model.clear()
-        self.get_providers(model)
+        self._satellite_label.set_visible(False)
+        self.get_providers(view.get_model()[path][1], model)
 
     @run_task
-    def get_providers(self, model):
-        providers = parse_providers(self._url_entry.get_text())
-        if providers:
-            self.append_providers(providers, model)
+    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)
 
     @run_idle
     def append_providers(self, providers, model):
-        for p in providers:
-            prv = p._replace(logo=self.get_pixbuf(p[0]) if p[0] else TV_ICON)
-            model.append(prv)
-        self.update_receive_button_state()
+        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 get_pixbuf(self, img_data):
+        self.update_receive_button_state()
+        GLib.idle_add(self._satellite_label.set_visible, True)
+
+    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, 48, 32, True, None)
+            return GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, w, h, True, None)
 
     def on_receive(self, item):
-        self._cancel_button.show()
-        self.start_download()
-
-    @run_task
-    def start_download(self):
         if self._is_downloading:
             self.show_dialog("The task is already running!", DialogType.ERROR)
             return
 
+        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)
 
-        providers = self.get_selected_providers()
         for prv in providers:
-            if not self._POS_PATTERN.match(prv[2]):
+            if self._download_src is self.DownloadSource.LYNG_SAT and 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)
@@ -542,45 +673,81 @@ class PiconsDialog:
         try:
             picons_path = self._picons_dir_entry.get_text()
             os.makedirs(os.path.dirname(picons_path), exist_ok=True)
-            picons = []
-
             self.show_info_message(get_message("Please, wait..."), Gtk.MessageType.INFO)
+            providers = (Provider(*p) for p in providers)
 
-            import concurrent.futures
-
-            with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-                # Getting links to picons.
-                futures = {executor.submit(self.process_provider, Provider(*p), picons_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[0], pic[1], 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)
+            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 not self._is_downloading:
                 return
 
             if not self._resize_no_radio_button.get_active():
                 self.resize(picons_path)
-            else:
-                self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO)
         finally:
             GLib.idle_add(self._cancel_button.hide)
             self._is_downloading = False
 
+    def get_picons_for_lyngsat(self, path, providers):
+        import concurrent.futures
+
+        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())
@@ -627,7 +794,6 @@ class PiconsDialog:
         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)
 
@@ -636,12 +802,6 @@ 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:
@@ -706,8 +866,13 @@ class PiconsDialog:
                 self._filter_binding.unbind()
                 self._app.filter_entry.set_text("")
 
-    @run_with_delay(1)
+    @run_with_delay(0.5)
     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)
 
@@ -727,8 +892,7 @@ class PiconsDialog:
             return True
 
         txt = self._picons_filter_entry.get_text().upper()
-        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())))
+        return txt in t.upper() or self._filter_cache.get(t, False)
 
     def on_picon_activated(self, view):
         if self._info_toggle_button.get_active():
@@ -785,7 +949,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._load_providers_button.set_sensitive(suit if suit else False)
+        self._download_source_button.set_sensitive(suit if suit else False)
 
     def on_position_edited(self, render, path, value):
         model = self._providers_view.get_model()
@@ -795,6 +959,7 @@ 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")
         is_explorer = name == "explorer"
         self._explorer_action_box.set_visible(is_explorer)
         if is_explorer:

app/ui/satellites_dialog.glade

@@ -436,7 +436,6 @@ Author: Dmitriy Yefremov
     <property name="icon_name">applications-utilities</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <property name="gravity">center</property>
     <signal name="check-resize" handler="on_resize" swapped="no"/>
     <child>
       <object class="GtkBox" id="sat_editor_main_box">
@@ -779,7 +778,6 @@ 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 internal-child="vbox">
       <object class="GtkBox" id="satelitte_dialog_vbox">
         <property name="can_focus">False</property>
@@ -969,7 +967,6 @@ 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 internal-child="vbox">
       <object class="GtkBox" id="tr_dialog_vbox">
         <property name="can_focus">False</property>
@@ -1403,7 +1400,6 @@ Author: Dmitriy Yefremov
     <property name="destroy_with_parent">True</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <property name="gravity">center</property>
     <signal name="delete-event" handler="on_quit" swapped="no"/>
     <child>
       <placeholder/>

app/ui/satellites_dialog.py

@@ -9,10 +9,10 @@ from app.commons import run_idle, run_task, log
 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_dialogs_string, get_chooser_dialog, get_message
+from .dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
 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, TEXT_DOMAIN, MOVE_KEYS, KeyboardKey, IS_GNOME_SESSION, MOD_MASK
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, MOVE_KEYS, KeyboardKey, MOD_MASK
 
 _UI_PATH = UI_RESOURCES_PATH + "satellites_dialog.glade"
 
@@ -44,13 +44,10 @@ class SatellitesDialog:
                     "on_resize": self.on_resize,
                     "on_quit": self.on_quit}
 
-        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",
-                                         "sat_editor_save_image", "sat_editor_update_image"))
-        builder.connect_signals(handlers)
+        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"))
 
         self._window = builder.get_object("satellites_editor_window")
         self._window.set_transient_for(transient)
@@ -185,7 +182,8 @@ 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, None, None, None, None, None, None, None, None, None, sat.flags, sat.position])
                 scroll_to(index, view)
 
     def on_transponder(self, transponder=None, edited_itr=None):
@@ -317,13 +315,8 @@ class TransponderDialog:
     def __init__(self, transient, transponder: Transponder = None):
 
         handlers = {"on_entry_changed": self.on_entry_changed}
-
-        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)
+        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)
 
         self._dialog = builder.get_object("transponder_dialog")
         self._dialog.set_transient_for(transient)
@@ -402,10 +395,7 @@ class SatelliteDialog:
     """ Shows dialog for adding or edit satellite """
 
     def __init__(self, transient, satellite: Satellite = None):
-        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"))
+        builder = get_builder(_UI_PATH, use_str=True, objects=("satellite_dialog", "side_store", "pos_adjustment"))
 
         self._dialog = builder.get_object("satellite_dialog")
         self._dialog.set_transient_for(transient)
@@ -467,16 +457,13 @@ class UpdateDialog:
         self._parser = None
         self._size_name = "{}_window_size".format("_".join(re.findall("[A-Z][^A-Z]*", self.__class__.__name__))).lower()
 
-        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",
+        builder = get_builder(UI_RESOURCES_PATH + "satellites_dialog.glade", handlers,
+                              objects=("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"))
-        builder.connect_signals(handlers)
 
         self._window = builder.get_object("satellites_update_window")
         self._window.set_transient_for(transient)

app/ui/service_details_dialog.glade

@@ -272,7 +272,6 @@ 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>
@@ -359,7 +358,7 @@ Author: Dmitriy Yefremov
                 <property name="margin_right">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">2</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkGrid" id="srv_grid">
                     <property name="visible">True</property>
@@ -380,6 +379,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>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -401,7 +401,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>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -425,7 +425,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -470,7 +470,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>
                             <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                             <signal name="changed" handler="update_reference" swapped="no"/>
                           </object>
@@ -820,10 +820,14 @@ 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">
@@ -896,6 +900,47 @@ 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>
@@ -906,9 +951,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">15</property>
-                            <property name="max_width_chars">26</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" translatable="yes">C:0000,C:a1b2,etc.</property>
                             <signal name="changed" handler="on_cas_entry_changed" swapped="no"/>
                           </object>
@@ -933,7 +978,7 @@ Author: Dmitriy Yefremov
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -1011,7 +1056,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1037,7 +1082,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1116,7 +1161,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1154,7 +1199,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1181,7 +1226,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>
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1390,7 +1435,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>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1416,7 +1461,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>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1442,7 +1487,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>
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1568,7 +1613,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkImage" id="tr_edit_switch_image">
-                        <property name="visible">False</property>
+                        <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>
@@ -1628,7 +1673,6 @@ 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>

app/ui/service_details_dialog.py

@@ -1,3 +1,31 @@
+# -*- 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
 
@@ -8,9 +36,9 @@ from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag,
                                   TrType, SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, T_FEC,
                                   HIERARCHY, A_MODULATION)
 from app.settings import SettingsType
-from .dialogs import show_dialog, DialogType, Action, get_dialogs_string
+from .dialogs import show_dialog, DialogType, Action, get_builder
 from .main_helper import get_base_model
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, IS_GNOME_SESSION
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, CODED_ICON, Column
 
 _UI_PATH = UI_RESOURCES_PATH + "service_details_dialog.glade"
 
@@ -42,14 +70,12 @@ 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()}
 
-        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)
+        builder = get_builder(_UI_PATH, handlers, use_str=True)
         self._builder = builder
 
         self._dialog = builder.get_object("service_details_dialog")
@@ -72,6 +98,7 @@ 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")
@@ -107,6 +134,7 @@ 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")
@@ -247,6 +275,7 @@ 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)))
@@ -259,15 +288,19 @@ 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):
-                    pass
+                    extra_pids.append(pid)
                 elif pid.startswith(Pids.AUDIO_CHANNEL.value):
-                    pass
+                    extra_pids.append(pid)
                 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):
-                    pass
+                    extra_pids.append(pid)
+                else:
+                    extra_pids.append(pid)
+
+            self._extra_pids_entry.set_text(",".join(extra_pids))
 
     def init_enigma2_transponder_data(self, srv):
         """ Transponder data initialisation """
@@ -536,6 +569,9 @@ 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
@@ -695,6 +731,9 @@ 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)
@@ -727,6 +766,8 @@ 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):
@@ -874,10 +915,7 @@ class ServiceDetailsDialog:
 
 class TransponderServicesDialog:
     def __init__(self, transient, services_view, 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"))
+        builder = get_builder(_UI_PATH, use_str=True, objects=("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")

app/ui/settings_dialog.glade

@@ -142,7 +142,6 @@ 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>
     <signal name="response" handler="on_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="main_box">
@@ -1567,7 +1566,7 @@ Author: Dmitriy Yefremov
                                       <object class="GtkImage" id="edit_preset_switch_image">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="stock">gtk-edit</property>
+                                        <property name="icon_name">document-edit-symbolic</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2105,6 +2104,7 @@ Author: Dmitriy Yefremov
                                   <item id="tr_TR" translatable="yes">Türkçe</item>
                                   <item id="be_BY" translatable="yes">Беларуская</item>
                                   <item id="ru_RU" translatable="yes">Русский</item>
+                                  <item id="zh_CN" translatable="yes">漢語</item>
                                 </items>
                                 <signal name="changed" handler="on_lang_changed" swapped="no"/>
                               </object>
@@ -2676,7 +2676,7 @@ Author: Dmitriy Yefremov
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox" id="dark_mode_box">
-                                <property name="visible">True</property>
+                                <property name="visible">False</property>
                                 <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="dark_mode_label">

app/ui/settings_dialog.py

@@ -4,7 +4,7 @@ import re
 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
+from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog, get_builder
 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
 
@@ -64,9 +64,7 @@ class SettingsDialog:
         self._profiles = self._settings.profiles
         self._s_type = self._settings.setting_type
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "settings_dialog.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "settings_dialog.glade", handlers)
 
         self._dialog = builder.get_object("settings_dialog")
         self._dialog.set_transient_for(transient)
@@ -183,7 +181,7 @@ class SettingsDialog:
         self.init_profiles()
 
         if IS_WIN:
-            builder.get_object("streams_lib_frame").set_visible(False)
+            self._gst_lib_button.set_visible(False)
             # Themes
             enable_exp = self._settings.is_enable_experimental
             builder.get_object("style_frame").set_visible(enable_exp)
@@ -358,7 +356,6 @@ class SettingsDialog:
         self._ext_settings.list_font = self._list_font_button.get_font()
 
         if IS_WIN:
-            self._ext_settings.dark_mode = self._dark_mode_switch.get_active()
             self._ext_settings.alternate_layout = self._layout_switch.get_active()
             self._ext_settings.is_themes_support = self._themes_support_switch.get_active()
             self._ext_settings.theme = self._theme_combo_box.get_active_id()
@@ -796,7 +793,6 @@ class SettingsDialog:
 
     @run_idle
     def init_themes(self):
-        self._dark_mode_switch.set_active(self._ext_settings.dark_mode)
         t_support = self._ext_settings.is_themes_support
         self._themes_support_switch.set_active(t_support)
         if t_support:

app/ui/style.css

@@ -55,4 +55,11 @@ paned > separator {
   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;
+}

app/ui/transmitter.glade

@@ -42,7 +42,6 @@ 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,9 +5,10 @@ import gi
 from gi.repository import GLib
 
 from app.commons import log
-from app.settings import IS_WIN
 from app.connections import HttpAPI
+from app.settings import IS_WIN
 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
 
@@ -35,9 +36,7 @@ class LinksTransmitter:
         self._app_window = app_window
         self._is_status_icon = True
 
-        builder = Gtk.Builder()
-        builder.add_from_file(UI_RESOURCES_PATH + "transmitter.glade")
-        builder.connect_signals(handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "transmitter.glade", handlers)
 
         self._main_window = builder.get_object("main_window")
         self._url_entry = builder.get_object("url_entry")

app/ui/uicommons.py

@@ -1,3 +1,4 @@
+import locale
 import os
 from enum import Enum, IntEnum
 from functools import lru_cache
@@ -28,11 +29,11 @@ try:
 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")
-    st.set_property("gtk-application-prefer-dark-theme", settings.dark_mode)
 
     if settings.is_themes_support:
         st.set_property("gtk-theme-name", settings.theme)

po/be/demon-editor.po

@@ -1228,3 +1228,24 @@ msgstr "Памер пiконаў у спісах:"
 
 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/de/demon-editor.po

@@ -3,9 +3,10 @@
 #
 # Charly, 2019.
 # Dmitriy Yefremov, 2020-2021.
+# Thomas Schmidt, 2021
 msgid ""
 msgstr ""
-"Last-Translator: Thomas Schmidt\n"
+"Last-Translator: Dmitriy Yefremov\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1241,3 +1242,24 @@ 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/ru/demon-editor.po

@@ -1225,3 +1225,24 @@ 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,7 +3,7 @@ msgstr ""
 "Project-Id-Version: DemonEditor\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-16 15:59+0300\n"
-"PO-Revision-Date: 2021-02-22 23:53+0300\n"
+"PO-Revision-Date: 2021-06-13 14:54+0300\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1023,7 +1023,7 @@ msgid ""
 msgstr ""
 "Kaydedilmemiş değişiklikler var.\n"
 "\n"
-"\tŞimdi kaydedilsin mi?"
+"\t Şimdi kaydedilsin mi?"
 
 msgid ""
 "Are you sure you want to change the order\n"
@@ -1245,3 +1245,27 @@ 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!"