Added shortcuts support to zap through channels (#232)

usr/lib/hypnotix/hypnotix.py

@@ -70,6 +70,28 @@
  "dblp": "double, planar",
 }
 
+class ChannelWidget(Gtk.ListBoxRow):
+ """ A custom widget for displaying and holding channel data. """
+
+ def __init__(self, channel, logo, **kwargs):
+ super().__init__(**kwargs)
+ self._channel = channel
+ self.set_tooltip_text(channel.name)
+
+ frame = Gtk.Frame()
+ label = Gtk.Label(channel.name)
+ label.set_max_width_chars(30)
+ label.set_ellipsize(Pango.EllipsizeMode.END)
+ box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, border_width=6)
+ box.pack_start(logo, False, False, 0)
+ box.pack_start(label, False, False, 0)
+ box.set_spacing(6)
+ frame.add(box)
+ self.add(frame)
+
+ @property
+ def channel(self):
+ return self._channel
 
 class MyApplication(Gtk.Application):
  # Main initialization routine
@@ -113,9 +135,6 @@ def __init__(self, application):
  self.video_properties = {}
  self.audio_properties = {}
 
- self.x_pos = 0
- self.y_pos = 0
-
  # Used for redownloading timer
  self.reload_timeout_sec = 60 * 5
  self._timerid = -1
@@ -182,7 +201,7 @@ def __init__(self, application):
  "movies_label",
  "series_label",
  "categories_flowbox",
- "channels_flowbox",
+ "channels_listbox",
  "vod_flowbox",
  "episodes_box",
  "stop_button",
@@ -279,15 +298,14 @@ def __init__(self, application):
 
  self.close_info_button.connect("clicked", self.on_close_info_button)
 
- self.channels_flowbox.add_events(Gdk.EventMask.POINTER_MOTION_MASK)
- self.channels_flowbox.connect("motion-notify-event", self.on_mouse_hover)
+ self.channels_listbox.connect("row-activated", self.on_channel_activated)
 
  # Settings widgets
  self.bind_setting_widget("user-agent", self.useragent_entry)
  self.bind_setting_widget("http-referer", self.referer_entry)
  self.bind_setting_widget("mpv-options", self.mpv_entry)
 
- # dark mode
+ # Dark mode
  prefer_dark_mode = self.settings.get_boolean("prefer-dark-mode")
  Gtk.Settings.get_default().set_property("gtk-application-prefer-dark-theme", prefer_dark_mode)
  self.darkmode_switch.set_active(prefer_dark_mode)
@@ -448,27 +466,17 @@ def show_channels(self, channels):
  self.navigate_to("channels_page")
  if self.content_type == TV_GROUP:
  self.sidebar.show()
+ for child in self.channels_listbox.get_children():
+ self.channels_listbox.remove(child)
+
  logos_to_refresh = []
- for child in self.channels_flowbox.get_children():
- self.channels_flowbox.remove(child)
  for channel in channels:
- button = Gtk.Button()
- button.set_tooltip_text(channel.name)
- button.connect("clicked", self.on_channel_button_clicked, channel)
- label = Gtk.Label()
- label.set_text(channel.name)
- label.set_max_width_chars(30)
- label.set_ellipsize(Pango.EllipsizeMode.END)
- box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
  image = Gtk.Image().new_from_surface(self.get_channel_surface(channel.logo_path))
  logos_to_refresh.append((channel, image))
- box.pack_start(image, False, False, 0)
- box.pack_start(label, False, False, 0)
- box.set_spacing(6)
- button.add(box)
- self.channels_flowbox.add(button)
- self.channels_flowbox.show_all()
- self.visible_search_results = len(self.channels_flowbox.get_children())
+ self.channels_listbox.add(ChannelWidget(channel, image))
+
+ self.channels_listbox.show_all()
+ self.visible_search_results = len(self.channels_listbox.get_children())
  if len(logos_to_refresh) > 0:
  self.download_channel_logos(logos_to_refresh)
  else:
@@ -618,7 +626,7 @@ def on_go_back_button(self, widget):
  if self.active_channel is not None:
  self.playback_bar.show()
  if self.active_group and self.back_page == "categories_page":
- self.init_channels_flowbox()
+ self.init_channels_listbox()
 
  def on_search_button_toggled(self, widget):
  if self.search_button.get_active():
@@ -646,10 +654,10 @@ def filter_func(child):
  return False
 
  self.visible_search_results = 0
- self.channels_flowbox.set_filter_func(filter_func)
- if not self.channels_flowbox.get_children():
+ self.channels_listbox.set_filter_func(filter_func)
+ if not self.channels_listbox.get_children():
  self.show_channels(self.active_provider.channels)
