From: Ed Page <eopage@byu.net>
Date: Tue, 11 May 2010 03:26:10 +0000 (-0500)
Subject: Switching over to the nav box plus a bug fix
X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=2e250b2db82727fadec7983391f5882ba1240fd3

Switching over to the nav box plus a bug fix
---

diff --git a/src/playcontrol.py b/src/playcontrol.py
index f9bf348..9f55bd9 100644
--- a/src/playcontrol.py
+++ b/src/playcontrol.py
@@ -54,7 +54,7 @@ class NavControl(gobject.GObject):
 
 		self._layout = gtk.HBox()
 		self._layout.pack_start(self._controlBox.toplevel, False, False)
-		self._layout.pack_start(self._displayBox.toplevel, False, True)
+		self._layout.pack_start(self._displayBox.toplevel, True, True)
 
 	def refresh(self):
 		if not self._player.title:
diff --git a/src/windows.py b/src/windows.py
index c52ee3f..ba3f65d 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -32,6 +32,11 @@ class BasicWindow(gobject.GObject):
 			gobject.TYPE_NONE,
 			(),
 		),
+		'jump-to' : (
+			gobject.SIGNAL_RUN_LAST,
+			gobject.TYPE_NONE,
+			(gobject.TYPE_PYOBJECT, ),
+		),
 		'rotate' : (
 			gobject.SIGNAL_RUN_LAST,
 			gobject.TYPE_NONE,
@@ -144,6 +149,12 @@ class BasicWindow(gobject.GObject):
 		self._window.destroy()
 
 	@misc_utils.log_exception(_moduleLogger)
+	def _on_jump(self, source, node):
+		_moduleLogger.error("Jump is not implemented")
+		self.emit("jump-to", node)
+		self._window.destroy()
+
+	@misc_utils.log_exception(_moduleLogger)
 	def _on_quit(self, *args):
 		self.emit("quit")
 		self._window.destroy()
@@ -185,7 +196,7 @@ class SourceSelector(BasicWindow):
 		self._buttonLayout.pack_start(self._magazineWrapper, True, True)
 		self._buttonLayout.pack_start(self._scriptureWrapper, True, True)
 
-		self._playcontrol = playcontrol.PlayControl(player, store)
+		self._playcontrol = playcontrol.NavControl(player, store)
 
 		self._layout.pack_start(self._loadingBanner.toplevel, False, False)
 		self._layout.pack_start(self._buttonLayout, True, True)
@@ -489,7 +500,9 @@ class ListWindow(BasicWindow):
 		self._treeScroller.add(self._treeView)
 		self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
-		self._playcontrol = playcontrol.PlayControl(self._player, self._store)
+		self._playcontrol = playcontrol.NavControl(self._player, self._store)
+		self._playcontrol.connect("home", self._on_home)
+		self._playcontrol.connect("jump-to", self._on_jump)
 
 		self._contentLayout = gtk.VBox(False)
 		self._contentLayout.pack_start(self._treeScroller, True, True)
@@ -784,7 +797,7 @@ class ConferenceTalkWindow(BasicWindow):
 
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_player_state_change(self, player, newState):
-		if self._headerNavigation.is_active() or self._presenterNavigation.is_active():
+		if self._presenterNavigation.is_active():
 			return
 
 		if newState == "play":