git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable wrap around in epglist and servicelist
[enigma2.git]
/
lib
/
python
/
Components
/
TimerList.py
diff --git
a/lib/python/Components/TimerList.py
b/lib/python/Components/TimerList.py
index 47c49d3f410f3faa6cda7e19ceb7bc4ba8716773..f55c9b1bf21c9c3e86a0e3d23b5e95faeeb5b105 100644
(file)
--- a/
lib/python/Components/TimerList.py
+++ b/
lib/python/Components/TimerList.py
@@
-4,8
+4,9
@@
from GUIComponent import *
from Tools.FuzzyDate import FuzzyTime
import time
from Tools.FuzzyDate import FuzzyTime
import time
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, eListbox, gFont
, loadPNG
from timer import TimerEntry
from timer import TimerEntry
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
RT_HALIGN_LEFT = 0
RT_HALIGN_RIGHT = 1
RT_HALIGN_LEFT = 0
RT_HALIGN_RIGHT = 1
@@
-30,8
+31,8
@@
def TimerEntryComponent(timer, processed):
res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name))
repeatedtext = ""
res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name))
repeatedtext = ""
- days = [
"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
]
- if
(timer.repeated != 0)
:
+ days = [
_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")
]
+ if
timer.repeated
:
flags = timer.repeated
count = 0
for x in range(0, 7):
flags = timer.repeated
count = 0
for x in range(0, 7):
@@
-41,14
+42,14
@@
def TimerEntryComponent(timer, processed):
repeatedtext += days[x]
count += 1
flags = flags >> 1
repeatedtext += days[x]
count += 1
flags = flags >> 1
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50,
3
00, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50,
4
00, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
else:
else:
- res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50,
3
00, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50,
4
00, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
if not processed:
if not processed:
- if timer.state == TimerEntry.StateWait:
+ if timer.state == TimerEntry.StateWait
ing
:
state = "waiting"
state = "waiting"
- elif timer.state == TimerEntry.StatePrepare:
+ elif timer.state == TimerEntry.StatePrepare
d
:
state = "about to start"
elif timer.state == TimerEntry.StateRunning:
state = "recording..."
state = "about to start"
elif timer.state == TimerEntry.StateRunning:
state = "recording..."
@@
-58,6
+59,10
@@
def TimerEntryComponent(timer, processed):
state = "done!"
res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
state = "done!"
res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
+
+ if timer.disabled:
+ png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/redx.png"))
+ res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 490, 5, 40, 40, png))
return res
return res
@@
-76,7
+81,16
@@
class TimerList(HTMLComponent, GUIComponent):
self.instance = eListbox(parent)
self.instance.setContent(self.l)
self.instance.setItemHeight(70)
self.instance = eListbox(parent)
self.instance.setContent(self.l)
self.instance.setItemHeight(70)
-
+
+ def moveToIndex(self, index):
+ self.instance.moveSelectionTo(index)
+
+ def getCurrentIndex(self):
+ return self.instance.getCurrentIndex()
+
+ def moveDown(self):
+ self.instance.moveSelection(self.instance.moveDown)
+
def GUIdelete(self):
self.instance.setContent(None)
self.instance = None
def GUIdelete(self):
self.instance.setContent(None)
self.instance = None