X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..d2bea1918fa33f5e92ed75f3f744c119439924bc:/lib/python/Screens/TimeDateInput.py

diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index c7a66641..6cdc6217 100644
--- a/lib/python/Screens/TimeDateInput.py
+++ b/lib/python/Screens/TimeDateInput.py
@@ -24,7 +24,7 @@ class TimeDateInput(Screen, ConfigListScreen):
 			"ok": self.keySelect,
 			"save": self.keyGo,
 			"cancel": self.keyCancel,
-		}, -1)
+		}, -2)
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list)
@@ -32,33 +32,26 @@ class TimeDateInput(Screen, ConfigListScreen):
 
 	def createConfig(self):
 		nowtime = time.time()
-		self.timeinput_date = ConfigDateTime(default = nowtime, formatstring = (_("%d.%B %Y"), 86400))
-#		self.timeinput_time = ConfigSequence(default = [int(time.strftime("%H", time.localtime(nowtime))), int(time.strftime("%M", time.localtime(nowtime)))]
-		assert False, "fixme"
+		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 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 keySelect(self):
 		self.keyGo()
 
 	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):