How have I let this be broken on Maemo 4.1?

[watersofshiloah] / src / windows / _base.py

diff --git a/src/windows/_base.py b/src/windows/_base.py
index aeccf0b..9c28eda 100644 (file)
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -58,7 +58,7 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
        def __init__(self, app, player, store):
                gobject.GObject.__init__(self)
                self._isDestroyed = False
-               self._isPortrait = True
+               self._isPortrait = hildonize.IS_FREMANTLE_SUPPORTED
 
                self._app = app
                self._player = player
@@ -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)
@@ -111,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):
@@ -474,6 +481,7 @@ class PresenterWindow(BasicWindow):
                                self._node.title,
                                self._node.subtitle,
                        )
+               return didChange
 
        @property
        def _active(self):
@@ -542,6 +550,7 @@ class PresenterWindow(BasicWindow):
        def _on_player_error(self, player, err, debug):
                assert not self._isDestroyed
                _moduleLogger.error("%r - %r" % (err, debug))
+               self._errorBanner.push_message(err)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_navigating(self, widget, navState):
@@ -636,7 +645,7 @@ class AboutWindow(BasicWindow):
 
                self._titleLabel = gtk.Label()
                self._titleLabel.set_markup("""
-<big>Mormon Channel</big>
+<big><b>Waters of Shiloah</b></big>
 <i>Maemo Edition</i>
 Version %s
 """ % (constants.__version__, ))
@@ -644,19 +653,30 @@ Version %s
 
                self._copyLabel = gtk.Label()
                self._copyLabel.set_markup("""
-<small>(c) 2010 Intellectual Reserve, Inc.
-All rights reserved.</small>
+<small>Developed by: Ed Page
+Images by: Various Sources, See COPYING for author and license information (mix of various CC licenses, commercial, and non-commercial
+This application nor various images are not endorsed by The Church of Jesus Christ of Latter-day Saints</small>
 """)
                self._copyLabel.set_property("justify", gtk.JUSTIFY_CENTER)
 
-               self._linkButton = gtk.LinkButton("LDS.org")
-               self._linkButton.set_uri("http://www.lds.org")
+               self._linkButton = gtk.LinkButton("http://watersofshiloah.garage.maemo.org")
+               self._linkButton.set_label("Waters of Shiloah")
                self._linkButton.connect("clicked", self._on_website)
 
+               self._radioLinkButton = gtk.LinkButton("http://radio.lds.org")
+               self._radioLinkButton.set_label("Mormon Channel")
+               self._radioLinkButton.connect("clicked", self._on_website)
+
+               self._ldsLinkButton = gtk.LinkButton("http://www.lds.org")
+               self._ldsLinkButton.set_label("LDS.org")
+               self._ldsLinkButton.connect("clicked", self._on_website)
+
                self._spacedLayout = gtk.VBox(True)
                self._spacedLayout.pack_start(self._titleLabel, False, False)
                self._spacedLayout.pack_start(self._copyLabel, False, False)
                self._spacedLayout.pack_start(self._linkButton, False, False)
+               self._spacedLayout.pack_start(self._radioLinkButton, False, False)
+               self._spacedLayout.pack_start(self._ldsLinkButton, False, False)
 
                self._separator = gtk.HSeparator()
                self._presenter = presenter.NavControl(self._player, self._store)