diff --git a/app/ui/epg/dialog.glade b/app/ui/epg/dialog.glade index 569eac83..371eeeb9 100644 --- a/app/ui/epg/dialog.glade +++ b/app/ui/epg/dialog.glade @@ -72,32 +72,6 @@ Author: Dmitriy Yefremov - - True - False - gtk-copy - - - True - False - - - Copy reference - True - False - copy_image - False - - - - - - - True - False - edit-find-replace-symbolic - 1 - True False @@ -112,18 +86,16 @@ Author: Dmitriy Yefremov True False - + Assign True False - insert_link_image - False - + True False @@ -210,12 +182,6 @@ Author: Dmitriy Yefremov - - True - False - document-save-as-symbolic - 1 - @@ -651,6 +617,19 @@ Author: Dmitriy Yefremov + + True + False + + + True + False + Copy reference + + + + + True False @@ -707,40 +686,6 @@ Author: Dmitriy Yefremov True False expand - - - Auto - True - True - True - Auto configuration by service names. - auto_config_image - True - - - - False - True - 0 - - - - - Save - True - True - True - Save list to xml. - save_to_xml_image - True - - - - False - True - 1 - - True @@ -788,6 +733,9 @@ Author: Dmitriy Yefremov 2 + + + False @@ -835,25 +783,6 @@ Author: Dmitriy Yefremov 1 - - - Filter - True - True - True - True - Filter - filter_image - True - - - - - False - True - 2 - - False @@ -878,106 +807,6 @@ Author: Dmitriy Yefremov 0 - - - False - 2 - 2 - 5 - - - True - False - 5 - 5 - - - True - True - edit-find-replace-symbolic - False - False - - - - False - True - 0 - - - - - 50 - True - True - False - True - filter_satellite_popover - - - True - False - Pos - - - - - False - True - 1 - - - - - - False - True - 3 - - - - - filter_switch - True - True - Automatically set the name selected in the bouquet list. - center - 15 - - - False - True - end - 0 - - - - - filter_auto_label - True - False - center - Auto - - - False - True - end - 1 - - - - - - - - False - True - 1 - - True @@ -987,7 +816,9 @@ Author: Dmitriy Yefremov 5 5 5 + True True + True @@ -1005,12 +836,132 @@ Author: Dmitriy Yefremov False 10 10 - 10 + 5 vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + + + True + True + True + True + Filter + True + + + + True + False + edit-find-replace-symbolic + 1 + + + + + + False + True + 0 + + + + + False + True + 0 + + + + + False + 5 + + + True + False + 5 + 5 + + + True + True + edit-find-replace-symbolic + False + False + + + + False + True + 0 + + + + + 50 + True + True + False + True + filter_satellite_popover + + + True + False + Pos + + + + + False + True + 1 + + + + + Auto + True + True + True + Automatically set the name selected in the bouquet list. + + + False + True + 2 + + + + + + False + True + 2 + + + + + False + True + 1 + + True True + 5 in @@ -1026,6 +977,9 @@ Author: Dmitriy Yefremov + + + True @@ -1088,7 +1042,7 @@ Author: Dmitriy Yefremov True True - 1 + 2 @@ -1192,7 +1146,7 @@ Author: Dmitriy Yefremov False True - 2 + 3 @@ -1236,12 +1190,69 @@ Author: Dmitriy Yefremov False 10 10 - 10 + 5 vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + + + Auto + True + True + True + Auto configuration by service names. + auto_config_image + True + + + + False + True + 0 + + + + + True + True + True + Save list to xml. + True + + + + True + False + document-save-as-symbolic + 1 + + + + + False + True + 1 + + + + + False + True + 0 + + True True + 5 in @@ -1256,6 +1267,9 @@ Author: Dmitriy Yefremov + + + True diff --git a/app/ui/epg/epg.py b/app/ui/epg/epg.py index 8b9f2d06..7ea3deb8 100644 --- a/app/ui/epg/epg.py +++ b/app/ui/epg/epg.py @@ -423,7 +423,8 @@ class EpgDialog: "on_field_icon_press": self.on_field_icon_press, "on_key_press": self.on_key_press, "on_bq_cursor_changed": self.on_bq_cursor_changed, - "on_source_view_query_tooltip": self.on_source_view_query_tooltip} + "on_source_view_query_tooltip": self.on_source_view_query_tooltip, + "on_paned_size_allocate": lambda p, a: p.set_position(0.5 * a.width)} self._app = app self._ex_services = self._app.current_services @@ -455,7 +456,7 @@ class EpgDialog: # Filter self._filter_bar = builder.get_object("filter_bar") self._filter_entry = builder.get_object("filter_entry") - self._filter_auto_switch = builder.get_object("filter_auto_switch") + self._filter_auto_button = builder.get_object("filter_auto_button") self._services_filter_model = builder.get_object("services_filter_model") self._services_filter_model.set_visible_func(self.services_filter_function) self._sat_pos_filter_model = builder.get_object("sat_pos_filter_model") @@ -699,7 +700,7 @@ class EpgDialog: self.on_assign_ref() def on_bq_cursor_changed(self, view): - if self._filter_bar.get_visible() and self._filter_auto_switch.get_active(): + if self._filter_bar.get_visible() and self._filter_auto_button.get_active(): path, column = view.get_cursor() model = view.get_model() if path: