Skip to content

Commit 00df7a4

Browse files
clefebvreclefebvre
authored
Merge branch 'master' into epg
2 parents 7f605c0 + 9137ced commit 00df7a4

2 files changed

Lines changed: 47 additions & 36 deletions

File tree

‎usr/lib/hypnotix/hypnotix.py‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -355,29 +355,29 @@ def __init__(self, application):
355355
self.window.add_accel_group(accel_group)
356356
menu = self.builder.get_object("main_menu")
357357
item = Gtk.ImageMenuItem()
358-
item.set_image(Gtk.Image.new_from_icon_name("preferences-desktop-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU))
358+
item.set_image(Gtk.Image.new_from_icon_name("xsi-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU))
359359
item.set_label(_("Keyboard Shortcuts"))
360360
item.connect("activate", self.open_keyboard_shortcuts)
361361
key, mod = Gtk.accelerator_parse("<Control>K")
362362
item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
363363
menu.append(item)
364364
self.info_menu_item = Gtk.ImageMenuItem()
365-
self.info_menu_item.set_image(Gtk.Image.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU))
365+
self.info_menu_item.set_image(Gtk.Image.new_from_icon_name("xsi-dialog-information-symbolic", Gtk.IconSize.MENU))
366366
self.info_menu_item.set_label(_("Stream Information"))
367367
self.info_menu_item.connect("activate", self.open_info)
368368
key, mod = Gtk.accelerator_parse("F2")
369369
self.info_menu_item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
370370
self.info_menu_item.set_sensitive(False)
371371
menu.append(self.info_menu_item)
372372
item = Gtk.ImageMenuItem()
373-
item.set_image(Gtk.Image.new_from_icon_name("help-about-symbolic", Gtk.IconSize.MENU))
373+
item.set_image(Gtk.Image.new_from_icon_name("xsi-help-about-symbolic", Gtk.IconSize.MENU))
374374
item.set_label(_("About"))
375375
item.connect("activate", self.open_about)
376376
key, mod = Gtk.accelerator_parse("F1")
377377
item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
378378
menu.append(item)
379379
item = Gtk.ImageMenuItem(label=_("Quit"))
380-
image = Gtk.Image.new_from_icon_name("application-exit-symbolic", Gtk.IconSize.MENU)
380+
image = Gtk.Image.new_from_icon_name("xsi-exit-symbolic", Gtk.IconSize.MENU)
381381
item.set_image(image)
382382
item.connect("activate", self.on_menu_quit)
383383
key, mod = Gtk.accelerator_parse("<Control>Q")
@@ -869,7 +869,7 @@ def on_favorite_button_toggled(self, widget):
869869
elif widget.get_active() == False and data in self.favorite_data:
870870
print (f"Removing {name} from favorites")
871871
self.favorite_data.remove(data)
872-
self.favorite_button_image.set_from_icon_name("starred-symbolic" if widget.get_active() else "non-starred-symbolic", Gtk.IconSize.BUTTON)
872+
self.favorite_button_image.set_from_icon_name("xsi-starred-symbolic" if widget.get_active() else "non-xsi-starred-symbolic", Gtk.IconSize.BUTTON)
873873
self.manager.save_favorites(self.favorite_data)
874874

875875
def on_channel_activated(self, box, widget):
@@ -892,6 +892,7 @@ def play_async(self, channel):
892892
self.epg_counter["idx"] = -1
893893
self.mpv.command("show-text", "", 1)
894894
self.mpv.stop()
895+
self.mpv.pause = False
895896
print("CHANNEL: '%s' (%s)" % (channel.name, channel.url))
896897
if channel is not None and channel.url is not None:
897898
# os.system("mpv --wid=%s %s &" % (self.wid, channel.url))
@@ -926,11 +927,11 @@ def before_play(self, channel):
926927
data = f"{channel.info}:::{channel.url}"
927928
if data in self.favorite_data:
928929
self.favorite_button.set_active(True)
929-
self.favorite_button_image.set_from_icon_name("starred-symbolic", Gtk.IconSize.BUTTON)
930+
self.favorite_button_image.set_from_icon_name("xsi-starred-symbolic", Gtk.IconSize.BUTTON)
930931
self.favorite_button.set_tooltip_text(_("Remove from favorites"))
931932
else:
932933
self.favorite_button.set_active(False)
933-
self.favorite_button_image.set_from_icon_name("non-starred-symbolic", Gtk.IconSize.BUTTON)
934+
self.favorite_button_image.set_from_icon_name("xsi-non-starred-symbolic", Gtk.IconSize.BUTTON)
934935
self.favorite_button.set_tooltip_text(_("Add to favorites"))
935936
self.page_is_loading = False
936937

@@ -1074,7 +1075,7 @@ def refresh_providers_page(self):
10741075
for provider in self.providers:
10751076
labels_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
10761077
image = Gtk.Image()
1077-
image.set_from_icon_name("tv-symbolic", Gtk.IconSize.BUTTON)
1078+
image.set_from_icon_name("xsi-tv-symbolic", Gtk.IconSize.BUTTON)
10781079
labels_box.pack_start(image, False, False, 0)
10791080
label = Gtk.Label()
10801081
label.set_markup("<b>%s</b>" % provider.name)
@@ -1111,7 +1112,7 @@ def refresh_providers_page(self):
11111112
button.set_relief(Gtk.ReliefStyle.NONE)
11121113
button.connect("clicked", self.on_edit_button_clicked, provider)
11131114
image = Gtk.Image()
1114-
image.set_from_icon_name("xapp-edit-symbolic", Gtk.IconSize.BUTTON)
1115+
image.set_from_icon_name("xsi-edit-symbolic", Gtk.IconSize.BUTTON)
11151116
button.set_tooltip_text(_("Edit"))
11161117
button.add(image)
11171118
box.pack_start(button, False, False, 0)
@@ -1121,7 +1122,7 @@ def refresh_providers_page(self):
11211122
button.set_relief(Gtk.ReliefStyle.NONE)
11221123
button.connect("clicked", self.on_clear_icon_cache_button_clicked, provider)
11231124
image = Gtk.Image()
1124-
image.set_from_icon_name("edit-clear-symbolic", Gtk.IconSize.BUTTON)
1125+
image.set_from_icon_name("xsi-edit-clear-symbolic", Gtk.IconSize.BUTTON)
11251126
button.set_tooltip_text(_("Clear icon cache"))
11261127
button.add(image)
11271128
box.pack_start(button, False, False, 0)
@@ -1131,7 +1132,7 @@ def refresh_providers_page(self):
11311132
button.set_relief(Gtk.ReliefStyle.NONE)
11321133
button.connect("clicked", self.on_delete_button_clicked, provider)
11331134
image = Gtk.Image()
1134-
image.set_from_icon_name("edit-delete-symbolic", Gtk.IconSize.BUTTON)
1135+
image.set_from_icon_name("xsi-edit-delete-symbolic", Gtk.IconSize.BUTTON)
11351136
button.set_tooltip_text(_("Remove"))
11361137
button.add(image)
11371138
box.pack_start(button, False, False, 0)
@@ -1502,6 +1503,8 @@ def get_cached_epg_path(urls):
15021503
self.status_label.hide()
15031504

15041505
def on_key_press_event(self, widget, event):
1506+
if isinstance(widget.get_focus(), Gtk.Entry):
1507+
return False
15051508
# Get any active, but not pressed modifiers, like CapsLock and NumLock
15061509
persistant_modifiers = Gtk.accelerator_get_default_mod_mask()
15071510

@@ -1557,7 +1560,7 @@ def chan_match(chan1, chan2):
15571560
else:
15581561
self.search_button.set_active(True)
15591562
elif event.keyval == Gdk.KEY_F11 or \
1560-
(event.keyval == Gdk.KEY_f and not ctrl and type(widget.get_focus()) != gi.repository.Gtk.SearchEntry):
1563+
(event.keyval == Gdk.KEY_f and not ctrl):
15611564
self.full_screen_mode()
15621565
elif event.keyval == Gdk.KEY_F6:
15631566
self.theather_mode()
@@ -1569,13 +1572,19 @@ def chan_match(chan1, chan2):
15691572
self.epg_timestamp = 0
15701573
else:
15711574
self.normal_mode()
1572-
elif event.keyval == Gdk.KEY_BackSpace and not ctrl and type(widget.get_focus()) != gi.repository.Gtk.SearchEntry:
1575+
elif event.keyval == Gdk.KEY_BackSpace and not ctrl:
15731576
self.normal_mode()
15741577
self.on_go_back_button()
1575-
elif event.keyval == Gdk.KEY_Left:
1578+
elif not shift and event.keyval == Gdk.KEY_Left:
15761579
self.on_prev_channel()
1577-
elif event.keyval == Gdk.KEY_Right:
1580+
elif not shift and event.keyval == Gdk.KEY_Right:
15781581
self.on_next_channel()
1582+
elif not event.keyval in [Gdk.KEY_F1, Gdk.KEY_F2]:
1583+
try:
1584+
self.mpv.command("keypress", Gdk.keyval_name(event.keyval))
1585+
except:
1586+
pass
1587+
return True
15791588
# elif event.keyval == Gdk.KEY_Up:
15801589
# # Up of in the list
15811590
# pass
@@ -1747,6 +1756,7 @@ def on_mpv_drawing_area_draw(self, widget, cr):
17471756
cr.paint()
17481757

17491758
def normal_mode(self):
1759+
self.window.get_window().set_cursor(None)
17501760
self.window.unfullscreen()
17511761
self.mpv_top_box.show()
17521762
self.mpv_bottom_box.hide()
@@ -1784,6 +1794,7 @@ def full_screen_mode(self):
17841794
if self.stack.get_visible_child_name() == "channels_page":
17851795
self.fullscreen = not self.fullscreen
17861796
if self.fullscreen:
1797+
self.window.get_window().set_cursor(Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "none"))
17871798
# Fullscreen mode
17881799
self.window.fullscreen()
17891800
self.mpv_top_box.hide()

‎usr/share/hypnotix/hypnotix.ui‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<object class="GtkImage">
9999
<property name="visible">True</property>
100100
<property name="can-focus">False</property>
101-
<property name="icon-name">list-add-symbolic</property>
101+
<property name="icon-name">xsi-list-add-symbolic</property>
102102
<property name="icon_size">3</property>
103103
</object>
104104
</child>
@@ -120,7 +120,7 @@
120120
<object class="GtkImage">
121121
<property name="visible">True</property>
122122
<property name="can-focus">False</property>
123-
<property name="icon-name">starred-symbolic</property>
123+
<property name="icon-name">xsi-starred-symbolic</property>
124124
<property name="icon_size">3</property>
125125
</object>
126126
</child>
@@ -142,7 +142,7 @@
142142
<object class="GtkImage">
143143
<property name="visible">True</property>
144144
<property name="can-focus">False</property>
145-
<property name="icon-name">xapp-prefs-behavior-symbolic</property>
145+
<property name="icon-name">xsi-prefs-behavior-symbolic</property>
146146
<property name="icon_size">3</property>
147147
</object>
148148
</child>
@@ -164,7 +164,7 @@
164164
<object class="GtkImage">
165165
<property name="visible">True</property>
166166
<property name="can-focus">False</property>
167-
<property name="icon-name">tv-symbolic</property>
167+
<property name="icon-name">xsi-tv-symbolic</property>
168168
<property name="icon_size">3</property>
169169
</object>
170170
</child>
@@ -214,7 +214,7 @@
214214
<property name="visible">True</property>
215215
<property name="can-focus">False</property>
216216
<property name="pixel-size">128</property>
217-
<property name="icon-name">tv</property>
217+
<property name="icon-name">xsi-tv-symbolic</property>
218218
<property name="icon_size">3</property>
219219
</object>
220220
<packing>
@@ -263,7 +263,7 @@
263263
<property name="visible">True</property>
264264
<property name="can-focus">False</property>
265265
<property name="pixel-size">128</property>
266-
<property name="icon-name">tv</property>
266+
<property name="icon-name">xsi-tv-symbolic</property>
267267
<property name="icon_size">3</property>
268268
</object>
269269
<packing>
@@ -312,7 +312,7 @@
312312
<property name="visible">True</property>
313313
<property name="can-focus">False</property>
314314
<property name="pixel-size">128</property>
315-
<property name="icon-name">tv</property>
315+
<property name="icon-name">xsi-tv-symbolic</property>
316316
<property name="icon_size">3</property>
317317
</object>
318318
<packing>
@@ -520,7 +520,7 @@
520520
<object class="GtkImage" id="favorite_button_image">
521521
<property name="visible">True</property>
522522
<property name="can-focus">False</property>
523-
<property name="icon-name">starred-symbolic</property>
523+
<property name="icon-name">xsi-starred-symbolic</property>
524524
</object>
525525
</child>
526526
</object>
@@ -831,7 +831,7 @@
831831
</object>
832832
<packing>
833833
<property name="title" translatable="yes">Playback</property>
834-
<property name="icon-name">video-x-generic-symbolic</property>
834+
<property name="icon-name">xsi-video-x-generic-symbolic</property>
835835
</packing>
836836
</child>
837837
<child>
@@ -918,7 +918,7 @@
918918
</object>
919919
<packing>
920920
<property name="title" translatable="yes">Network</property>
921-
<property name="icon-name">preferences-system-network-symbolic</property>
921+
<property name="icon-name">xsi-network-symbolic</property>
922922
<property name="position">1</property>
923923
</packing>
924924
</child>
@@ -1088,7 +1088,7 @@
10881088
</object>
10891089
<packing>
10901090
<property name="title" translatable="yes">Youtube</property>
1091-
<property name="icon-name">tv-symbolic</property>
1091+
<property name="icon-name">xsi-tv-symbolic</property>
10921092
<property name="position">2</property>
10931093
</packing>
10941094
</child>
@@ -1192,7 +1192,7 @@
11921192
<object class="GtkImage">
11931193
<property name="visible">True</property>
11941194
<property name="can-focus">False</property>
1195-
<property name="icon-name">list-add-symbolic</property>
1195+
<property name="icon-name">xsi-list-add-symbolic</property>
11961196
</object>
11971197
<packing>
11981198
<property name="expand">False</property>
@@ -1236,7 +1236,7 @@
12361236
<object class="GtkImage">
12371237
<property name="visible">True</property>
12381238
<property name="can-focus">False</property>
1239-
<property name="icon-name">view-refresh-symbolic</property>
1239+
<property name="icon-name">xsi-view-refresh-symbolic</property>
12401240
</object>
12411241
<packing>
12421242
<property name="expand">False</property>
@@ -1472,7 +1472,7 @@
14721472
<object class="GtkImage">
14731473
<property name="visible">True</property>
14741474
<property name="can-focus">False</property>
1475-
<property name="icon-name">folder-symbolic</property>
1475+
<property name="icon-name">xsi-folder-symbolic</property>
14761476
</object>
14771477
</child>
14781478
</object>
@@ -2049,7 +2049,7 @@
20492049
<object class="GtkImage">
20502050
<property name="visible">True</property>
20512051
<property name="can-focus">False</property>
2052-
<property name="icon-name">view-reveal-symbolic</property>
2052+
<property name="icon-name">xsi-view-reveal-symbolic</property>
20532053
</object>
20542054
</child>
20552055
</object>
@@ -2070,7 +2070,7 @@
20702070
<object class="GtkImage">
20712071
<property name="visible">True</property>
20722072
<property name="can-focus">False</property>
2073-
<property name="icon-name">media-playback-pause-symbolic</property>
2073+
<property name="icon-name">xsi-media-playback-pause-symbolic</property>
20742074
</object>
20752075
</child>
20762076
</object>
@@ -2091,7 +2091,7 @@
20912091
<object class="GtkImage">
20922092
<property name="visible">True</property>
20932093
<property name="can-focus">False</property>
2094-
<property name="icon-name">media-playback-stop-symbolic</property>
2094+
<property name="icon-name">xsi-media-playback-stop-symbolic</property>
20952095
</object>
20962096
</child>
20972097
</object>
@@ -2144,7 +2144,7 @@
21442144
<object class="GtkImage">
21452145
<property name="visible">True</property>
21462146
<property name="can-focus">False</property>
2147-
<property name="icon-name">go-previous-symbolic</property>
2147+
<property name="icon-name">xsi-go-previous-symbolic</property>
21482148
</object>
21492149
</child>
21502150
</object>
@@ -2168,7 +2168,7 @@
21682168
<object class="GtkImage">
21692169
<property name="visible">True</property>
21702170
<property name="can-focus">False</property>
2171-
<property name="icon-name">system-search-symbolic</property>
2171+
<property name="icon-name">xsi-search-symbolic</property>
21722172
</object>
21732173
</child>
21742174
</object>
@@ -2196,7 +2196,7 @@
21962196
<object class="GtkImage">
21972197
<property name="visible">True</property>
21982198
<property name="can-focus">False</property>
2199-
<property name="icon-name">view-fullscreen-symbolic</property>
2199+
<property name="icon-name">xsi-view-fullscreen-symbolic</property>
22002200
<property name="icon_size">2</property>
22012201
</object>
22022202
</child>
@@ -2218,7 +2218,7 @@
22182218
<object class="GtkImage">
22192219
<property name="visible">True</property>
22202220
<property name="can-focus">False</property>
2221-
<property name="icon-name">open-menu-symbolic</property>
2221+
<property name="icon-name">xsi-open-menu-symbolic</property>
22222222
</object>
22232223
</child>
22242224
</object>

0 commit comments

Comments
 (0)