projects
/
watersofshiloah
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
todo list work
[watersofshiloah]
/
src
/
mormonchannel_gtk.py
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
f3e541e
..
a237289
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-2,10
+2,12
@@
# -*- coding: utf-8 -*-
"""
# -*- coding: utf-8 -*-
"""
-@todo Fix scrollto for Fremantle
-@todo backgrounds need some resizing
-@todo Re-use windows for better performance
@bug For some reason, the back/close button doesn't work when I nest multiple levels
@bug For some reason, the back/close button doesn't work when I nest multiple levels
+@bug When switching from conference to magazines, it randomly jumps around and duplicates windows
+@bug fullscreen does not propgate
+@todo Update the program time shown
+
+@todo Re-use windows for better performance
@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
@todo Track recent
@todo Persisted Pause
@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
@todo Track recent
@todo Persisted Pause
@@
-13,6
+15,7
@@
@todo Sleep timer
@todo Reverse order option. Toggle between playing ascending/descending chronological order
@todo Podcast integration
@todo Sleep timer
@todo Reverse order option. Toggle between playing ascending/descending chronological order
@todo Podcast integration
+ @todo Default with BYU Devotionals, http://speeches.byu.edu/?act=help&page=podcast
"""
from __future__ import with_statement
"""
from __future__ import with_statement
@@
-110,25
+113,26
@@
class MormonChannelProgram(hildonize.get_app_class()):
@misc_utils.log_exception(_moduleLogger)
def _on_destroy(self, widget = None, data = None):
@misc_utils.log_exception(_moduleLogger)
def _on_destroy(self, widget = None, data = None):
- self.quit()
+ try:
+ self.quit()
+ finally:
+ gtk.main_quit()
def quit(self):
def quit(self):
- try:
- self._save_settings()
+ self._save_settings()
- self._index.stop()
- self._store.stop()
+ self._player.stop()
+ self._index.stop()
+ self._store.stop()
- try:
- self._deviceState.close()
- except AttributeError:
- pass # Either None or close was removed (in Fremantle)
- try:
- self._osso_c.close()
- except AttributeError:
- pass # Either None or close was removed (in Fremantle)
- finally:
- gtk.main_quit()
+ try:
+ self._deviceState.close()
+ except AttributeError:
+ pass # Either None or close was removed (in Fremantle)
+ try:
+ self._osso_c.close()
+ except AttributeError:
+ pass # Either None or close was removed (in Fremantle)
@misc_utils.log_exception(_moduleLogger)
def _on_show_about(self, widget = None, data = None):
@misc_utils.log_exception(_moduleLogger)
def _on_show_about(self, widget = None, data = None):
@@
-150,7
+154,7
@@
def run():
gtk.gdk.threads_init()
l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
gtk.gdk.threads_init()
l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- hildonize.set_application_title(constants.__pretty_app_name__)
+ hildonize.set_application_name("FMRadio") # Playback while silent on Maemo 5
app = MormonChannelProgram()
if not PROFILE_STARTUP:
try:
app = MormonChannelProgram()
if not PROFILE_STARTUP:
try:
@@
-158,6
+162,8
@@
def run():
except KeyboardInterrupt:
app.quit()
raise
except KeyboardInterrupt:
app.quit()
raise
+ else:
+ app.quit()
if __name__ == "__main__":
if __name__ == "__main__":