add colorbuttons to TimerEditList

3 files changed, 31 insertions, 7 deletions

diff --git a/data/skin.xml b/data/skin.xml
index dc091764..0d3c3347 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -115,9 +115,12 @@
 		<screen name="configTest" position="300,100" size="300,300" title="config menu">
 			<widget name="config" position="10,30" size="420,220" />
 		</screen>
-<!--		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">-->
-		<screen name="TimerEditList" position="70,100" size="500,400" title="Timer Editor">
-			<widget name="timerlist" position="10,30" size="480,300" />
+		<screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
+			<widget name="timerlist" position="10,50" size="520,300" />
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
 		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
 			<widget name="okbutton" position="10,10" size="280,40" />
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 1bc734a6..0a9f2830 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -62,13 +62,26 @@ class TimerEditList(Screen):
 			list.append(TimerEntryComponent(timer, 1))
 		
 		self["timerlist"] = TimerList(list)
+		
+		self["key_red"] = Button("Delete")
+		self["key_green"] = Button("Add")
+		self["key_yellow"] = Button("")
+		self["key_blue"] = Button("")
 
-		self["actions"] = ActionMap(["OkCancelActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
 			{
 				"ok": self.openEdit,
-				"cancel": self.close
+				"cancel": self.close,
+				"red": self.removeTimer,
+				"green": self.addTimer
 			})
 
 	def openEdit(self):
 		self.session.open(TimerEntry, self["timerlist"].getCurrent()[0])
 		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
+		
+	def removeTimer(self):
+		pass
+	
+	def addTimer(self):
+		pass
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 2d376cbe..c7ea0cf6 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -41,14 +41,17 @@ class TimerEntry(Screen):
 
             config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, 0, ("once", "repeated"))
             config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, timer.description, (configText.extendableSize,))
+
             config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, 0, ("daily", "weekly", "Mon-Fri", "user-defined"))
+
             config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, timer.begin, ("%d.%B %Y", 86400))
             config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(strftime("%H", localtime(timer.begin))), int(strftime("%M", localtime(timer.begin)))], configsequencearg.get("CLOCK"))
-            #config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configDateTime, timer.begin, ("%H:%M", 60))
+
             config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, timer.end, ("%d.%B %Y", 86400))
             config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(strftime("%H", localtime(timer.end))), int(strftime("%M", localtime(timer.end)))], configsequencearg.get("CLOCK"))
-#            config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configDateTime, timer.end, ("%H:%M", 60))            
+            
             config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configDateTime, time(), ("%A", 86400))
+            
             config.timerentry.monday = configElement_nonSave("config.timerentry.monday", configSelection, 0, ("yes", "no"))
             config.timerentry.tuesday = configElement_nonSave("config.timerentry.tuesday", configSelection, 0, ("yes", "no"))
             config.timerentry.wednesday = configElement_nonSave("config.timerentry.wednesday", configSelection, 0, ("yes", "no"))
@@ -57,6 +60,9 @@ class TimerEntry(Screen):
             config.timerentry.saturday = configElement_nonSave("config.timerentry.saturday", configSelection, 0, ("yes", "no"))
             config.timerentry.sunday = configElement_nonSave("config.timerentry.sunday", configSelection, 0, ("yes", "no"))
             
+            # FIXME some service-chooser needed here
+            config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((str(timer.service_ref.getServiceName())),))
+            
     def createSetup(self):
         self.list = []
         self.list.append(getConfigListEntry("Description", config.timerentry.description))
@@ -92,6 +98,8 @@ class TimerEntry(Screen):
             self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate))
         self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime))
         
+        self.list.append(getConfigListEntry("Channel", config.timerentry.service))        
+        
         self["config"].list = self.list
         self["config"].l.setList(self.list)