diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-23 00:06:27 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-03-23 00:06:27 +0000 |
| commit | 08fca93e7f2a37a452399d08c5c84b969b7e52af (patch) | |
| tree | e947a919972cdd6ad072c196640a643c6c9f7fff /lib/python/Components/TimerList.py | |
| parent | 371447724a1e150c37a777e58a4725a3d2561c01 (diff) | |
| download | enigma2-08fca93e7f2a37a452399d08c5c84b969b7e52af.tar.gz enigma2-08fca93e7f2a37a452399d08c5c84b969b7e52af.zip | |
- switchtimer added to RecordingTimer
- media player to play mp3, ogg (not yet fully working) and ts files (needs gstreamer)
- language selection saves a language string instead of a changing index number
Diffstat (limited to 'lib/python/Components/TimerList.py')
| -rw-r--r-- | lib/python/Components/TimerList.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index 5e371a04..645c32ba 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -42,9 +42,15 @@ def TimerEntryComponent(timer, processed): repeatedtext += days[x] count += 1 flags = flags >> 1 - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) + if timer.justplay: + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ((" %s "+ _("(ZAP)")) % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) + else: + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) + if timer.justplay: + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (("%s, %s " + _("(ZAP)")) % (FuzzyTime(timer.begin))))) + else: + res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) if not processed: if timer.state == TimerEntry.StateWaiting: @@ -52,7 +58,10 @@ def TimerEntryComponent(timer, processed): elif timer.state == TimerEntry.StatePrepared: state = _("about to start") elif timer.state == TimerEntry.StateRunning: - state = _("recording...") + if timer.justplay: + state = _("zapped") + else: + state = _("recording...") else: state = _("<unknown>") else: |