X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6d7673190e7fec573aed8e15e98d470cd4189d52..7dd0844fdd708087461076e4da1c6bc7328ec3de:/lib/python/Screens/TimeDateInput.py

diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index d8e1f8a1..7f940909 100644
--- a/lib/python/Screens/TimeDateInput.py
+++ b/lib/python/Screens/TimeDateInput.py
@@ -1,23 +1,21 @@
 from Screen import Screen
-from Components.config import *
-from Components.ActionMap import ActionMap, NumberActionMap
-from Components.ConfigList import ConfigList, ConfigListScreen
-from Components.Button import Button
+from Components.config import ConfigClock, ConfigDateTime, getConfigListEntry
+from Components.ActionMap import NumberActionMap
+from Components.ConfigList import ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 import time
 import datetime
 
 class TimeDateInput(Screen, ConfigListScreen):
-	def __init__(self, session):
+	def __init__(self, session, config_time=None, config_date=None):
 		Screen.__init__(self, session)
-
 		self["oktext"] = Label(_("OK"))
 		self["canceltext"] = Label(_("Cancel"))
 		self["ok"] = Pixmap()
 		self["cancel"] = Pixmap()
 
-		self.createConfig()
+		self.createConfig(config_date, config_time)
 
 		self["actions"] = NumberActionMap(["SetupActions"],
 		{
@@ -30,36 +28,45 @@ class TimeDateInput(Screen, ConfigListScreen):
 		ConfigListScreen.__init__(self, self.list)
 		self.createSetup(self["config"])
 
-	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"
+	def createConfig(self, conf_date, conf_time):
+		self.save_mask = 0
+		if conf_time:
+			self.save_mask |= 1
+		else:
+			conf_time = ConfigClock(default = time.time()),
+		if conf_date:
+			self.save_mask |= 2
+		else:
+			conf_date = ConfigDateTime(default = time.time(), formatstring = _("%d.%B %Y"), increment = 86400)
+		self.timeinput_date = conf_date
+		self.timeinput_time = conf_time
 
 	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)
+		if self.save_mask & 1:
+			self.timeinput_time.save()
+		if self.save_mask & 2:
+			self.timeinput_date.save()
 		self.close((True, time))
 
 	def keyCancel(self):
+		if self.save_mask & 1:
+			self.timeinput_time.cancel()
+		if self.save_mask & 2:
+			self.timeinput_date.cancel()
 		self.close((False,))