Breaking out the various windows into separate files

[watersofshiloah] / src / mormonchannel_gtk.py

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index fec2469..967db54 100755 (executable)
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,14 +2,12 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Restructure so there is a windows/ folder with a file per source
 @todo Add additional sources
-@todo Track recent
-@todo Sequential playback
-@todo Enable Call Monitor
-@todo Audio seek bar
-@todo Persisted Pause
-@todo Favorites
+@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 Podcast integration
 """
@@ -21,6 +19,8 @@ import logging
 import ConfigParser
 
 import gobject
+import dbus
+import dbus.mainloop.glib
 import gtk
 
 try:
@@ -64,7 +64,7 @@ class MormonChannelProgram(hildonize.get_app_class()):
                                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()
@@ -138,6 +138,7 @@ class MormonChannelProgram(hildonize.get_app_class()):
 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()