- print("Filtering %d channel names containing the string '%s'..." % (len(self.channels_flowbox.get_children()), self.latest_search_bar_text))
+ print("Filtering %d channel names containing the string '%s'..." % (len(self.channels_listbox.get_children()), self.latest_search_bar_text))
  if self.visible_search_results == 0:
  self.status(_("No channels found"))
  else:
@@ -658,12 +666,12 @@ def filter_func(child):
  self.search_bar.grab_focus_without_selecting()
  self.navigate_to("channels_page")
 
- def init_channels_flowbox(self):
+ def init_channels_listbox(self):
  self.latest_search_bar_text = None
  self.active_group = None
- for child in self.channels_flowbox.get_children():
- self.channels_flowbox.remove(child)
- self.channels_flowbox.invalidate_filter()
+ for child in self.channels_listbox.get_children():
+ self.channels_listbox.remove(child)
+ self.channels_listbox.invalidate_filter()
  self.visible_search_results = 0
 
  @idle_function
@@ -774,15 +782,19 @@ def open_keyboard_shortcuts(self, widget):
  window.set_title(_("Hypnotix"))
  window.show()
 
- def on_channel_button_clicked(self, widget, channel):
- child = self.channels_flowbox.get_child_at_pos(self.x_pos, self.y_pos)
- self.channels_flowbox.select_child(child)
- self.active_channel = channel
- self.play_async(channel)
+ def on_channel_activated(self, box, widget):
+ self.active_channel = widget.channel
+ self.play_async(self.active_channel)
 
- def on_mouse_hover(self, widget, event):
- self.x_pos = event.x
- self.y_pos = event.y
+ def on_prev_channel(self):
+ if self.stack.get_visible_child_name() == "channels_page":
+ self.channels_listbox.do_move_cursor(self.channels_listbox, Gtk.MovementStep.DISPLAY_LINES, -1)
+ self.channels_listbox.do_activate_cursor_row(self.channels_listbox)
+
+ def on_next_channel(self):
+ if self.stack.get_visible_child_name() == "channels_page":
+ self.channels_listbox.do_move_cursor(self.channels_listbox, Gtk.MovementStep.DISPLAY_LINES, 1)
+ self.channels_listbox.do_activate_cursor_row(self.channels_listbox)
 
  @async_function
  def play_async(self, channel):
@@ -1056,7 +1068,7 @@ def refresh_providers_page(self):
  def on_provider_selected(self, widget, provider):
  self.active_provider = provider
  self.settings.set_string("active-provider", provider.name)
- self.init_channels_flowbox()
+ self.init_channels_listbox()
  self.navigate_to("landing_page")
 
  def on_preferences_button(self, widget):
@@ -1368,12 +1380,10 @@ def on_key_press_event(self, widget, event):
  (event.keyval == Gdk.KEY_f and not ctrl and type(widget.get_focus()) != gi.repository.Gtk.SearchEntry) or \
  (self.fullscreen and event.keyval == Gdk.KEY_Escape):
  self.toggle_fullscreen()
- # elif event.keyval == Gdk.KEY_Left:
- # # Left of in the list
- # pass
- # elif event.keyval == Gdk.KEY_Right:
- # # Right of in the list
- # pass
+ elif event.keyval == Gdk.KEY_Left:
+ self.on_prev_channel()
+ elif event.keyval == Gdk.KEY_Right:
+ self.on_next_channel()
  # elif event.keyval == Gdk.KEY_Up:
  # # Up of in the list
  # pass

usr/share/hypnotix/hypnotix.ui

@@ -11,6 +11,7 @@
  <property name="can_focus">False</property>
  <property name="default_width">600</property>
  <property name="default_height">500</property>
+ <property name="window_position">center</property>
  <property name="icon_name">hypnotix</property>
  <child type="titlebar">
  <object class="GtkHeaderBar" id="headerbar">
@@ -457,12 +458,10 @@
  <property name="visible">True</property>
  <property name="can_focus">False</property>
  <child>
- <object class="GtkFlowBox" id="channels_flowbox">
+ <object class="GtkListBox" id="channels_listbox">
  <property name="visible">True</property>
  <property name="can_focus">False</property>
  <property name="margin_right">12</property>
- <property name="min_children_per_line">1</property>
- <property name="max_children_per_line">1</property>
  </object>
  </child>
  </object>

usr/share/hypnotix/shortcuts.ui

@@ -26,6 +26,13 @@
  <property name="title" translatable="yes">Stream Information</property>
  </object>
  </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="visible">1</property>
+ <property name="accelerator">Left Right</property>
+ <property name="title" translatable="yes">Play previous/next channel</property>
+ </object>
+ </child>
  <child>
  <object class="GtkShortcutsShortcut">
  <property name="visible">1</property>