diff --git a/app/ftp.py b/app/ftp.py index 8dc43693..68c257cc 100644 --- a/app/ftp.py +++ b/app/ftp.py @@ -7,7 +7,7 @@ from telnetlib import Telnet from urllib.error import HTTPError from urllib.request import Request, urlopen -from app.commons import log, run_task +from app.commons import log from app.properties import Profile __DATA_FILES_LIST = ("tv", "radio", "lamedb", "lamedb5", "blacklist", "whitelist", # enigma 2 diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index 1814062b..7fb487fe 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -74,388 +74,6 @@ Author: Dmitriy Yefremov - - 320 - False - False - True - 320 - True - mail-send-receive - dialog - - - True - False - 2 - - - 85 - True - True - True - Receive - - - - True - False - gtk-goto-bottom - - - - - - - True - False - FTP-transfer - - - - - 85 - True - True - True - Send - - - - True - False - gtk-goto-top - - - - - end - 1 - - - - - - cancel_download_dialog_button - - - - 320 - False - vertical - 2 - - - False - end - - - gtk-close - True - True - True - True - - - True - True - 0 - - - - - False - False - 0 - - - - - True - False - 2 - 2 - vertical - 2 - - - True - False - Receive - 2 - True - - - True - False - 5 - Receiver IP: - 0 - - - 0 - 0 - - - - - True - True - False - 10 - 127.0.0.1 - False - network-transmit-receive-symbolic - - - 0 - 1 - - - - - True - False - 5 - Current data path: - 0 - - - 1 - 0 - - - - - True - True - False - data/ - False - folder-open-symbolic - - - 1 - 1 - - - - - True - True - 0 - - - - - True - False - 0.019999999552965164 - in - - - True - False - 5 - 5 - - - True - False - 0 - - - False - True - 0 - - - - - All - True - True - False - True - True - satellites_radio_button - - - False - True - 1 - - - - - Bouquets - True - True - False - True - satellites_radio_button - - - False - True - 2 - - - - - Satellites - True - True - False - True - all_radio_button - - - False - True - 3 - - - - - WebTV - True - False - True - True - all_radio_button - - - False - True - 4 - - - - - - - True - False - Data: - - - - - False - True - 1 - - - - - True - False - - - Remove unused bouquets - True - True - False - 2 - True - True - - - False - True - 0 - - - - - - - - False - True - 3 - - - - - True - False - - - False - True - 4 - - - - - False - True - - - - False - expand - - - - - - False - False - 0 - - - - - False - 16 - - - - - - True - False - Info - - - False - True - 1 - - - - - - - - False - False - 0 - - - - - False - True - 5 - - - - - True - True - 1 - - - - - - cancel_download_dialog_button - - 320 False diff --git a/app/ui/download_dialog.glade b/app/ui/download_dialog.glade new file mode 100644 index 00000000..1e40ba87 --- /dev/null +++ b/app/ui/download_dialog.glade @@ -0,0 +1,409 @@ + + + + + + + + + + + 480 + False + False + True + True + mail-send-receive + dialog + + + True + False + FTP-transfer + 2 + + + 85 + True + True + True + Receive + + + + True + False + gtk-goto-bottom + + + + + + + 85 + True + True + True + Send + + + + True + False + gtk-goto-top + + + + + end + 1 + + + + + + cancel_download_dialog_button + + + + False + 2 + 2 + vertical + 2 + + + False + end + + + gtk-close + True + True + True + True + + + True + True + 0 + + + + + False + False + 0 + + + + + True + False + vertical + 2 + + + True + False + 0.019999999552965164 + in + + + True + False + Receive + 5 + 5 + 5 + 5 + True + + + True + False + Receiver IP: + 0 + + + 0 + 0 + + + + + True + True + False + 10 + 127.0.0.1 + False + network-transmit-receive-symbolic + + + 0 + 1 + + + + + True + False + Current data path: + 0 + + + 1 + 0 + + + + + True + True + False + data/ + False + folder-open-symbolic + + + 1 + 1 + + + + + + + True + False + Current settings: + + + + + True + True + 0 + + + + + True + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 0 + + + False + True + 0 + + + + + All + True + True + False + True + satellites_radio_button + + + False + True + 1 + + + + + Bouquets + True + True + False + True + satellites_radio_button + + + False + True + 2 + + + + + Satellites + True + True + False + True + all_radio_button + + + False + True + 3 + + + + + WebTV + True + False + True + all_radio_button + + + False + True + 4 + + + + + + + True + False + Data: + + + + + False + True + 1 + + + + + True + False + + + Remove unused bouquets + True + True + False + True + True + + + False + True + 0 + + + + + + + + False + True + 3 + + + + + False + True + + + + False + True + expand + + + + + + False + False + 0 + + + + + False + 16 + + + True + False + Info + + + False + True + 1 + + + + + False + False + 0 + + + + + False + True + 5 + + + + + True + True + 1 + + + + + + cancel_download_dialog_button + + + diff --git a/app/ui/download_dialog.py b/app/ui/download_dialog.py index 2fa162e4..20229032 100644 --- a/app/ui/download_dialog.py +++ b/app/ui/download_dialog.py @@ -19,7 +19,7 @@ class DownloadDialog: builder = Gtk.Builder() builder.set_translation_domain(TEXT_DOMAIN) - builder.add_objects_from_file(UI_RESOURCES_PATH + "dialogs.glade", ("download_dialog",)) + builder.add_from_file(UI_RESOURCES_PATH + "download_dialog.glade") builder.connect_signals(handlers) self._dialog = builder.get_object("download_dialog")