projects
/
watersofshiloah
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The radio was in MST but the UI selected as if it was in local time. An
[watersofshiloah]
/
src
/
mormonchannel_gtk.py
diff --git
a/src/mormonchannel_gtk.py
b/src/mormonchannel_gtk.py
index
fb2132d
..
f2b7166
100755
(executable)
--- a/
src/mormonchannel_gtk.py
+++ b/
src/mormonchannel_gtk.py
@@
-2,6
+2,10
@@
# -*- coding: utf-8 -*-
"""
# -*- coding: utf-8 -*-
"""
+@todo Fix scrollto for Fremantle
+@todo backgrounds need some resizing
+@todo Icons on source selector need work
+@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
@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
+17,7
@@
from __future__ import with_statement
from __future__ import with_statement
+import os
import gc
import logging
import ConfigParser
import gc
import logging
import ConfigParser
@@
-45,10
+50,13
@@
class MormonChannelProgram(hildonize.get_app_class()):
def __init__(self):
super(MormonChannelProgram, self).__init__()
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._index = stream_index.AudioIndex()
self._player = player.Player(self._index)
+ self._store.start()
self._index.start()
try:
if not hildonize.IS_HILDON_SUPPORTED:
self._index.start()
try:
if not hildonize.IS_HILDON_SUPPORTED:
@@
-63,12
+71,14
@@
class MormonChannelProgram(hildonize.get_app_class()):
self._osso_c = None
self._deviceState = None
self._osso_c = None
self._deviceState = None
- self._sourceSelector = windows.source.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.connect("destroy", self._on_destroy)
+ self._sourceSelector.window.set_default_size(400, 800)
self._sourceSelector.show()
self._load_settings()
except:
self._index.stop()
self._sourceSelector.show()
self._load_settings()
except:
self._index.stop()
+ self._store.stop()
raise
def _save_settings(self):
raise
def _save_settings(self):
@@
-107,6
+117,7
@@
class MormonChannelProgram(hildonize.get_app_class()):
self._save_settings()
self._index.stop()
self._save_settings()
self._index.stop()
+ self._store.stop()
try:
self._deviceState.close()
try:
self._deviceState.close()