projects
/
watersofshiloah
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c96055
)
CHanging how I'm handling show
author
Ed Page
<eopage@byu.net>
Sat, 8 May 2010 02:02:22 +0000
(21:02 -0500)
committer
Ed Page
<eopage@byu.net>
Sat, 8 May 2010 23:19:40 +0000
(18:19 -0500)
src/mormonchannel_gtk.py
patch
|
blob
|
history
src/windows.py
patch
|
blob
|
history
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
80fb976
..
68da221
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-59,6
+59,7
@@
class MormonChannelProgram(hildonize.get_app_class()):
self._sourceSelector = windows.SourceSelector(self._player, self._store, self._index)
self._sourceSelector.window.connect("destroy", self._on_destroy)
self._sourceSelector = windows.SourceSelector(self._player, self._store, self._index)
self._sourceSelector.window.connect("destroy", self._on_destroy)
+ self._sourceSelector.show()
self._load_settings()
except:
self._index.stop()
self._load_settings()
except:
self._index.stop()
diff --git
a/src/windows.py
b/src/windows.py
index
ebd525b
..
dad198f
100644
(file)
--- a/
src/windows.py
+++ b/
src/windows.py
@@
-73,6
+73,9
@@
class BasicWindow(gobject.GObject):
def window(self):
return self._window
def window(self):
return self._window
+ def show(self):
+ self._window.show_all()
+
def save_settings(self, config, sectionName):
config.add_section(sectionName)
config.set(sectionName, "fullscreen", str(self._windowInFullscreen))
def save_settings(self, config, sectionName):
config.add_section(sectionName)
config.set(sectionName, "fullscreen", str(self._windowInFullscreen))
@@
-190,7
+193,10
@@
class SourceSelector(BasicWindow):
self._layout.pack_start(self._playcontrol.toplevel, False, True)
self._window.set_title(constants.__pretty_app_name__)
self._layout.pack_start(self._playcontrol.toplevel, False, True)
self._window.set_title(constants.__pretty_app_name__)
- self._window.show_all()
+
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._playcontrol.toplevel.hide()
self._errorBanner.toplevel.hide()
self._playcontrol.toplevel.hide()
@@
-245,6
+251,7
@@
class SourceSelector(BasicWindow):
sourceWindow.window.set_transient_for(self._window)
sourceWindow.window.set_default_size(*self._window.get_size())
sourceWindow.connect("quit", self._on_quit)
sourceWindow.window.set_transient_for(self._window)
sourceWindow.window.set_default_size(*self._window.get_size())
sourceWindow.connect("quit", self._on_quit)
+ sourceWindow.show()
gobject.type_register(SourceSelector)
gobject.type_register(SourceSelector)
@@
-312,11
+319,14
@@
class RadioWindow(BasicWindow):
self._layout.pack_start(self._radioLayout, True, True)
self._window.set_title("Radio")
self._layout.pack_start(self._radioLayout, True, True)
self._window.set_title("Radio")
- self._window.show_all()
+ self._dateShown = datetime.datetime.now()
+
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
- self._dateShown = datetime.datetime.now()
self._refresh()
def _show_loading(self):
self._refresh()
def _show_loading(self):
@@
-492,7
+502,9
@@
class ListWindow(BasicWindow):
self._layout.pack_start(self._loadingBanner.toplevel, False, False)
self._layout.pack_start(self._contentLayout, True, True)
self._layout.pack_start(self._loadingBanner.toplevel, False, False)
self._layout.pack_start(self._contentLayout, True, True)
- self._window.show_all()
+ def show(self):
+ BasicWindow.show(self)
+
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
@@
-596,6
+608,7
@@
class ConferencesWindow(ListWindow):
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferencesWindow)
gobject.type_register(ConferencesWindow)
@@
-663,6
+676,7
@@
class ConferenceSessionsWindow(ListWindow):
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferenceSessionsWindow)
gobject.type_register(ConferenceSessionsWindow)
@@
-730,6
+744,7
@@
class ConferenceTalksWindow(ListWindow):
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
sessionsWindow.window.set_default_size(*self._window.get_size())
sessionsWindow.connect("quit", self._on_quit)
sessionsWindow.connect("home", self._on_home)
+ sessionsWindow.show()
gobject.type_register(ConferenceTalksWindow)
gobject.type_register(ConferenceTalksWindow)
@@
-755,6
+770,9
@@
class ConferenceTalkWindow(BasicWindow):
self._layout.pack_start(self._presenterNavigation.toplevel, True, True)
self._window.set_title("Talk")
self._layout.pack_start(self._presenterNavigation.toplevel, True, True)
self._window.set_title("Talk")
+
+ def show(self):
+ BasicWindow.show(self)
self._window.show_all()
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()
self._window.show_all()
self._errorBanner.toplevel.hide()
self._loadingBanner.toplevel.hide()