X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fwindows%2Fsource.py;h=fee997ca3524de57a50728b467ababac821d22aa;hp=42c72fc1fec6e59d9c732b50abcbaee9f1274fca;hb=48395f16da1ee02cec1eea38c46072c1fd957a16;hpb=be76b644bf353e9cdd223cb17e4c19f296190366 diff --git a/src/windows/source.py b/src/windows/source.py index 42c72fc..fee997c 100644 --- 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() @@ -80,7 +81,8 @@ class SourceSelector(windows._base.BasicWindow): image = self._store.get_image_from_store(self._store.STORE_LOOKUP[icon]) label = gtk.Label() - label.set_text(message) + label.set_use_markup(True) + label.set_markup("%s" % message) buttonLayout = gtk.HBox(False, 5) buttonLayout.pack_start(image, False, False) @@ -110,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