Fixing some orientation issues

[watersofshiloah] / src / windows / _base.py

diff --git a/src/windows/_base.py b/src/windows/_base.py
index cbd7ca8..c38165a 100644 (file)
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -95,6 +95,10 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                        menuBar.append(helpMenuItem)
 
                        self._layout.pack_start(menuBar, False, False)
+                       menuBar = hildonize.hildonize_menu(
+                               self._window,
+                               menuBar,
+                       )
                else:
                        aboutMenuItem = gtk.Button("About")
                        aboutMenuItem.connect("clicked", self._on_about)
@@ -103,10 +107,6 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                        appMenu.append(aboutMenuItem)
                        appMenu.show_all()
                        self._window.set_app_menu(appMenu)
-               menuBar = hildonize.hildonize_menu(
-                       self._window,
-                       menuBar,
-               )
 
                self._layout.pack_start(self._errorBanner.toplevel, False, True)
 
@@ -115,7 +115,10 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                return self._window
 
        def show(self):
-               hildonize.window_to_portrait(self._window)
+               if self._isPortrait:
+                       hildonize.window_to_portrait(self._window)
+               else:
+                       hildonize.window_to_landscape(self._window)
                self._window.show_all()
 
        def save_settings(self, config, sectionName):
@@ -478,6 +481,7 @@ class PresenterWindow(BasicWindow):
                                self._node.title,
                                self._node.subtitle,
                        )
+               return didChange
 
        @property
        def _active(self):