From 5902b207e16df972fc9a7ee57d660ceb037f8736 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Fri, 3 Sep 2021 18:09:26 +0300 Subject: [PATCH] moved iptv menu --- app/ui/app_menu.ui | 112 +++++++++++++++------------------------------ app/ui/main.glade | 18 ++++---- app/ui/main.py | 20 ++++---- 3 files changed, 59 insertions(+), 91 deletions(-) diff --git a/app/ui/app_menu.ui b/app/ui/app_menu.ui index 7ef2da71..fceede22 100644 --- a/app/ui/app_menu.ui +++ b/app/ui/app_menu.ui @@ -132,43 +132,6 @@
- - IPTV - app.hide_menu_bar - action-disabled - - Add IPTV or stream service - app.on_iptv - - - Import YouTube playlist - app.on_import_yt_list - - - Import m3u - app.on_import_m3u - - - Export to m3u - app.on_export_to_m3u - -
- - EPG configuration - app.on_epg_list_configuration - - - List configuration - app.on_iptv_list_configuration - -
-
- - Remove all unavailable - app.on_remove_all_unavailable - -
- FTP client app.show_ftp_menu @@ -293,6 +256,10 @@ Picons app.show_picons + + EPG + app.show_epg + Timers app.show_timers @@ -324,43 +291,6 @@
- - IPTV - app.hide_menu_bar - action-disabled - - Add IPTV or stream service - app.on_iptv - - - Import YouTube playlist - app.on_import_yt_list - - - Import m3u - app.on_import_m3u - - - Export to m3u - app.on_export_to_m3u - -
- - EPG configuration - app.on_epg_list_configuration - - - List configuration - app.on_iptv_list_configuration - -
-
- - Remove all unavailable - app.on_remove_all_unavailable - -
- FTP client app.show_ftp_menu @@ -371,4 +301,38 @@ + + + Add IPTV or stream service + app.on_iptv + + + Import YouTube playlist + app.on_import_yt_list + + + Import m3u + app.on_import_m3u + + + Export to m3u + app.on_export_to_m3u + +
+ + EPG configuration + app.on_epg_list_configuration + + + List configuration + app.on_iptv_list_configuration + +
+
+ + Remove all unavailable + app.on_remove_all_unavailable + +
+ \ No newline at end of file diff --git a/app/ui/main.glade b/app/ui/main.glade index 788368bd..d0478200 100644 --- a/app/ui/main.glade +++ b/app/ui/main.glade @@ -2509,7 +2509,7 @@ Author: Dmitriy Yefremov True False - True + False True Import m3u file @@ -2531,7 +2531,7 @@ Author: Dmitriy Yefremov True False - True + False True Export to m3u @@ -2550,18 +2550,18 @@ Author: Dmitriy Yefremov - + True False - True + False + False True - EPG configuration - + IPTV - + True False - insert-text-symbolic + network-wired-symbolic @@ -3065,7 +3065,7 @@ Author: Dmitriy Yefremov True False - True + False True New bouquet diff --git a/app/ui/main.py b/app/ui/main.py index ea53ad84..658b2fc1 100644 --- a/app/ui/main.py +++ b/app/ui/main.py @@ -98,11 +98,10 @@ class Application(Gtk.Application): _COMMONS_ELEMENTS = ("bouquets_remove_popup_item", "fav_remove_popup_item", "import_bq_menu_button") - _FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item", "fav_epg_configuration_popup_item", - "epg_configuration_header_button") + _FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item", "fav_epg_configuration_popup_item") _FAV_IPTV_ELEMENTS = ("fav_iptv_popup_item", "import_m3u_header_button", "export_to_m3u_header_button", - "epg_configuration_header_button") + "iptv_menu_button") _LOCK_HIDE_ELEMENTS = ("locked_tool_button", "hide_tool_button") @@ -282,11 +281,8 @@ class Application(Gtk.Application): self._fav_model = builder.get_object("fav_list_store") self._services_model = builder.get_object("services_list_store") self._bouquets_model = builder.get_object("bouquets_tree_store") - self._status_bar_box = builder.get_object("status_bar_box") - self._services_main_box = builder.get_object("services_main_box") - self._bouquets_main_box = builder.get_object("bouquets_main_box") - self._header_bar = builder.get_object("header_bar") self._bq_name_label = builder.get_object("bq_name_label") + self._iptv_menu_button = builder.get_object("iptv_menu_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) # App info @@ -295,7 +291,8 @@ class Application(Gtk.Application): # Info bar. self._info_bar = builder.get_object("info_bar") self._info_label = builder.get_object("info_label") - # Status bar + # Status bar. + self._status_bar_box = builder.get_object("status_bar_box") self._profile_combo_box = builder.get_object("profile_combo_box") self._receiver_info_box = builder.get_object("receiver_info_box") self._receiver_info_label = builder.get_object("receiver_info_label") @@ -430,6 +427,13 @@ class Application(Gtk.Application): view_button.set_tooltip_text(get_message("View")) self._main_window.get_titlebar().pack_end(view_button) + # IPTV menu. + self._iptv_menu_button.set_menu_model(builder.get_object("iptv_menu")) + iptv_elem = self._tool_elements.get("fav_iptv_popup_item") + for h in (self.on_iptv, self.on_import_yt_list, self.on_import_m3u, self.on_export_to_m3u, + self.on_epg_list_configuration, self.on_iptv_list_configuration, self.on_remove_all_unavailable): + iptv_elem.bind_property("sensitive", self.set_action(h.__name__, h, False), "enabled") + self.init_actions() self.set_accels()