Fixing issue with back button

[watersofshiloah] / src / windows / source.py

diff --git a/src/windows/source.py b/src/windows/source.py
index 56a745d..fee997c 100644 (file)
--- a/src/windows/source.py
+++ b/src/windows/source.py
@@ -5,8 +5,9 @@ import gtk
 
 import constants
 import util.misc as misc_utils
+import hildonize
 import banners
-import playcontrol
+import presenter
 import stream_index
 
 import windows
@@ -44,13 +45,13 @@ class SourceSelector(windows._base.BasicWindow):
                self._buttonLayout.pack_start(self._scriptureButton, True, True)
 
                self._separator = gtk.HSeparator()
-               self._playcontrol = playcontrol.NavControl(player, store)
-               self._playcontrol.connect("jump-to", self._on_jump)
+               self._presenter = presenter.NavControl(player, store)
+               self._presenter.connect("jump-to", self._on_jump)
 
                self._layout.pack_start(self._loadingBanner.toplevel, False, False)
                self._layout.pack_start(self._buttonLayout, True, True)
                self._layout.pack_start(self._separator, False, True)
-               self._layout.pack_start(self._playcontrol.toplevel, False, True)
+               self._layout.pack_start(self._presenter.toplevel, False, True)
 
                self._window.set_title(constants.__pretty_app_name__)
 
@@ -58,7 +59,7 @@ class SourceSelector(windows._base.BasicWindow):
                windows._base.BasicWindow.show(self)
 
                self._errorBanner.toplevel.hide()
-               self._playcontrol.toplevel.hide()
+               self._presenter.toplevel.hide()
 
                self._refresh()
 
@@ -111,11 +112,17 @@ class SourceSelector(windows._base.BasicWindow):
                elif node.id == stream_index.SOURCE_SCRIPTURES:
                        Source = windows.scriptures.ScripturesWindow
                sourceWindow = Source(self._app, self._player, self._store, node)
-               sourceWindow.window.set_modal(True)
-               sourceWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       sourceWindow.window.set_modal(True)
+                       sourceWindow.window.set_transient_for(self._window)
                sourceWindow.window.set_default_size(*self._window.get_size())
+               if self._windowInFullscreen:
+                       sourceWindow.window.fullscreen()
+               else:
+                       sourceWindow.window.unfullscreen()
                sourceWindow.connect("quit", self._on_quit)
                sourceWindow.connect("jump-to", self._on_jump)
+               sourceWindow.connect("fullscreen", self._on_child_fullscreen)
                sourceWindow.show()
                return sourceWindow