projects
/
watersofshiloah
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding additional sources
[watersofshiloah]
/
src
/
mormonchannel_gtk.py
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
1b18191
..
fb2132d
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-2,11
+2,13
@@
# -*- coding: utf-8 -*-
"""
# -*- coding: utf-8 -*-
"""
-@todo Restructure so there is a windows/ folder with a file per source
-@todo Add additional sources
-@bug All connect's need disconnects or else we will leak a bunch of objects
-@todo Track recent
+@todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
+ @todo Track recent
+ @todo Persisted Pause
+ @todo Favorites
+@todo Sleep timer
@todo Reverse order option. Toggle between playing ascending/descending chronological order
@todo Reverse order option. Toggle between playing ascending/descending chronological order
+@todo Podcast integration
"""
from __future__ import with_statement
"""
from __future__ import with_statement
@@
-16,6
+18,8
@@
import logging
import ConfigParser
import gobject
import ConfigParser
import gobject
+import dbus
+import dbus.mainloop.glib
import gtk
try:
import gtk
try:
@@
-47,7
+51,6
@@
class MormonChannelProgram(hildonize.get_app_class()):
self._index.start()
try:
self._index.start()
try:
-
if not hildonize.IS_HILDON_SUPPORTED:
_moduleLogger.info("No hildonization support")
if not hildonize.IS_HILDON_SUPPORTED:
_moduleLogger.info("No hildonization support")
@@
-60,7
+63,7
@@
class MormonChannelProgram(hildonize.get_app_class()):
self._osso_c = None
self._deviceState = None
self._osso_c = None
self._deviceState = None
- self._sourceSelector = windows.SourceSelector(self._player, self._store, self._index)
+ self._sourceSelector = windows.source.SourceSelector(self._player, self._store, self._index)
self._sourceSelector.window.connect("destroy", self._on_destroy)
self._sourceSelector.show()
self._load_settings()
self._sourceSelector.window.connect("destroy", self._on_destroy)
self._sourceSelector.show()
self._load_settings()
@@
-134,6
+137,7
@@
class MormonChannelProgram(hildonize.get_app_class()):
def run():
gobject.threads_init()
gtk.gdk.threads_init()
def run():
gobject.threads_init()
gtk.gdk.threads_init()
+ l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
hildonize.set_application_title(constants.__pretty_app_name__)
app = MormonChannelProgram()
hildonize.set_application_title(constants.__pretty_app_name__)
app = MormonChannelProgram()