projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add auto vcr switching support (needs new drivers (fp.ko))
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
TimerEntry.py
diff --git
a/lib/python/Screens/TimerEntry.py
b/lib/python/Screens/TimerEntry.py
index
b146ecf
..
1c83bdb
100644
(file)
--- a/
lib/python/Screens/TimerEntry.py
+++ b/
lib/python/Screens/TimerEntry.py
@@
-21,6
+21,10
@@
class TimerEntry(Screen, ConfigListScreen):
Screen.__init__(self, session)
self.timer = timer
Screen.__init__(self, session)
self.timer = timer
+ self.entryStartDate = None
+ self.entryEndDate = None
+ self.entryService = None
+
self["oktext"] = Label(_("OK"))
self["canceltext"] = Label(_("Cancel"))
self["ok"] = Pixmap()
self["oktext"] = Label(_("OK"))
self["canceltext"] = Label(_("Cancel"))
self["ok"] = Pixmap()
@@
-114,11
+118,11
@@
class TimerEntry(Screen, ConfigListScreen):
if configElement is self.timerentry_startdate:
if self.timerentry_enddate.value < self.timerentry_startdate.value:
self.timerentry_enddate.value = self.timerentry_startdate.value
if configElement is self.timerentry_startdate:
if self.timerentry_enddate.value < self.timerentry_startdate.value:
self.timerentry_enddate.value = self.timerentry_startdate.value
- self["config"].invalidate(self.
timerentry_endd
ate)
+ self["config"].invalidate(self.
entryEndD
ate)
if configElement is self.timerentry_enddate:
if (self.timerentry_enddate.value < self.timerentry_startdate.value):
self.timerentry_startdate.value = self.timerentry_enddate.value
if configElement is self.timerentry_enddate:
if (self.timerentry_enddate.value < self.timerentry_startdate.value):
self.timerentry_startdate.value = self.timerentry_enddate.value
- self["config"].invalidate(self.
timerentry_startd
ate)
+ self["config"].invalidate(self.
entryStartD
ate)
def createSetup(self, widget):
self.list = []
def createSetup(self, widget):
self.list = []
@@
-153,15
+157,17
@@
class TimerEntry(Screen, ConfigListScreen):
#self.list.append(getConfigListEntry("StartDate", self.timerentry_startdate))
# self.list.append(getConfigListEntry("Weekday", self.timerentry_weekday))
#self.list.append(getConfigListEntry("StartDate", self.timerentry_startdate))
# self.list.append(getConfigListEntry("Weekday", self.timerentry_weekday))
+ self.entryStartDate = getConfigListEntry(_("Start"), self.timerentry_startdate)
if self.timerentry_type.value == "once":
if self.timerentry_type.value == "once":
- self.list.append(
getConfigListEntry(_("Start"), self.timerentry_startdate)
)
+ self.list.append(
self.entryStartDate
)
self.list.append(getConfigListEntry(" ", self.timerentry_starttime))
else:
self.list.append(getConfigListEntry(_("StartTime"), self.timerentry_starttime))
self.list.append(getConfigListEntry(" ", self.timerentry_starttime))
else:
self.list.append(getConfigListEntry(_("StartTime"), self.timerentry_starttime))
+ self.entryEndDate = getConfigListEntry(_("End"), self.timerentry_enddate)
if self.timerentry_type.value == "once":
if self.timerentry_justplay.value != "zap":
if self.timerentry_type.value == "once":
if self.timerentry_justplay.value != "zap":
- self.list.append(
getConfigListEntry(_("End"), self.timerentry_enddate)
)
+ self.list.append(
self.entryEndDate
)
self.list.append(getConfigListEntry(" ", self.timerentry_endtime))
else:
if self.timerentry_justplay.value != "zap":
self.list.append(getConfigListEntry(" ", self.timerentry_endtime))
else:
if self.timerentry_justplay.value != "zap":
@@
-192,12
+198,6
@@
class TimerEntry(Screen, ConfigListScreen):
ConfigListScreen.keyLeft(self)
self.newConfig()
ConfigListScreen.keyLeft(self)
self.newConfig()
- def keyRightCallback(self, configPath):
- currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath()
- # check if we are still on the same config entry
- if (currentConfigPath == configPath):
- self.keyRight()
-
def keyRight(self):
if self["config"].getCurrent() is self.channelEntry:
self.keySelect()
def keyRight(self):
if self["config"].getCurrent() is self.channelEntry:
self.keySelect()
@@
-214,8
+214,8
@@
class TimerEntry(Screen, ConfigListScreen):
def finishedChannelSelection(self, *args):
if len(args):
self.timer.service_ref = ServiceReference(args[0])
def finishedChannelSelection(self, *args):
if len(args):
self.timer.service_ref = ServiceReference(args[0])
- self.timerentry_service.
vals = (str(self.timer.service_ref.getServiceName()),
)
- self["config"].invalidate(self.
timerentry_service
)
+ self.timerentry_service.
setCurrentText(self.timer.service_ref.getServiceName()
)
+ self["config"].invalidate(self.
channelEntry
)
def getTimestamp(self, date, mytime):
d = time.localtime(date)
def getTimestamp(self, date, mytime):
d = time.localtime(date)
@@
-337,7
+337,7
@@
class TimerLog(Screen):
def fillLogList(self):
self.list = [ ]
for x in self.log_entries:
def fillLogList(self):
self.list = [ ]
for x in self.log_entries:
- self.list.append((str(time.strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))
+ self.list.append((str(time.strftime("%Y-%m-%d %H-%M",
time.
localtime(x[0])) + " - " + x[2]), x))
def clearLog(self):
self.log_entries = []
def clearLog(self):
self.log_entries = []