Fixing issue with back button

[watersofshiloah] / src / windows / magazines.py

diff --git a/src/windows/magazines.py b/src/windows/magazines.py
index 095c72f..7d74ab5 100644 (file)
--- a/src/windows/magazines.py
+++ b/src/windows/magazines.py
@@ -93,16 +93,17 @@ class MagazinesWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                issuesWindow = MagazineIssuesWindow(self._app, self._player, self._store, node)
-               issuesWindow.window.set_modal(True)
-               issuesWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       issuesWindow.window.set_modal(True)
+                       issuesWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        issuesWindow.window.fullscreen()
                else:
                        issuesWindow.window.unfullscreen()
-               issuesWindow.connect("quit", self._on_quit)
-               issuesWindow.connect("home", self._on_home)
-               issuesWindow.connect("jump-to", self._on_jump)
-               issuesWindow.connect("fullscreen", self._on_child_fullscreen)
+               issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit)
+               issuesWindow.connect_auto(issuesWindow, "home", self._on_home)
+               issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump)
+               issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen)
                issuesWindow.show()
                return issuesWindow
 
@@ -187,16 +188,17 @@ class MagazineIssuesWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                issuesWindow = MagazineArticlesWindow(self._app, self._player, self._store, node)
-               issuesWindow.window.set_modal(True)
-               issuesWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       issuesWindow.window.set_modal(True)
+                       issuesWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        issuesWindow.window.fullscreen()
                else:
                        issuesWindow.window.unfullscreen()
-               issuesWindow.connect("quit", self._on_quit)
-               issuesWindow.connect("home", self._on_home)
-               issuesWindow.connect("jump-to", self._on_jump)
-               issuesWindow.connect("fullscreen", self._on_child_fullscreen)
+               issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit)
+               issuesWindow.connect_auto(issuesWindow, "home", self._on_home)
+               issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump)
+               issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen)
                issuesWindow.show()
                return issuesWindow
 
@@ -250,16 +252,17 @@ class MagazineArticlesWindow(windows._base.ListWindow):
 
        def _window_from_node(self, node):
                issuesWindow = MagazineArticleWindow(self._app, self._player, self._store, node)
-               issuesWindow.window.set_modal(True)
-               issuesWindow.window.set_transient_for(self._window)
+               if not hildonize.IS_FREMANTLE_SUPPORTED:
+                       issuesWindow.window.set_modal(True)
+                       issuesWindow.window.set_transient_for(self._window)
                if self._windowInFullscreen:
                        issuesWindow.window.fullscreen()
                else:
                        issuesWindow.window.unfullscreen()
-               issuesWindow.connect("quit", self._on_quit)
-               issuesWindow.connect("home", self._on_home)
-               issuesWindow.connect("jump-to", self._on_jump)
-               issuesWindow.connect("fullscreen", self._on_child_fullscreen)
+               issuesWindow.connect_auto(issuesWindow, "quit", self._on_quit)
+               issuesWindow.connect_auto(issuesWindow, "home", self._on_home)
+               issuesWindow.connect_auto(issuesWindow, "jump-to", self._on_jump)
+               issuesWindow.connect_auto(issuesWindow, "fullscreen", self._on_child_fullscreen)
                issuesWindow.show()
                return issuesWindow