diff --git a/app/ui/epg_dialog.glade b/app/ui/epg.glade similarity index 58% rename from app/ui/epg_dialog.glade rename to app/ui/epg.glade index 3180c1f3..f8faa6cb 100644 --- a/app/ui/epg_dialog.glade +++ b/app/ui/epg.glade @@ -1,5 +1,5 @@ - + + True + False + document-save-symbolic + 1 + + + True + False + edit-select-all-symbolic + 1 + @@ -75,10 +87,16 @@ Author: Dmitriy Yefremov copy_image False - + + + True + False + edit-find-replace-symbolic + 1 + True False @@ -100,7 +118,7 @@ Author: Dmitriy Yefremov insert_link_image False - + @@ -130,6 +148,12 @@ Author: Dmitriy Yefremov + + True + False + document-save-as-symbolic + 1 + @@ -312,7 +336,7 @@ Author: Dmitriy Yefremov True True - gtk-connect + network-transmit-receive-symbolic False @@ -412,8 +436,8 @@ Author: Dmitriy Yefremov True True /data/epg/ - gtk-edit - gtk-directory + document-edit-symbolic + folder-open-symbolic False Select @@ -442,7 +466,7 @@ Author: Dmitriy Yefremov True True /etc/enigma2/ - gtk-edit + document-edit-symbolic False @@ -559,201 +583,240 @@ Author: Dmitriy Yefremov + + True + False + emblem-synchronizing-symbolic + 1 + 480 320 False + EPG True center-on-parent 480 - 240 + 320 True - gtk-index + True True - center - - - True - False - EPG - List configuration - 2 - True - - - True - False - 2 - - - True - True - True - Apply - - - - True - False - gtk-apply - - - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - True - True - Update - - - - True - False - gtk-refresh - - - - - False - True - 2 - - - - - True - True - True - Filter - - - - True - False - gtk-spell-check - - - - - - False - True - 3 - - - - - - - True - False - 2 - - - True - True - True - Auto configuration by service names. - - - - True - False - gtk-find-and-replace - - - - - False - True - 0 - - - - - True - True - True - Save list to xml. - - - - True - False - gtk-save-as - - - - - False - True - 1 - - - - - True - True - True - none - options_popover - - - True - False - Options - gtk-properties - - - - - False - True - 3 - - - - - end - 1 - - - - True False vertical - + True + False + vertical + + + True + False + 15 + 15 + 10 + 10 + 10 + + + True + False + expand + + + Apply + True + True + True + Apply + apply_image + True + + + + False + True + 0 + + + + + Update + True + True + True + Update + update_image + True + + + + False + True + 1 + + + + + Filter + True + True + True + Filter + filter_image + True + + + + + False + True + 2 + + + + + False + True + 1 + + + + + True + False + List configuration + + + False + True + 2 + + + + + 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 + True + True + none + options_popover + + + True + False + 2 + + + True + False + Options + applications-system-symbolic + 1 + + + False + True + 0 + + + + + True + False + Options + + + False + True + 1 + + + + + + + False + True + 2 + + + + + False + True + end + 0 + + + + + False + True + 0 + + + + + + False + True + 0 + + + + False True True - tools-check-spelling + edit-find-replace-symbolic False False @@ -770,14 +833,182 @@ Author: Dmitriy Yefremov True True + 5 + 5 + 5 + 5 True - - 240 + True False - vertical + 0.49000000953674316 + in + + 240 + True + False + 5 + 5 + 5 + vertical + + + True + True + in + + + True + True + service_sort_model + 0 + both + + + + + + + + + + True + autosize + 50 + Service + True + 0.5 + 0 + + + 5 + + + 0 + + + + + + + True + autosize + 50 + Reference + True + 0.5 + + + 0.50999999046325684 + + + 1 + + + + + + + + + True + True + 1 + + + + + 24 + True + False + 5 + 2 + + + True + False + document-properties-symbolic + 1 + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + 26 + True + False + center + center + 2 + + + True + False + center + center + 10 + 10 + info + center + end + True + False + + + False + True + 0 + + + + + False + center + center + 15 + 0.01 + + + False + True + 1 + + + + + True + True + 2 + + + + + False + True + 2 + + + + + True False @@ -788,160 +1019,6 @@ Author: Dmitriy Yefremov - - False - True - 0 - - - - - True - True - in - - - True - True - service_sort_model - 0 - both - - - - - - - - - - True - autosize - 50 - Service - True - 0 - - - 5 - - - 0 - - - - - - - True - autosize - 50 - Reference - True - - - 0.50999999046325684 - - - 1 - - - - - - - - - True - True - 1 - - - - - 24 - True - False - 2 - 2 - - - True - False - gtk-properties - - - False - True - 0 - - - - - True - False - 0 - - - False - True - 1 - - - - - True - False - center - center - 2 - - - True - False - center - center - 10 - 10 - info - center - end - True - False - - - False - True - 0 - - - - - False - center - center - 15 - 0.01 - - - False - True - 1 - - - - - True - True - 2 - - - - - False - True - 2 - @@ -950,12 +1027,274 @@ Author: Dmitriy Yefremov - - 240 + True False - vertical + 0.49000000953674316 + in + + 240 + True + False + 5 + 5 + 5 + vertical + + + True + True + in + + + True + True + bouquet_list_store + 2 + both + 9 + + + + + + multiple + + + + + True + 30 + Num + 0.5 + 0 + + + 0.20000000298023224 + 5 + 5 + + + 10 + 0 + + + + + + + True + 50 + Service + True + 0.5 + 2 + + + 2 + + + 10 + 8 + + + + + 2 + + + 10 + 1 + + + + + end + 25 + + + 10 + 2 + + + + + 2 + + + 10 + 3 + + + + + 2 + + + 10 + 4 + + + + + + + True + autosize + 40 + Type + True + 0.5 + + + 0.50999999046325684 + + + 10 + 5 + + + + + + + False + True + autosize + 10 + Pos + + + 0.50999999046325684 + + + 10 + 6 + + + + + + + False + autosize + fav_id + + + + 7 + + + + + + + False + autosize + extra + + + + 9 + + + + + + + + + + + + True + True + 1 + + + + + 26 + True + False + 5 + 2 + + + True + False + document-properties-symbolic + 1 + + + False + True + 0 + + + + + True + False + 0 + + + False + True + 1 + + + + + True + False + 5 + 5 + + + False + True + 2 + + + + + True + False + 2 + gtk-index + 1 + + + False + True + 3 + + + + + True + False + center + 0 + + + False + True + 4 + + + + + False + True + 2 + + + + + True False @@ -966,256 +1305,6 @@ Author: Dmitriy Yefremov - - False - True - 0 - - - - - True - True - in - - - True - True - bouquet_list_store - 2 - both - 9 - - - - - - multiple - - - - - True - 30 - Num - 0 - - - 0.20000000298023224 - 5 - 5 - - - 10 - 0 - - - - - - - True - 50 - Service - True - 2 - - - 2 - - - 10 - 8 - - - - - 2 - - - 10 - 1 - - - - - end - 25 - - - 10 - 2 - - - - - 2 - - - 10 - 3 - - - - - 2 - - - 10 - 4 - - - - - - - True - autosize - 40 - Type - True - - - 0.50999999046325684 - - - 10 - 5 - - - - - - - False - True - autosize - 10 - Pos - - - 0.50999999046325684 - - - 10 - 6 - - - - - - - False - autosize - fav_id - - - - 7 - - - - - - - False - autosize - extra - - - - 9 - - - - - - - - - - - - True - True - 1 - - - - - 24 - True - False - 2 - 2 - - - True - False - gtk-properties - - - False - True - 0 - - - - - True - False - 0 - - - False - True - 1 - - - - - True - False - 5 - 5 - - - False - True - 2 - - - - - True - False - gtk-index - - - False - True - 3 - - - - - True - False - center - 0 - - - False - True - 4 - - - - - False - True - 2 - diff --git a/app/ui/epg_dialog.py b/app/ui/epg.py similarity index 99% rename from app/ui/epg_dialog.py rename to app/ui/epg.py index 2a916528..4618c7fd 100644 --- a/app/ui/epg_dialog.py +++ b/app/ui/epg.py @@ -96,7 +96,7 @@ class EpgDialog: self._show_tooltips = True self._download_xml_is_active = False - builder = get_builder(UI_RESOURCES_PATH + "epg_dialog.glade", handlers) + builder = get_builder(UI_RESOURCES_PATH + "epg.glade", handlers) self._dialog = builder.get_object("epg_dialog_window") self._dialog.set_transient_for(transient) @@ -111,6 +111,7 @@ class EpgDialog: self._xml_download_progress_bar = builder.get_object("xml_download_progress_bar") # Filter self._filter_bar = builder.get_object("filter_bar") + self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible") self._filter_entry = builder.get_object("filter_entry") self._services_filter_model = builder.get_object("services_filter_model") self._services_filter_model.set_visible_func(self.services_filter_function) diff --git a/app/ui/main.py b/app/ui/main.py index 460a1c13..33a4323d 100644 --- a/app/ui/main.py +++ b/app/ui/main.py @@ -49,7 +49,7 @@ from app.settings import (SettingsType, Settings, SettingsException, SettingsRea IS_DARWIN, PlayStreamsMode) from app.tools.media import Recorder from app.ui.control import ControlBox, EpgBox, TimersBox, RecordingsBox -from app.ui.epg_dialog import EpgDialog +from app.ui.epg import EpgDialog from app.ui.ftp import FtpClientBox from app.ui.playback import PlayerBox from app.ui.transmitter import LinksTransmitter