Fixing issue with back button

[watersofshiloah] / src / windows / scriptures.py

diff --git a/src/windows/scriptures.py b/src/windows/scriptures.py
index ef4a0b5..9ef47a1 100644 (file)
--- a/src/windows/scriptures.py
+++ b/src/windows/scriptures.py
@@ -60,16 +60,17 @@ class ScripturesWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                booksWindow = ScriptureBooksWindow(self._app, self._player, self._store, node)
-               booksWindow.window.set_modal(True)
-               booksWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       booksWindow.window.set_modal(True)
+                       booksWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        booksWindow.window.fullscreen()
                else:
                        booksWindow.window.unfullscreen()
-               booksWindow.connect("quit", self._on_quit)
-               booksWindow.connect("home", self._on_home)
-               booksWindow.connect("jump-to", self._on_jump)
-               booksWindow.connect("fullscreen", self._on_child_fullscreen)
+               booksWindow.connect_auto(booksWindow, "quit", self._on_quit)
+               booksWindow.connect_auto(booksWindow, "home", self._on_home)
+               booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump)
+               booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen)
                booksWindow.show()
                return booksWindow
 
@@ -124,16 +125,17 @@ class ScriptureBooksWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                booksWindow = ScriptureChaptersWindow(self._app, self._player, self._store, node)
-               booksWindow.window.set_modal(True)
-               booksWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       booksWindow.window.set_modal(True)
+                       booksWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        booksWindow.window.fullscreen()
                else:
                        booksWindow.window.unfullscreen()
-               booksWindow.connect("quit", self._on_quit)
-               booksWindow.connect("home", self._on_home)
-               booksWindow.connect("jump-to", self._on_jump)
-               booksWindow.connect("fullscreen", self._on_child_fullscreen)
+               booksWindow.connect_auto(booksWindow, "quit", self._on_quit)
+               booksWindow.connect_auto(booksWindow, "home", self._on_home)
+               booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump)
+               booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen)
                booksWindow.show()
                return booksWindow
 
@@ -188,16 +190,17 @@ class ScriptureChaptersWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                booksWindow = ScriptureChapterWindow(self._app, self._player, self._store, node)
-               booksWindow.window.set_modal(True)
-               booksWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       booksWindow.window.set_modal(True)
+                       booksWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        booksWindow.window.fullscreen()
                else:
                        booksWindow.window.unfullscreen()
-               booksWindow.connect("quit", self._on_quit)
-               booksWindow.connect("home", self._on_home)
-               booksWindow.connect("jump-to", self._on_jump)
-               booksWindow.connect("fullscreen", self._on_child_fullscreen)
+               booksWindow.connect_auto(booksWindow, "quit", self._on_quit)
+               booksWindow.connect_auto(booksWindow, "home", self._on_home)
+               booksWindow.connect_auto(booksWindow, "jump-to", self._on_jump)
+               booksWindow.connect_auto(booksWindow, "fullscreen", self._on_child_fullscreen)
                booksWindow.show()
                return booksWindow