From b14e6fac160cea06a6d3ab7d18c882d4fa3f0d3b Mon Sep 17 00:00:00 2001 From: DYefremov Date: Fri, 25 Oct 2019 19:17:31 +0300 Subject: [PATCH] added edit and view to the app bar menu --- app/ui/app_menu_bar.ui | 38 +++++++++++++++--- app/ui/main_app_window.py | 38 +++++++++++------- .../locale/de/LC_MESSAGES/demon-editor.mo | Bin 13277 -> 0 bytes 3 files changed, 56 insertions(+), 20 deletions(-) delete mode 100644 deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo diff --git a/app/ui/app_menu_bar.ui b/app/ui/app_menu_bar.ui index 51c1cc09..931592d6 100644 --- a/app/ui/app_menu_bar.ui +++ b/app/ui/app_menu_bar.ui @@ -24,10 +24,25 @@ File
+ + Import +
+ + Bouquet + app.on_import_bouquet + + + Bouquets and services + app.on_import_bouquets + +
+ New empty configuration app.on_new_configuration +
+
Open app.on_data_open @@ -45,15 +60,28 @@
- Import + Edit +
+ + Lock + app.on_locked + + + Hide + app.on_hide + +
+ + + View
- Bouquet - app.on_import_bouquet + Search + win.search - Bouquets and services - app.on_import_bouquets + Filter + win.filter
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index fb755b94..afd7a49f 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -105,8 +105,6 @@ class Application(Gtk.Application): "on_view_press": self.on_view_press, "on_view_popup_menu": self.on_view_popup_menu, "on_view_focus": self.on_view_focus, - "on_hide": self.on_hide, - "on_locked": self.on_locked, "on_model_changed": self.on_model_changed, "on_import_yt_list": self.on_import_yt_list, "on_import_m3u": self.on_import_m3u, @@ -123,8 +121,6 @@ class Application(Gtk.Application): "on_remove_picon": self.on_remove_picon, "on_reference_picon": self.on_reference_picon, "on_remove_unused_picons": self.on_remove_unused_picons, - "on_filter_toggled": self.on_filter_toggled, - "on_search_toggled": self.on_search_toggled, "on_search_down": self.on_search_down, "on_search_up": self.on_search_up, "on_search": self.on_search, @@ -284,6 +280,17 @@ class Application(Gtk.Application): action = set_action(h, self._handlers.get(h), False) iptv_elem.bind_property("sensitive", action, "enabled") + # Search, Filter + search_action = Gio.SimpleAction.new_stateful("search", None, GLib.Variant.new_boolean(False)) + search_action.connect("change-state", self.on_search_toggled) + self._main_window.add_action(search_action) # For "win.*" actions! + filter_action = Gio.SimpleAction.new_stateful("filter", None, GLib.Variant.new_boolean(False)) + filter_action.connect("change-state", self.on_filter_toggled) + self._main_window.add_action(filter_action) + # Lock, Hide + self.add_action(set_action("on_hide", self.on_hide)) + self.add_action(set_action("on_locked", self.on_locked)) + builder = Gtk.Builder() builder.set_translation_domain("demon-editor") builder.add_from_file(UI_RESOURCES_PATH + "app_menu_bar.ui") @@ -1253,9 +1260,9 @@ class Application(Gtk.Application): elif ctrl and key is KeyboardKey.BACK_SPACE and model_name == self._SERVICE_LIST_NAME: self.on_to_fav_end_copy(view) elif ctrl and key is KeyboardKey.L: - self.on_locked(None) + self.on_locked() elif ctrl and key is KeyboardKey.H: - self.on_hide(None) + self.on_hide() elif ctrl and key is KeyboardKey.R or key is KeyboardKey.F2: self.on_rename(view) elif ctrl and key is KeyboardKey.E: @@ -1319,10 +1326,10 @@ class Application(Gtk.Application): for elem in self._FAV_ENIGMA_ELEMENTS: self._tool_elements[elem].set_sensitive(False) - def on_hide(self, item): + def on_hide(self, action=None, value=None): self.set_service_flags(Flag.HIDE) - def on_locked(self, item): + def on_locked(self, action=None, value=None): self.set_service_flags(Flag.LOCK) def set_service_flags(self, flag): @@ -1741,13 +1748,13 @@ class Application(Gtk.Application): # ***************** Filter and search *********************# - def on_filter_toggled(self, toggle_button: Gtk.ToggleToolButton): - active = toggle_button.get_active() - if active: + def on_filter_toggled(self, action, value): + action.set_state(value) + if value: self.update_filter_sat_positions() - self._filter_bar.set_search_mode(active) - self._filter_bar.set_visible(active) + self._filter_bar.set_search_mode(value) + self._filter_bar.set_visible(value) def init_sat_positions(self): self._sat_positions.clear() @@ -1823,8 +1830,9 @@ class Application(Gtk.Application): return txt and free - def on_search_toggled(self, toggle_button: Gtk.ToggleToolButton): - self._search_bar.set_search_mode(toggle_button.get_active()) + def on_search_toggled(self, action, value): + action.set_state(value) + self._search_bar.set_search_mode(value) def on_search_down(self, item): self._search_provider.on_search_down() diff --git a/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo b/deb/usr/share/locale/de/LC_MESSAGES/demon-editor.mo deleted file mode 100644 index 82d95096c1d9a23158fff3c59522da90b5fe9275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13277 zcmaKy3!EKQea8<7K_d?XK2VFERUV1S-2jTfqGFQWO(ILOW;cm~qO_AIqe8zzI>cgjd}Tr#vBbJcmiy|N5DDw zB>2kkd_B}BH^N83Tf_55AVr$H0uRGudHyOq2HqQZKRlJ^pFoxKn3H@tPl3v}7OMU; z;UnSm;p5{~{dm2YS-q#tx)4S1~txmpvt)n%04?#<5NKX%$0#Rzzsa# z0cG$11W~#9HI#l%IN2Efj14?La2Hg&XW-M}YoO}84XT_wp~|@js{a3gYTwVH+Wi}N zI#eNQ?-_v`q4anzRQ|n?rkDsyfAdiKer@0zq4e{1sQPY%YR8A5#{08ScJVE!dhUa& z|HmQyr|@i^e+$>cjZESSycCYYYoW&ZYw&6C0jP0W^JL$z0jTzz7M|Bb+5bi;eV+&U zGs7YM8Ib2XIy-U^lPMyUSW0@c2QQ2qZjRQ@kP<^L|E zDds+?cK!~Y22a3gsQ>3ceULx%06*%_8kC{@Plp

Vdfo!{{mt+!_HGg6O)_gvV@|?z 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