From d2272e57157221a50428119ee736a5657cb7b3ab Mon Sep 17 00:00:00 2001 From: DYefremov Date: Fri, 7 Sep 2018 23:10:48 +0300 Subject: [PATCH] redesign of GUI of the picons dialog --- app/ui/main_app_window.py | 5 - app/ui/picons_dialog.glade | 1120 +++++++++++++++++++---------------- app/ui/picons_downloader.py | 24 +- 3 files changed, 610 insertions(+), 539 deletions(-) diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 4c72b288..54396051 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -145,9 +145,7 @@ class MainAppWindow: self._blacklist = set() self._current_bq_name = None # Player - self._iptv_preview_mode = False self._player = None - self._is_played = False self._full_screen = False self._drawing_area_xid = None @@ -1040,21 +1038,18 @@ class MainAppWindow: return self._player.set_mrl(url) - self._is_played = True self._player.play() GLib.idle_add(self.on_player_size_allocate, self._player_drawing_area, priority=GLib.PRIORITY_LOW) def on_player_stop(self, item=None): if self._player: self._player.stop() - self._is_played = False self.on_player_size_allocate(self._player_drawing_area) @run_idle def on_player_close(self, item=None): if self._player: self._player.stop() - self._is_played = False self._player.release() self._player = None GLib.idle_add(self._player_box.set_visible, False, priority=GLib.PRIORITY_LOW) diff --git a/app/ui/picons_dialog.glade b/app/ui/picons_dialog.glade index 02f25857..a73d1349 100644 --- a/app/ui/picons_dialog.glade +++ b/app/ui/picons_dialog.glade @@ -1,8 +1,58 @@ - + - + + + + + + + True + False + gtk-goto-bottom + + + True + False + network-server-symbolic + + + True + False + gtk-goto-top + + + True + False + gtk-execute + @@ -21,14 +71,169 @@ False - Picons download tool False True True emblem-photos dialog - - + + + + True + False + 2 + True + + + True + False + True + vertical + + + True + False + 5 + Picons download tool + + + True + True + 0 + + + + + True + False + 2 + + + gtk-cancel + True + True + True + Cancel + True + True + + + + False + True + 0 + + + + + True + False + + + + + + False + True + 1 + + + + + Load providers + True + False + False + False + Load satellite providers. + center + image2 + True + + + + False + True + 2 + + + + + Receive picons + True + False + False + False + Receive picons for providers + center + image1 + True + + + + False + True + 3 + + + + + Convert + False + False + center + image4 + True + + + False + True + end + 3 + + + + + Send + True + True + True + Transfer to receiver + image3 + True + + + + False + True + end + 4 + + + + + True + False + + + + + + False + True + 6 + + + + + False + True + 1 + + + + + @@ -45,22 +250,6 @@ 2 True spread - - - gtk-close - True - True - True - True - True - - - - True - True - 0 - - True @@ -69,269 +258,7 @@ - - True - False - 2 - True - - - True - True - network-transmit-receive-symbolic - - - 0 - 1 - - - - - True - True - - - 1 - 1 - - - - - True - False - Receiver IP: - - - 0 - 0 - - - - - True - False - Receiver picons path: - - - 1 - 0 - - - - - False - True - 0 - - - - - True - False - Current picons path: - 0.019999999552965164 - - - False - True - 1 - - - - - True - True - folder-open-symbolic - False - - - - False - True - 2 - - - - - True - False - 2 - - - True - False - vertical - - - True - False - Picons name format: - - - False - True - 0 - - - - - True - False - 5 - - - Enigma2 (default) - True - True - False - 0 - True - True - neutrino_mp_radio_button - - - False - True - 0 - - - - - Neutrino-MP - True - True - False - 0 - True - True - enigma2_radio_button - - - False - True - 1 - - - - - False - True - 1 - - - - - 0 - 0 - - - - - True - False - vertical - - - True - False - Resize: - - - False - True - 0 - - - - - True - False - - - No(default) - True - True - False - 0 - True - True - resize_100_60_radio_button - - - False - True - 0 - - - - - 220x132 - True - True - False - 0 - True - True - resize_100_60_radio_button - - - False - True - 1 - - - - - 100x60 - True - True - False - 0 - True - True - resize_no_radio_button - - - False - True - 2 - - - - - False - True - 1 - - - - - 2 - 0 - - - - - True - False - 5 - 5 - vertical - - - 1 - 0 - - - - - - False - False - 3 - + @@ -353,35 +280,245 @@ True False + 5 + 5 + 2 + 2 vertical - 1 + 2 - - 24 + True False - Satellite url (www.lyngsat.com): - 0.019999999552965164 - - - - False - True - 1 - 0 - - - - - True - True - network-workgroup-symbolic - False - https://www.lyngsat.com/*satellite*.html - url - + 5 + 0.039999999105930328 + in + + + True + False + vertical + 2 + + + True + True + 5 + 5 + 2 + network-workgroup-symbolic + False + https://www.lyngsat.com/*satellite*.html + url + + + + False + True + 0 + + + + + 150 + True + True + 5 + 5 + 2 + out + + + True + True + True + providers_list_store + + + + + + 15 + Providers + True + 0.5 + + + + 0 + + + + + + 1 + + + + + + + autosize + Position + + + 0.50999999046325684 + True + + + + 2 + + + + + + + False + Url + + + + 3 + + + + + + + False + ONID + + + + 4 + + + + + + + Selected + + + + + + 5 + + + + + + + + + True + True + 1 + + + + + True + False + 5 + 5 + 2 + 2 + 2 + True + + + True + True + network-transmit-receive-symbolic + + + 0 + 1 + + + + + True + True + + + 1 + 1 + + + + + True + False + Receiver IP: + 0.05000000074505806 + + + 0 + 0 + + + + + True + False + Receiver picons path: + 0.05000000074505806 + + + 1 + 0 + + + + + False + True + 2 + + + + + True + False + Current picons path: + 0.019999999552965164 + + + False + True + 3 + + + + + True + True + 5 + 5 + 5 + folder-open-symbolic + False + + + + False + True + 4 + + + + + + + True + False + Satellite url (www.lyngsat.com): + + False @@ -390,100 +527,174 @@ - - 150 + True - True - out + False + 2 + 2 + True - + True - True - True - providers_list_store - - - + False + 0.05000000074505806 + in - - 15 - Providers - True - 0.5 + + True + False + vertical - - - 0 - - - - - - 1 - - - - - - - autosize - Position - - - 0.50999999046325684 - True - + + True + False + center + 5 + + + Enigma2 (default) + True + True + False + True + True + neutrino_mp_radio_button + + + False + True + 0 + + + + + Neutrino-MP + True + True + False + True + True + enigma2_radio_button + + + False + True + 1 + + - - 2 - + + False + True + 1 + - - - False - Url - - - - 3 - - - - - - - False - ONID - - - - 4 - - - - - - - Selected - - - - - - 5 - - + + + True + False + Picons name format: + + 0 + 0 + + + + + True + False + 0.05000000074505806 + in + + + True + False + vertical + + + True + False + center + + + No(default) + True + True + False + True + True + resize_100_60_radio_button + + + False + True + 0 + + + + + 220x132 + True + True + False + True + True + resize_100_60_radio_button + + + False + True + 1 + + + + + 100x60 + True + True + False + True + True + resize_no_radio_button + + + False + True + 2 + + + + + False + True + 1 + + + + + + + True + False + Resize: + + + + + 1 + 0 + - True + False True - 2 + 4 @@ -608,129 +819,6 @@ 8 - - - True - False - - - False - True - 10 - - - - - True - False - False - - - True - False - Cancel - True - gtk-cancel - - - - False - True - - - - - True - False - - - False - False - - - - - False - True - Convert - True - gtk-execute - - - - True - True - - - - - True - False - False - Receive picons for providers - True - Receive picons - True - go-bottom - - - - True - True - - - - - True - False - False - Load satellite providers. - True - Load providers - True - network-server-symbolic - - - - True - True - - - - - True - False - - - False - False - - - - - True - False - Transfer to receiver - Send - True - go-top - - - - False - True - - - - - - False - True - 11 - - True @@ -822,18 +910,6 @@ 14 - - - True - False - - - False - True - 2 - 15 - - diff --git a/app/ui/picons_downloader.py b/app/ui/picons_downloader.py index bc891204..c8bcfd19 100644 --- a/app/ui/picons_downloader.py +++ b/app/ui/picons_downloader.py @@ -38,9 +38,9 @@ class PiconsDialog: builder = Gtk.Builder() builder.set_translation_domain(TEXT_DOMAIN) - builder.add_objects_from_file(UI_RESOURCES_PATH + "picons_dialog.glade", - ("picons_dialog", "receive_image", "providers_list_store")) + builder.add_from_file(UI_RESOURCES_PATH + "picons_dialog.glade") builder.connect_signals(handlers) + self._dialog = builder.get_object("picons_dialog") self._dialog.set_transient_for(transient) self._providers_tree_view = builder.get_object("providers_tree_view") @@ -54,12 +54,12 @@ class PiconsDialog: self._info_bar = builder.get_object("info_bar") self._info_bar = builder.get_object("info_bar") self._message_label = builder.get_object("info_bar_message_label") - self._load_providers_tool_button = builder.get_object("load_providers_tool_button") - self._receive_tool_button = builder.get_object("receive_tool_button") - self._convert_tool_button = builder.get_object("convert_tool_button") + self._load_providers_button = builder.get_object("load_providers_button") + self._receive_button = builder.get_object("receive_button") + self._convert_button = builder.get_object("convert_button") self._enigma2_path_button = builder.get_object("enigma2_path_button") self._save_to_button = builder.get_object("save_to_button") - self._send_tool_button = builder.get_object("send_tool_button") + self._send_button = builder.get_object("send_button") self._enigma2_radio_button = builder.get_object("enigma2_radio_button") self._neutrino_mp_radio_button = builder.get_object("neutrino_mp_radio_button") self._resize_no_radio_button = builder.get_object("resize_no_radio_button") @@ -234,7 +234,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_tool_button.set_sensitive(suit if suit else False) + self._load_providers_button.set_sensitive(suit if suit else False) def on_position_edited(self, render, path, value): model = self._providers_tree_view.get_model() @@ -242,10 +242,10 @@ class PiconsDialog: @run_idle def on_notebook_switch_page(self, nb, box, tab_num): - self._load_providers_tool_button.set_visible(not tab_num) - self._receive_tool_button.set_visible(not tab_num) - self._convert_tool_button.set_visible(tab_num) - self._send_tool_button.set_sensitive(not tab_num) + self._load_providers_button.set_visible(not tab_num) + self._receive_button.set_visible(not tab_num) + self._convert_button.set_visible(tab_num) + self._send_button.set_visible(not tab_num) if self._enigma2_path_button.get_filename() is None: self._enigma2_path_button.set_current_folder(self._enigma2_picons_path) @@ -270,7 +270,7 @@ class PiconsDialog: @run_idle def update_receive_button_state(self): - self._receive_tool_button.set_sensitive(len(self.get_selected_providers()) > 0) + self._receive_button.set_sensitive(len(self.get_selected_providers()) > 0) def get_selected_providers(self): """ returns selected providers """