From fdd30b2ac9da011884abf29c60ed1cc57cc826ad Mon Sep 17 00:00:00 2001 From: DYefremov Date: Tue, 23 Jul 2019 10:47:01 +0300 Subject: [PATCH] hiding header items during playback --- app/ui/main_app_window.py | 27 +-- app/ui/main_window.glade | 443 +++++++++++++++++++++----------------- 2 files changed, 256 insertions(+), 214 deletions(-) diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index b3ff019e..b2517dde 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -200,17 +200,9 @@ class Application(Gtk.Application): self._services_model = builder.get_object("services_list_store") self._bouquets_model = builder.get_object("bouquets_tree_store") self._main_data_box = builder.get_object("main_data_box") - self._player_drawing_area = builder.get_object("player_drawing_area") - self._player_box = builder.get_object("player_box") - 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._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") - # Enabling events for the drawing area - self._player_drawing_area.set_events(Gdk.ModifierType.BUTTON1_MASK) - self._player_frame = builder.get_object("player_frame") self._header_bar = builder.get_object("header_bar") self._bq_name_label = builder.get_object("bq_name_label") # Status bar @@ -244,6 +236,21 @@ class Application(Gtk.Application): self._filter_types_model = builder.get_object("filter_types_list_store") self._filter_sat_positions_model = builder.get_object("filter_sat_positions_list_store") self._filter_only_free_button = builder.get_object("filter_only_free_button") + # Player + self._player_box = builder.get_object("player_box") + self._player_drawing_area = builder.get_object("player_drawing_area") + 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._services_main_box, "visible", 4) + self._player_box.bind_property("visible", self._bouquets_main_box, "visible", 4) + self._player_box.bind_property("visible", builder.get_object("close_player_menu_button"), "visible") + self._player_box.bind_property("visible", builder.get_object("left_header_box"), "visible", 4) + self._player_box.bind_property("visible", builder.get_object("right_header_box"), "visible", 4) + self._player_box.bind_property("visible", builder.get_object("main_popover_menu_box"), "visible", 4) + # Enabling events for the drawing area + self._player_drawing_area.set_events(Gdk.ModifierType.BUTTON1_MASK) + self._player_frame = builder.get_object("player_frame") # Search self._search_bar = builder.get_object("search_bar") self._search_provider = SearchProvider((self._services_view, self._fav_view, self._bouquets_view), @@ -1483,8 +1490,6 @@ class Application(Gtk.Application): else: if self._drawing_area_xid: self._player.set_xwindow(self._drawing_area_xid) - self._services_main_box.set_visible(False) - self._bouquets_main_box.set_visible(False) w, h = self._main_window.get_size() self._player_box.set_size_request(w * 0.6, -1) @@ -1522,8 +1527,6 @@ class Application(Gtk.Application): self._player.release() self._player = None GLib.idle_add(self._player_box.set_visible, False, priority=GLib.PRIORITY_LOW) - GLib.idle_add(self._services_main_box.set_visible, True, priority=GLib.PRIORITY_LOW) - GLib.idle_add(self._bouquets_main_box.set_visible, True, priority=GLib.PRIORITY_LOW) def on_drawing_area_realize(self, widget): self._drawing_area_xid = widget.get_window().get_xid() diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index cbe3b705..c20b8f27 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -313,179 +313,6 @@ Author: Dmitriy Yefremov False - - - True - False - 10 - 10 - 5 - 5 - vertical - 2 - - - True - True - True - Import - submenu1 - - - False - True - 0 - - - - - True - True - True - New empty configuration - - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - True - True - True - Open - - - - False - True - 3 - - - - - True - True - True - Save - - - - False - True - 4 - - - - - True - False - - - False - True - 2 - 5 - - - - - True - True - True - FTP-transfer - - - - False - True - 6 - - - - - True - False - - - False - True - 7 - - - - - True - True - True - Settings - - - - True - True - 8 - - - - - True - False - - - False - True - 9 - - - - - True - True - True - About - - - - True - True - 10 - - - - - True - True - True - Exit - - - - False - True - 11 - - - - - main - 1 - - True @@ -553,6 +380,218 @@ Author: Dmitriy Yefremov submenu1 + 1 + + + + + True + False + 10 + 10 + 5 + 5 + vertical + + + True + False + vertical + 2 + + + True + True + True + Import + submenu1 + + + False + True + 2 + + + + + True + True + True + New empty configuration + + + + False + True + 3 + + + + + True + False + + + False + True + 4 + + + + + True + True + True + Open + + + + False + True + 5 + + + + + True + True + True + Save + + + + False + True + 6 + + + + + True + False + + + False + True + 2 + 7 + + + + + True + True + True + FTP-transfer + + + + False + True + 8 + + + + + True + False + + + False + True + 9 + + + + + True + True + True + 2 + Settings + + + + True + True + 10 + + + + + False + True + 9 + + + + + True + False + vertical + 2 + + + True + True + Close player + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + True + About + + + + True + True + 2 + + + + + True + True + True + Exit + + + + False + True + 3 + + + + + False + True + 12 + + + + + main 2 @@ -930,30 +969,26 @@ Author: Dmitriy Yefremov Profile: 1 True + + + True + False + True + left_header_popover_menu + + + True + False + find-location-symbolic + + + + True False - - - True - False - True - left_header_popover_menu - - - True - False - find-location-symbolic - - - - - False - True - 0 - - + 1 True @@ -963,7 +998,7 @@ Author: Dmitriy Yefremov False True 2 - 1 + 0 @@ -984,7 +1019,7 @@ Author: Dmitriy Yefremov False True - 2 + 1 @@ -1005,7 +1040,7 @@ Author: Dmitriy Yefremov False True - 3 + 2 @@ -1017,7 +1052,7 @@ Author: Dmitriy Yefremov False True 2 - 4 + 3 @@ -1038,7 +1073,7 @@ Author: Dmitriy Yefremov False True - 5 + 4 @@ -1059,7 +1094,7 @@ Author: Dmitriy Yefremov False True - 6 + 5 @@ -1071,7 +1106,7 @@ Author: Dmitriy Yefremov False True 1 - 7 + 6 @@ -1093,7 +1128,7 @@ Author: Dmitriy Yefremov False True - 10 + 7 @@ -1115,15 +1150,19 @@ Author: Dmitriy Yefremov False True - 11 + 8 + + 2 + True False + 1 True