diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 0e0c4108..0ff98461 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -291,11 +291,10 @@ class Application(Gtk.Application): self._services_model_filter = builder.get_object("services_model_filter") self._services_model_filter.set_visible_func(self.services_filter_function) 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._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible") # Player self._player_box = builder.get_object("player_box") self._player_event_box = builder.get_object("player_event_box") @@ -317,8 +316,7 @@ class Application(Gtk.Application): # Record self._record_image = builder.get_object("record_button_image") # Search - self._search_bar = builder.get_object("search_bar") - self._search_bar.bind_property("search-mode-enabled", self._search_bar, "visible") + 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"), @@ -365,6 +363,10 @@ class Application(Gtk.Application): center_box.reorder_child(self._control_revealer, 1) center_box.reorder_child(builder.get_object("main_box"), 2) + builder.get_object("fs_box").set_child_packing(self._filter_box, False, True, 0, Gtk.PackType.END) + top_toolbar = builder.get_object("top_toolbar") + top_toolbar.set_child_packing(builder.get_object("toolbar_extra_box"), False, True, 0, Gtk.PackType.END) + services_box = self._main_paned.get_child1() self._main_paned.remove(services_box) self._main_paned.remove(self._fav_paned) @@ -1627,7 +1629,7 @@ 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 @@ -2966,7 +2968,7 @@ class Application(Gtk.Application): self._filter_entry.grab_focus() if value else self.on_filter_changed() self.filter_set_default() - self._filter_bar.set_search_mode(value) + self._filter_box.set_visible(value) @run_idle def filter_set_default(self): @@ -3027,7 +3029,7 @@ class Application(Gtk.Application): self._services_view.set_model(model) def services_filter_function(self, model, itr, data): - if not self._filter_bar.is_visible(): + if not self._filter_box.is_visible(): return True else: r_txt = str(model.get(itr, Column.SRV_SERVICE, Column.SRV_PACKAGE, Column.SRV_TYPE, Column.SRV_SSID, @@ -3067,7 +3069,7 @@ class Application(Gtk.Application): return True action.set_state(value) - self._search_bar.set_search_mode(value) + self._search_box.set_visible(value) if value: self._search_entry.grab_focus() else: diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index cc1cc3a9..54dacee1 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -1245,24 +1245,6 @@ Author: Dmitriy Yefremov center center expand - - - Search - True - True - True - Search - center - win.search - find_image - True - - - True - True - 0 - - Filter @@ -1278,7 +1260,25 @@ Author: Dmitriy Yefremov True True - 4 + 0 + + + + + Search + True + True + True + Search + center + win.search + find_image + True + + + True + True + 1 @@ -1296,7 +1296,7 @@ Author: Dmitriy Yefremov True True - 5 + 2 @@ -1314,7 +1314,7 @@ Author: Dmitriy Yefremov True True - 5 + 3 @@ -1736,92 +1736,17 @@ Author: Dmitriy Yefremov - - False - - - True - False - - - True - True - edit-find-symbolic - False - False - - - - False - True - 0 - - - - - True - False - False - True - half - - - - True - False - center - down - - - - - False - False - 1 - - - - - True - False - False - True - half - - - - True - False - center - up - - - - - False - False - 2 - - - - - - - - False - True - 1 - - - - + + True False + 10 + 10 + 10 - True False + 5 + 5 Only free @@ -1899,12 +1824,93 @@ Author: Dmitriy Yefremov + + False + True + 0 + + + + + False + 5 + 5 + + + True + True + edit-find-symbolic + False + False + + + + False + True + 0 + + + + + True + False + False + True + half + + + + True + False + center + down + + + + + False + False + 1 + + + + + True + False + False + True + half + + + + True + False + center + up + + + + + False + False + 2 + + + + + + False + True + 1 + False True - 2 + 3 @@ -2556,364 +2562,364 @@ Author: Dmitriy Yefremov - True - False - 2 - vertical - 2 - - True False - in + 2 + vertical + 2 - + True - True - fav_list_store - False - 2 - True - both - 9 - True - - - - - - - - - - - - - - - multiple - - + False + in - - True - 25 - Num - True - 0.5 - - - - 0.49000000953674316 - 5 - 5 + + True + True + fav_list_store + False + 2 + True + both + 9 + True + + + + + + + + + + + + + + + multiple - - 10 - 0 - 0 - - - - - - True - 50 - Service - True - True - 0.5 - - - 2 + + True + 25 + Num + True + 0.5 + + + + 0.49000000953674316 + 5 + 5 + + + 10 + 0 + 0 + + - - 10 - 8 - - - 2 + + True + 50 + Service + True + True + 0.5 + + + + 2 + + + 10 + 8 + + + + + 2 + + + 10 + 1 + + + + + end + 25 + + + 10 + 2 + + + + + 2 + + + 10 + 3 + + + + + 2 + + + 10 + 4 + + - - 10 - 1 - - - end - 25 + + True + 25 + Type + True + True + 0.5 + + + + 0.50999999046325684 + + + 10 + 5 + + - - 10 - 2 - - - 2 + + 25 + Pos + True + True + 0.5 + + + + 0.50999999046325684 + + + 10 + 6 + + - - 10 - 3 - - - 2 + + False + fav_id + + + + 7 + + - - 10 - 4 - - - - - - True - 25 - Type - True - True - 0.5 - - - 0.50999999046325684 + + False + extra + + + + 9 + + + + + - - 10 - 5 - - - - - - - 25 - Pos - True - True - 0.5 - - - - 0.50999999046325684 - - - 10 - 6 - - - - - - - False - fav_id - - - - 7 - - - - - - - False - extra - - - - 9 - - - - + + True + True + 0 + - - - True - True - 0 - - - - - False - slide-up - - 200 - True + False - vertical - 2 + slide-up - + + 200 True False - Alternatives - - - - - - False - True - 0 - - - - - True - True - in + vertical + 2 - + + True + False + Alternatives + + + + + + False + True + 0 + + + + True True - alt_list_store - False - True - both - True - - - - - - - - multiple - - + in - - 25 - Num - 0.5 + + True + True + alt_list_store + False + True + both + True + + + + + + + + multiple + + - + + 25 + Num + 0.5 + + 0.49000000953674316 5 5 - - + + 0 - + + + - - - - - True - 50 - Service - True - 0.5 - + + True + 50 + Service + True + 0.5 + + 2 - - + + 1 - - - - + + + + 0.10000000149011612 - - + + 2 - - - - - - - True - Type - True - 0.5 - - - 0.50999999046325684 + + - + + + + True + Type + True + 0.5 + + + 0.50999999046325684 + + 3 - - - - - - - 25 - Pos - 0.5 - - - 0.50999999046325684 + + - + + + + 25 + Pos + 0.5 + + + 0.50999999046325684 + + 4 - + + + - - - - - False - ID - - + + False + ID + + + 5 - - - - - + + + + + 6 - - - - - + + + + + 7 - + + + + + True + True + 1 + - - True - True - 1 - + + False + True + 1 + - - False - True - 1 - - - True True