Continually update the selected row in the radio program, switching to a new day...

[watersofshiloah] / src / windows / _base.py

diff --git a/src/windows/_base.py b/src/windows/_base.py
index 721aeec..96ed2ec 100644 (file)
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -143,6 +143,7 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                        event.get_state() & gtk.gdk.CONTROL_MASK
                ):
                        self.emit("quit")
+                       self._window.destroy()
                elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
                        with open(constants._user_logpath_, "r") as f:
                                logLines = f.xreadlines()
@@ -188,11 +189,11 @@ class ListWindow(BasicWindow):
                        if column is not None:
                                self._treeView.append_column(column)
 
-               viewport = gtk.Viewport()
-               viewport.add(self._treeView)
+               self._viewport = gtk.Viewport()
+               self._viewport.add(self._treeView)
 
                self._treeScroller = gtk.ScrolledWindow()
-               self._treeScroller.add(viewport)
+               self._treeScroller.add(self._viewport)
                self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
                self._treeScroller = hildonize.hildonize_scrollwindow(self._treeScroller)
 
@@ -274,6 +275,10 @@ class ListWindow(BasicWindow):
                window = self._window_from_node(child)
                window.jump_to(node)
 
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_delay_scroll(self, *args):
+               self._scroll_to_row()
+
        def _show_loading(self):
                animationPath = self._store.STORE_LOOKUP["loading"]
                animation = self._store.get_pixbuf_animation_from_store(animationPath)
@@ -291,9 +296,30 @@ class ListWindow(BasicWindow):
                if rowIndex < 0:
                        return
                path = (rowIndex, )
-               self._treeView.scroll_to_cell(path)
                self._treeView.get_selection().select_path(path)
 
+       def _scroll_to_row(self):
+               rowIndex = self._get_current_row()
+               if rowIndex < 0:
+                       return
+
+               path = (rowIndex, )
+               self._treeView.scroll_to_cell(path)
+
+               treeViewHeight = self._treeView.get_allocation().height
+               viewportHeight = self._viewport.get_allocation().height
+
+               viewsPerPort = treeViewHeight / float(viewportHeight)
+               maxRows = len(self._model)
+               percentThrough = rowIndex / float(maxRows)
+               dxByIndex = int(viewsPerPort * percentThrough * viewportHeight)
+
+               dxMax = max(treeViewHeight - viewportHeight, 0)
+
+               dx = min(dxByIndex, dxMax)
+               adjustment = self._treeScroller.get_vadjustment()
+               adjustment.value = dx
+
 
 class PresenterWindow(BasicWindow):
 
@@ -399,9 +425,9 @@ class PresenterWindow(BasicWindow):
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):
                if not self._active or node in [None, self._node]:
-                       self._playerNode = player.node
+                       self._playerNode = node
                        return
-               self._playerNode = player.node
+               self._playerNode = node
                self.emit("jump-to", node)
                self._window.destroy()