projects
/
watersofshiloah
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
305d76e
)
Fixing issue with back button
author
Ed Page
<eopage@byu.net>
Sat, 22 May 2010 03:13:51 +0000
(22:13 -0500)
committer
Ed Page
<eopage@byu.net>
Sat, 22 May 2010 03:13:51 +0000
(22:13 -0500)
src/mormonchannel_gtk.py
patch
|
blob
|
history
src/windows/conferences.py
patch
|
blob
|
history
src/windows/magazines.py
patch
|
blob
|
history
src/windows/scriptures.py
patch
|
blob
|
history
src/windows/source.py
patch
|
blob
|
history
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
e05ad60
..
9320663
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-2,8
+2,6
@@
# -*- coding: utf-8 -*-
"""
# -*- coding: utf-8 -*-
"""
-@bug For some reason, the back/close button doesn't work when I nest multiple levels
-
@todo Re-use windows for better performance
@todo Make radio program updates only happen when the app has focus to reduce CPU wakes
@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
@todo Re-use windows for better performance
@todo Make radio program updates only happen when the app has focus to reduce CPU wakes
@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
diff --git
a/src/windows/conferences.py
b/src/windows/conferences.py
index
dedfc7c
..
1b31755
100644
(file)
--- a/
src/windows/conferences.py
+++ b/
src/windows/conferences.py
@@
-69,8
+69,9
@@
class ConferencesWindow(windows._base.ListWindow):
def _window_from_node(self, node):
sessionsWindow = ConferenceSessionsWindow(self._app, self._player, self._store, node)
def _window_from_node(self, node):
sessionsWindow = ConferenceSessionsWindow(self._app, self._player, self._store, node)
- sessionsWindow.window.set_modal(True)
- sessionsWindow.window.set_transient_for(self._window)
+ if not hildonize.IS_FREMANTLE_SUPPORTED:
+ sessionsWindow.window.set_modal(True)
+ sessionsWindow.window.set_transient_for(self._window)
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
@@
-133,8
+134,9
@@
class ConferenceSessionsWindow(windows._base.ListWindow):
def _window_from_node(self, node):
sessionsWindow = ConferenceTalksWindow(self._app, self._player, self._store, node)
def _window_from_node(self, node):
sessionsWindow = ConferenceTalksWindow(self._app, self._player, self._store, node)
- sessionsWindow.window.set_modal(True)
- sessionsWindow.window.set_transient_for(self._window)
+ if not hildonize.IS_FREMANTLE_SUPPORTED:
+ sessionsWindow.window.set_modal(True)
+ sessionsWindow.window.set_transient_for(self._window)
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
@@
-196,8
+198,9
@@
class ConferenceTalksWindow(windows._base.ListWindow):
def _window_from_node(self, node):
sessionsWindow = ConferenceTalkWindow(self._app, self._player, self._store, node)
def _window_from_node(self, node):
sessionsWindow = ConferenceTalkWindow(self._app, self._player, self._store, node)
- sessionsWindow.window.set_modal(True)
- sessionsWindow.window.set_transient_for(self._window)
+ if not hildonize.IS_FREMANTLE_SUPPORTED:
+ sessionsWindow.window.set_modal(True)
+ sessionsWindow.window.set_transient_for(self._window)
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
if self._windowInFullscreen:
sessionsWindow.window.fullscreen()
else:
diff --git
a/src/windows/magazines.py
b/src/windows/magazines.py
index
e46cb5d
..
7d74ab5
100644
(file)
--- a/
src/windows/magazines.py
+++ b/
src/windows/magazines.py
@@
-93,8
+93,9
@@
class MagazinesWindow(windows._base.ListWindow):
def _window_from_node(self, node):
issuesWindow = MagazineIssuesWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
issuesWindow.window.fullscreen()
else:
@@
-187,8
+188,9
@@
class MagazineIssuesWindow(windows._base.ListWindow):
def _window_from_node(self, node):
issuesWindow = MagazineArticlesWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
issuesWindow.window.fullscreen()
else:
@@
-250,8
+252,9
@@
class MagazineArticlesWindow(windows._base.ListWindow):
def _window_from_node(self, node):
issuesWindow = MagazineArticleWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
issuesWindow.window.fullscreen()
else:
diff --git
a/src/windows/scriptures.py
b/src/windows/scriptures.py
index
3626827
..
9ef47a1
100644
(file)
--- a/
src/windows/scriptures.py
+++ b/
src/windows/scriptures.py
@@
-60,8
+60,9
@@
class ScripturesWindow(windows._base.ListWindow):
def _window_from_node(self, node):
booksWindow = ScriptureBooksWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
booksWindow.window.fullscreen()
else:
@@
-124,8
+125,9
@@
class ScriptureBooksWindow(windows._base.ListWindow):
def _window_from_node(self, node):
booksWindow = ScriptureChaptersWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
booksWindow.window.fullscreen()
else:
@@
-188,8
+190,9
@@
class ScriptureChaptersWindow(windows._base.ListWindow):
def _window_from_node(self, node):
booksWindow = ScriptureChapterWindow(self._app, self._player, self._store, node)
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:
if self._windowInFullscreen:
booksWindow.window.fullscreen()
else:
diff --git
a/src/windows/source.py
b/src/windows/source.py
index
42737f4
..
fee997c
100644
(file)
--- a/
src/windows/source.py
+++ b/
src/windows/source.py
@@
-5,6
+5,7
@@
import gtk
import constants
import util.misc as misc_utils
import constants
import util.misc as misc_utils
+import hildonize
import banners
import presenter
import stream_index
import banners
import presenter
import stream_index
@@
-111,8
+112,9
@@
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)
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()
sourceWindow.window.set_default_size(*self._window.get_size())
if self._windowInFullscreen:
sourceWindow.window.fullscreen()