X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fmormonchannel_gtk.py;h=f3e541e1136bf117286e01b7c8c9e76ed32582c7;hp=76dd812be2291e1f5649ab9d8ff7af8a6535a319;hb=9081b983a67017f0815b8540072a1265c6b5d566;hpb=843b880f953941bcb61a66699488589c0f764e19

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index 76dd812..f3e541e 100755
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,9 +2,10 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Restructure so there is a windows/ folder with a file per source
-@todo Add additional sources
-@todo Audio seek bar
+@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
 @todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
 	@todo Track recent
 	@todo Persisted Pause
@@ -16,6 +17,7 @@
 
 from __future__ import with_statement
 
+import os
 import gc
 import logging
 import ConfigParser
@@ -48,10 +50,13 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
 	def __init__(self):
 		super(MormonChannelProgram, self).__init__()
-		self._store = imagestore.ImageStore("../data", "../data")
+		currentPath = os.path.abspath(__file__)
+		storePath = os.path.join(os.path.split(os.path.dirname(currentPath))[0], "data")
+		self._store = imagestore.ImageStore(storePath, constants._cache_path_)
 		self._index = stream_index.AudioIndex()
 		self._player = player.Player(self._index)
 
+		self._store.start()
 		self._index.start()
 		try:
 			if not hildonize.IS_HILDON_SUPPORTED:
@@ -66,12 +71,14 @@ 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, self._player, self._store, self._index)
 			self._sourceSelector.window.connect("destroy", self._on_destroy)
+			self._sourceSelector.window.set_default_size(400, 800)
 			self._sourceSelector.show()
 			self._load_settings()
 		except:
 			self._index.stop()
+			self._store.stop()
 			raise
 
 	def _save_settings(self):
@@ -110,6 +117,7 @@ class MormonChannelProgram(hildonize.get_app_class()):
 			self._save_settings()
 
 			self._index.stop()
+			self._store.stop()
 
 			try:
 				self._deviceState.close()