X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7466abeda3437afb71ce9ab8c0917cd8ea14482c..b17019f43527d615589ce2083fb3d2a9058f2c3c:/lib/python/Screens/TimeDateInput.py

diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index 4ea67b74..6cdc6217 100644
--- a/lib/python/Screens/TimeDateInput.py
+++ b/lib/python/Screens/TimeDateInput.py
@@ -1,14 +1,14 @@
 from Screen import Screen
 from Components.config import *
 from Components.ActionMap import ActionMap, NumberActionMap
-from Components.ConfigList import ConfigList
+from Components.ConfigList import ConfigList, ConfigListScreen
 from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 import time
 import datetime
 
-class TimeDateInput(Screen):
+class TimeDateInput(Screen, ConfigListScreen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
@@ -19,73 +19,39 @@ class TimeDateInput(Screen):
 
 		self.createConfig()
 
-		self["actions"] = NumberActionMap(["SetupActions", "TextEntryActions"],
+		self["actions"] = NumberActionMap(["SetupActions"],
 		{
 			"ok": self.keySelect,
 			"save": self.keyGo,
 			"cancel": self.keyCancel,
-			"left": self.keyLeft,
-			"right": self.keyRight,
-			"delete": self.keyDelete,
-			"1": self.keyNumberGlobal,
-			"2": self.keyNumberGlobal,
-			"3": self.keyNumberGlobal,
-			"4": self.keyNumberGlobal,
-			"5": self.keyNumberGlobal,
-			"6": self.keyNumberGlobal,
-			"7": self.keyNumberGlobal,
-			"8": self.keyNumberGlobal,
-			"9": self.keyNumberGlobal,
-			"0": self.keyNumberGlobal
-		}, -1)
+		}, -2)
 
 		self.list = []
-		self["config"] = ConfigList(self.list)
+		ConfigListScreen.__init__(self, self.list)
 		self.createSetup(self["config"])
 
 	def createConfig(self):
-			config.timeinput = ConfigSubsection()
-			nowtime = time.time()
-			config.timeinput.date = configElement_nonSave("config.timeinput.date", configDateTime, nowtime, (_("%d.%B %Y"), 86400))
-			config.timeinput.time = configElement_nonSave("config.timeinput.time", configSequence, [int(time.strftime("%H", time.localtime(nowtime))), int(time.strftime("%M", time.localtime(nowtime)))], configsequencearg.get("CLOCK"))
+		nowtime = time.time()
+		self.timeinput_date = ConfigDateTime(default = nowtime, formatstring = _("%d.%B %Y"), increment = 86400)
+		self.timeinput_time = ConfigClock(default = nowtime)
 
 	def createSetup(self, configlist):
 		self.list = []
-		self.list.append(getConfigListEntry(_("Date"), config.timeinput.date))
-		self.list.append(getConfigListEntry(_("Time"), config.timeinput.time))
+		self.list.append(getConfigListEntry(_("Date"), self.timeinput_date))
+		self.list.append(getConfigListEntry(_("Time"), self.timeinput_time))
 		configlist.list = self.list
 		configlist.l.setList(self.list)
 
-	def keyLeft(self):
-		self["config"].handleKey(config.key["prevElement"])
-
-	def keyDelete(self):
-		self["config"].handleKey(config.key["delete"])
-
-	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):
-		self["config"].handleKey(config.key["nextElement"])
-
 	def keySelect(self):
 		self.keyGo()
 
-	def keyNumberGlobal(self, number):
-		print "You pressed number " + str(number)
-		if (self["config"].getCurrent()[1].parent.enabled == True):
-			self["config"].handleKey(config.key[str(number)])
-
 	def getTimestamp(self, date, mytime):
 		d = time.localtime(date)
 		dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
-		return int(mktime(dt.timetuple()))
+		return int(time.mktime(dt.timetuple()))
 
 	def keyGo(self):
-		time = self.getTimestamp(config.timeinput.date.value, config.timeinput.time.value)
+		time = self.getTimestamp(self.timeinput_date.value, self.timeinput_time.value)
 		self.close((True, time))
 
 	def keyCancel(self):