diff --git a/usr/lib/hypnotix/hypnotix.py b/usr/lib/hypnotix/hypnotix.py index 23c8479..814e2c8 100755 --- a/usr/lib/hypnotix/hypnotix.py +++ b/usr/lib/hypnotix/hypnotix.py @@ -179,11 +179,15 @@ def __init__(self, application): "search_button", "search_bar", "channels_box", - "provider_button", - "preferences_button", + "current_provider_label", "mpv_drawing_area", "stack", + "channel_stack", "fullscreen_button", + "mpv_top_box", + "mpv_bottom_box", + "label_channel_name", + "label_channel_url", "provider_ok_button", "provider_cancel_button", "name_entry", @@ -204,6 +208,9 @@ def __init__(self, application): "tv_button", "movies_button", "series_button", + "providers_button", + "preferences_button", + "favorites_button", "tv_label", "movies_label", "series_label", @@ -281,6 +288,8 @@ def __init__(self, application): self.tv_button.connect("clicked", self.show_groups, TV_GROUP) self.movies_button.connect("clicked", self.show_groups, MOVIES_GROUP) self.series_button.connect("clicked", self.show_groups, SERIES_GROUP) + self.providers_button.connect("clicked", self.open_providers) + self.preferences_button.connect("clicked", self.open_preferences) self.go_back_button.connect("clicked", self.on_go_back_button) self.search_button.connect("toggled", self.on_search_button_toggled) @@ -290,9 +299,6 @@ def __init__(self, application): self.pause_button.connect("clicked", self.on_pause_button) self.show_button.connect("clicked", self.on_show_button) - self.provider_button.connect("clicked", self.on_provider_button) - self.preferences_button.connect("clicked", self.on_preferences_button) - self.new_provider_button.connect("clicked", self.on_new_provider_button) self.reset_providers_button.connect("clicked", self.on_reset_providers_button) self.delete_no_button.connect("clicked", self.on_delete_no_button) @@ -706,20 +712,18 @@ def navigate_to(self, page, name=""): self.back_page = None self.headerbar.set_title("Hypnotix") if provider is None: - self.headerbar.set_subtitle(_("No provider selected")) + self.current_provider_label.set_text(_("No provider selected")) self.tv_label.set_text(_("TV Channels (%d)") % 0) self.movies_label.set_text(_("Movies (%d)") % 0) self.series_label.set_text(_("Series (%d)") % 0) - self.preferences_button.set_sensitive(False) self.tv_button.set_sensitive(False) self.movies_button.set_sensitive(False) self.series_button.set_sensitive(False) else: - self.headerbar.set_subtitle(provider.name) + self.current_provider_label.set_text(provider.name) self.tv_label.set_text(_("TV Channels (%d)") % len(provider.channels)) self.movies_label.set_text(_("Movies (%d)") % len(provider.movies)) self.series_label.set_text(_("Series (%d)") % len(provider.series)) - self.preferences_button.set_sensitive(True) self.tv_button.set_sensitive(len(provider.channels) > 0) self.movies_button.set_sensitive(len(provider.movies) > 0) self.series_button.set_sensitive(len(provider.series) > 0) @@ -832,6 +836,7 @@ def play_async(self, channel): @idle_function def before_play(self, channel): + self.channel_stack.set_visible_child_name("channel_page") self.mpv_stack.set_visible_child_name("spinner_page") self.video_properties.clear() self.video_properties[_("General")] = {} @@ -845,6 +850,9 @@ def before_play(self, channel): self.audio_bitrates.clear() self.spinner.start() + self.label_channel_name.set_text(channel.name) + self.label_channel_url.set_text(channel.url) + @idle_function def after_play(self, channel): self.mpv_stack.set_visible_child_name("player_page") @@ -1010,7 +1018,7 @@ def on_pause_button(self, widget): def on_show_button(self, widget): self.navigate_to("channels_page") - def on_provider_button(self, widget): + def open_providers(self, widget): self.navigate_to("providers_page") @idle_function @@ -1092,7 +1100,7 @@ def on_provider_selected(self, widget, provider): self.init_channels_listbox() self.navigate_to("landing_page") - def on_preferences_button(self, widget): + def open_preferences(self, widget): self.navigate_to("preferences_page") def on_new_provider_button(self, widget): @@ -1576,6 +1584,8 @@ def toggle_fullscreen(self): if self.fullscreen: # Fullscreen mode self.window.fullscreen() + self.mpv_top_box.hide() + self.mpv_bottom_box.hide() self.sidebar.hide() self.headerbar.hide() self.status_label.hide() @@ -1584,6 +1594,8 @@ def toggle_fullscreen(self): else: # Normal mode self.window.unfullscreen() + self.mpv_top_box.show() + self.mpv_bottom_box.hide() if self.content_type == TV_GROUP: self.sidebar.show() self.headerbar.show() diff --git a/usr/share/hypnotix/hypnotix.ui b/usr/share/hypnotix/hypnotix.ui index c8f2d88..985dbd7 100644 --- a/usr/share/hypnotix/hypnotix.ui +++ b/usr/share/hypnotix/hypnotix.ui @@ -1,231 +1,47 @@ - + True - False + False - False - 600 - 500 - center - hypnotix - - - True - False - Hypnotix - Watch TV - True - - - True - False - - - True - True - - - True - False - go-previous-symbolic - - - - - False - True - 0 - - - - - - - True - False - - - True - True - - - True - False - system-search-symbolic - - - - - False - True - 0 - - - - - 1 - - - - - True - True - center - True - Search - - - 2 - - - - - True - False - - - True - True - Fullscreen - - - True - False - view-fullscreen-symbolic - 2 - - - - - False - True - 0 - - - - - True - True - False - True - main_menu - - - True - False - open-menu-symbolic - - - - - False - True - 2 - - - - - end - 1 - - - - + False + center + 600 + 500 + hypnotix True - False + False vertical True - False + False True - False - 12 + False + 12 vertical 20 True - False + False + center - - True - False - 12 - - - - - - - - - True - True - 0 - + - - True - False - expand - - - True - True - True - Providers - - - True - False - tv-symbolic - - - - - True - True - 1 - - - - - True - False - True - True - Preferences - - - True - False - xapp-prefs-behavior-symbolic - - - - - True - True - 2 - - - - - False - True - 2 - + + + + @@ -237,50 +53,116 @@ True - False + False center center + True + True + vertical + 20 - + True - False - True - True + False + 20 - + True - False - vertical - 3 + False + label + + + + + + + False + True + 10 + 1 + + + + + True + False + True + expand - @@ -290,106 +172,168 @@ - + True - False - True - True + False + center + center - + True - False - vertical - 3 - - - - False - True - 0 - - + False + True + True - + True - False - - - + False + vertical + 3 + + + + False + True + 0 + + + + + True + False + + + + + + False + True + 1 + + - - False - True - 1 - + + False + True + 0 + - - - False - True - 1 - - - - - True - False - True - True - + True - False - vertical - 3 + False + True + True - + + False + True + 1 + + + + + True + False + True + True - + True - False - - - + False + vertical + 3 + + + + False + True + 0 + + + + + True + False + + + + + + False + True + 1 + + - - False - True - 1 - + + False + True + 2 + - False + True True - 2 + 1 - True + False True 1 @@ -402,25 +346,25 @@ True - False - 12 - 12 + False + 12 + 12 vertical True - True + True True - False + False True - False + False start - 12 - 12 + 12 + 12 @@ -441,27 +385,28 @@ True - False - 12 + False + 12 vertical True - False + False + 12 True - True - True + True + 150 True - False + False + 12 True - False - 12 + False @@ -474,33 +419,67 @@ - + True - False - vertical + False - + True - False - - - True - False - - - player_page - - + False + 48 + + + empty_page + + + + + True + False + vertical + 12 - + True - False - vertical + False + 5 + 5 - + True - False - True + False + vertical + 4 + + + True + False + 0 + + + + + + True + True + 0 + + + + + True + False + 0 + + + + + + True + True + 1 + + True @@ -508,166 +487,318 @@ 1 - - - spinner_page - 1 - - - - - True - True - 0 - - - - - True - False - slide-up - - - True - False - 20 - vertical - 3 - + True - True - True - end - none + True + True True - False - 16 - dialog-close-symbolic + False + xapp-favorites-app-symbolic False False - 0 + end + 1 + + + False + True + 0 + + + + + True + False + vertical - + True - False - 6 + False - + True - False - end - - - + False - False - True - 0 + player_page - + True - False - end - - - + False + vertical + + + True + False + True + + + True + True + 1 + + - False - True + spinner_page 1 + + + True + True + 0 + + + + + True + False + slide-up - + True - False + False + 20 vertical + 3 + + + True + True + True + end + none + + + True + False + 16 + dialog-close-symbolic + + + + + False + False + 0 + + True - False - end + False + 6 + + + True + False + end + + + + + + False + True + 0 + + + + + True + False + end + + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + end + + + True + False + end + + + + + + False + True + 0 + + + + + True + False + end + + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + False + True + end + 2 + + + + + True + False + emblem-favorite-symbolic + + + False + True + end + 3 + + + + + False + True + 1 + + + + + True + False + 6 + + + True + False + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + - + True - False - end - - - + False False True - 0 + 2 - + True - False - end - - - + False False True - 1 + 3 + + + + + True + False + + + False + True + 4 False True - 0 + 2 - + True - False + False + start + 6 + True False True - 1 + 3 - - False - True - end - 2 - - - - - True - False - emblem-favorite-symbolic - - - False - True - end - 3 - @@ -676,99 +807,42 @@ 1 + + + + True + True + 1 + + + + + True + False - - True - False - 6 - - - True - False - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - True - False - - - False - True - 3 - - - - - True - False - - - False - True - 4 - - - - - False - True - 2 - + - - True - False - start - 6 - True - - - False - True - 3 - + + + + + + False + True + 2 + - False - True + channel_page 1 - True @@ -792,25 +866,25 @@ True - False - 12 - 12 + False + 12 + 12 vertical True - True + True True - False + False True - False + False start - 12 - 12 + 12 + 12 @@ -831,21 +905,21 @@ True - False - 12 + False + 12 vertical True - True + True True - False + False True - False + False vertical 12 @@ -871,25 +945,25 @@ True - False + False vertical True - True + True True - False + False True - False + False 6 True - False + False pref_stack @@ -901,21 +975,22 @@ True - False - 12 + False + 12 + True - False + False start - 20 - 20 - 12 - 12 + 20 + 20 + 12 + 12 True - False + False start center MPV Options @@ -924,60 +999,76 @@ - 0 - 0 + 0 + 0 True - True + True center True - 1 - 0 + 1 + 0 List of MPV options True - True - True + True + True start center none https://mpv.io/manual/master/#options - 1 - 1 + 1 + 1 + + + + + + + + + + + + + + + Playback - video-x-generic-symbolic + video-x-generic-symbolic + True - False + False start - 20 - 20 - 12 - 12 + 20 + 20 + 12 + 12 True - False + False start center User Agent @@ -986,26 +1077,26 @@ - 0 - 0 + 0 + 0 True - True + True center True - 1 - 0 + 1 + 0 True - False + False start center Referrer @@ -1014,26 +1105,41 @@ - 0 - 1 + 0 + 1 True - True + True center True - 1 - 1 + 1 + 1 + + + + + + + + + + + + + + + Network - preferences-system-network-symbolic + preferences-system-network-symbolic 1 @@ -1064,30 +1170,30 @@ True - False - 12 + False + 12 vertical True - False + False vertical 20 True - True + True True - False + False True - False + False start - 1 - none + 1 + none @@ -1102,7 +1208,7 @@ True - False + False False @@ -1113,31 +1219,31 @@ True - False + False center vertical True - False + False True - start + start True - True - True + True + True center True - False + False 6 True - False - list-add-symbolic + False + list-add-symbolic False @@ -1148,7 +1254,7 @@ True - False + False Add a new provider... @@ -1169,19 +1275,19 @@ True - True - True + True + True center True - False + False 6 True - False - view-refresh-symbolic + False + view-refresh-symbolic False @@ -1192,7 +1298,7 @@ True - False + False Reset to defaults... @@ -1240,95 +1346,96 @@ True - False + False start True - 12 + 12 vertical 12 + True - False + False True - 12 - 12 + 12 + 12 True - False + False end Name: - 0 - 1 + 0 + 1 True - False + False end URL: - 0 - 4 + 0 + 4 True - False + False end Path: - 0 - 3 + 0 + 3 True - True + True True - 40 + 40 - 1 - 1 + 1 + 1 True - True + True True - url + url - 1 - 4 + 1 + 4 True - False + False center center - 12 + 12 True True - expand + expand Cancel True - True - True + True + True True @@ -1341,8 +1448,8 @@ OK True False - True - True + True + True True @@ -1352,138 +1459,138 @@ - 1 - 8 + 1 + 8 True - False + False end Username: - 0 - 5 + 0 + 5 True - False + False end Password: True - 20 + 20 - 0 - 6 + 0 + 6 True - True + True True - url + url - 1 - 5 + 1 + 5 True - True + True True - url + url - 1 - 6 + 1 + 6 True - True - True - Browse... + True + True + Browse... True - False - folder-symbolic + False + folder-symbolic - 2 - 3 + 2 + 3 True - True + True True - url + url - 1 - 3 + 1 + 3 True - True + True True - url + url - 1 - 7 + 1 + 7 True - False + False end EPG: True - 20 + 20 - 0 - 7 + 0 + 7 True - False + False end Type: - 0 - 2 + 0 + 2 True - False + False True - 1 - 2 + 1 + 2 @@ -1535,16 +1642,16 @@ True - False + False center center - 12 + 12 vertical 24 True - False + False Are you sure you want to delete this provider? @@ -1556,13 +1663,13 @@ True - False + False No True - True - True + True + True True @@ -1574,8 +1681,8 @@ Yes True - True - True + True + True @@ -1602,16 +1709,16 @@ True - False + False center center - 12 + 12 vertical 24 True - False + False Are you sure you want to reset to the default providers? @@ -1623,13 +1730,13 @@ True - False + False No True - True - True + True + True True @@ -1641,8 +1748,8 @@ Yes True - True - True + True + True @@ -1676,16 +1783,16 @@ True - False - 12 - 12 + False + 12 + 12 12 True - False + False start - 6 + 6 center @@ -1701,13 +1808,13 @@ True - False - 3 + False + 3 12 True - False + False Currently playing: @@ -1723,7 +1830,7 @@ True - False + False @@ -1738,7 +1845,7 @@ True - False + False False @@ -1749,19 +1856,19 @@ True - False + False True - True - True - Show + True + True + Show none True - False - view-reveal-symbolic + False + view-reveal-symbolic @@ -1774,15 +1881,15 @@ True - True - True - Pause + True + True + Pause none True - False - media-playback-pause-symbolic + False + media-playback-pause-symbolic @@ -1795,15 +1902,15 @@ True - True - True - Stop + True + True + Stop none True - False - media-playback-stop-symbolic + False + media-playback-stop-symbolic @@ -1824,7 +1931,7 @@ False True - end + end 1 @@ -1837,39 +1944,147 @@ - - - False - True - dialog - + True - False + False Hypnotix - Stream Information - True + Watch TV + True - + + True + False + + + True + True + + + True + False + go-previous-symbolic + + + + + False + True + 0 + + + - + + True + False + + + True + True + + + True + False + system-search-symbolic + + + + + False + True + 0 + + + + + 1 + + + + + True + False + + + True + True + Fullscreen + + + True + False + view-fullscreen-symbolic + 2 + + + + + False + True + 0 + + + + + True + True + False + True + main_menu + + + True + False + open-menu-symbolic + + + + + False + True + 2 + + + + + end + 1 + + + + + True + True + center + True + Search + + + 2 + + + + False + True + dialog - False - 18 - 18 - 18 + False + 18 + 18 + 18 vertical - False + False end - 6 - center + 6 + center @@ -1878,9 +2093,9 @@ gtk-close info_close_button True - True - True - True + True + True + True True @@ -1901,13 +2116,13 @@ True - False + False start vertical True - False + False center start stream_info_stack @@ -1921,24 +2136,24 @@ True - False + False start - crossfade + crossfade True - False + False start - 12 - 24 + 12 + 24 vertical True - False + False start start - 8 + 8 General @@ -1953,34 +2168,34 @@ True - False + False start vertical True - False + False start vertical True - False - 24 - 24 - 6 - 6 + False + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False False @@ -1991,12 +2206,12 @@ True - False + False False True - end + end 1 @@ -2017,7 +2232,7 @@ True - False + False False @@ -2028,22 +2243,22 @@ True - False - 24 - 24 - 6 - 6 + False + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False Average Bitrate @@ -2055,12 +2270,12 @@ True - False + False False True - end + end 1 @@ -2102,11 +2317,11 @@ True - False + False start start - 26 - 8 + 26 + 8 Color @@ -2121,35 +2336,35 @@ True - False + False start vertical True - False + False start vertical True - False + False start - 24 - 24 - 6 - 6 + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False False @@ -2160,12 +2375,12 @@ True - False + False False True - end + end 1 @@ -2186,7 +2401,7 @@ True - False + False start @@ -2198,23 +2413,23 @@ True - False + False start - 24 - 24 - 6 - 6 + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False False @@ -2225,12 +2440,12 @@ True - False + False False True - end + end 1 @@ -2284,18 +2499,18 @@ True - False + False start - 12 - 24 + 12 + 24 vertical True - False + False start start - 8 + 8 General @@ -2310,34 +2525,34 @@ True - False + False start vertical True - False + False start vertical True - False - 24 - 24 - 6 - 6 + False + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False False @@ -2348,12 +2563,12 @@ True - False + False False True - end + end 1 @@ -2374,7 +2589,7 @@ True - False + False False @@ -2385,22 +2600,22 @@ True - False - 24 - 24 - 6 - 6 + False + 24 + 24 + 6 + 6 True - False - 12 - 12 + False + 12 + 12 24 True - False + False Average Bitrate @@ -2412,12 +2627,12 @@ True - False + False False True - end + end 1 @@ -2459,11 +2674,11 @@ True - False + False start start - 26 - 8 + 26 + 8 Layout @@ -2478,35 +2693,35 @@ True - False + False start vertical True - False + False start vertical True - False + False start - 6 - 6 + 6 + 6 True - False - 24 - 24 - 12 - 12 + False + 24 + 24 + 12 + 12 24 True - False + False False @@ -2517,12 +2732,12 @@ True - False + False False True - end + end 1 @@ -2543,7 +2758,7 @@ True - False + False start @@ -2555,23 +2770,23 @@ True - False + False start - 6 - 6 + 6 + 6 True - False - 24 - 24 - 12 - 12 + False + 24 + 24 + 12 + 12 24 True - False + False False @@ -2582,12 +2797,12 @@ True - False + False False True - end + end 1 @@ -2649,5 +2864,20 @@ + + + True + False + Hypnotix + Stream Information + True + + + + + + + +