volume-control:

move volumeBar from infobar to a single screen Volume

timer:
change input type of configelement for start- and endtime

5 files changed, 44 insertions, 19 deletions

diff --git a/data/skin.xml b/data/skin.xml
index 744a4fe7..c1b9aa94 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -74,9 +74,9 @@
 			<widget name="config" position="20,10" size="460,350" />
 			<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />
 		</screen>
-		<screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
-			<widget name="config" position="20,10" size="460,350" />
-			<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />
+		<screen name="TimerEntry" position="390,100" size="250,400" title="Timer entry">
+			<widget name="config" position="5,10" size="240,350" />
+			<widget name="introduction" position="20,360" size="250,30" font="Arial;23" />
 		</screen>
 		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
 			<widget name="config" position="10,50" size="420,175" />
@@ -107,8 +107,8 @@
 			<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="160,100" size="420,330" title="Timer Editor">
-			<widget name="timerlist" position="10,30" size="400,300" />
+		<screen name="TimerEditList" position="70,100" size="300,400" title="Timer Editor">
+			<widget name="timerlist" position="10,30" size="280,300" />
 		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
 			<widget name="okbutton" position="10,10" size="280,40" />
@@ -120,13 +120,17 @@
 			
 			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
 			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
-			<widget name="Volume" position="575,45" size="100,5" backgroundColor="dark" />
 			<widget name="Event_Now" position="273,68" size="282,22" font="Arial;20" backgroundColor="dark" />
 			<widget name="Event_Next" position="273,98" size="282,22" font="Arial;20" backgroundColor="dark" />
 			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;22" backgroundColor="dark" />
 			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;22" backgroundColor="dark" />
 <!--			<eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial;20" /> -->
 		</screen>
+		<screen name="Volume" flags="wfNoBorder" position="140,125" size="180,60" title="Volume">
+			<ePixmap position="0,0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
+			
+			<widget name="Volume" position="8,38" size="164,11" backgroundColor="dark" />
+		</screen>
  		<screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
 			<widget name="list" position="0,50" size="560,320" />
 <!--			<widget name="okbutton" position="340,50" size="140,30" />-->
diff --git a/data/volumeslider-fs8.png b/data/volumeslider-fs8.png
new file mode 100644
index 00000000..328b47cd
--- /dev/null
+++ b/data/volumeslider-fs8.png
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index bdd08e12..b5a767a2 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -154,6 +154,9 @@ class configSequenceArg:
 		# configsequencearg.get ("MAC")
 		if (type == "MAC"):
 			return ((":"), [(1,255),(1,255),(1,255),(1,255),(1,255),(1,255)], "")
+		# configsequencearg.get ("CLOCK")
+		if (type == "CLOCK"):
+			return ((":"), [(0,23),(0,59)], "")
 		# configsequencearg.get("INTEGER", (min, max)) => x with min <= x <= max
 		if (type == "INTEGER"):
 			return ((":"), [args], "")
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 73825f25..b837c531 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,7 +1,6 @@
 from Screen import Screen
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
-from Components.VolumeBar import VolumeBar
 from Components.ActionMap import ActionMap
 from Components.Button import Button
 from Components.ServiceName import ServiceName
@@ -11,6 +10,7 @@ from Components.config import configfile
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
+from Screens.Volume import Volume
 
 from enigma import *
 
@@ -30,10 +30,11 @@ class InfoBar(Screen):
 
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
-		self.volumeBar = VolumeBar()		
 		
 		self.state = self.STATE_HIDDEN
 		
+		self.volumeDialog = self.session.instantiateDialog(Volume)
+		
 		self.hideTimer = eTimer()
 		self.hideTimer.timeout.get().append(self.doTimerHide)
 		#self.hideTimer.start(1000)
@@ -61,8 +62,6 @@ class InfoBar(Screen):
 		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
 		# Clock()
 
-		self["Volume"] = self.volumeBar
-		
 		self["ServiceName"] = ServiceName(self.session.nav)
 		
 		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
@@ -120,12 +119,23 @@ class InfoBar(Screen):
 
 	def	volUp(self):
 		eDVBVolumecontrol.getInstance().volumeUp()
-		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volumeDialog.instance.show()
+		#self.volumeDialog.instance.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
+		self.hideVolTimer.start(3000)
 
 	def	volDown(self):
 		eDVBVolumecontrol.getInstance().volumeDown()
-		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		#self.volumeDialog.instance.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volumeDialog.instance.show()
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
+		self.hideVolTimer.start(3000)
 		
+	def volHide(self):
+		self.volumeDialog.instance.hide()
+
 	def startShow(self):
 		self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
 		self.state = self.STATE_SHOWN
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 5893749b..c61e9ab3 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -39,19 +39,27 @@ class TimerEntry(Screen):
     def createConfig(self, timer):
             config.timerentry = ConfigSubsection()
 
+            config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, 0, ("once", "repeated"))
             config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, timer.begin, ("%d.%B %Y", 86400))
-            config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configDateTime, timer.begin, ("%H:%M", 60))
+            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", configDateTime, timer.end, ("%H:%M", 60))            
+            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))
 
     def createSetup(self):
         self.list = []
+        self.list.append(getConfigListEntry("TimerType", config.timerentry.type))
         
-        self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
-        self.list.append(getConfigListEntry("StartTime", config.timerentry.starttime))
-        self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate))
-        self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime))
+        if (config.timerentry.type.value == 0):
+            self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
+            self.list.append(getConfigListEntry("StartTime", config.timerentry.starttime))
+            self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate))
+            self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime))
+        else:
+            pass
+            #self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
 #        self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday))
         
         self["config"].list = self.list
@@ -59,7 +67,7 @@ class TimerEntry(Screen):
         
     def newConfig(self):
         print self["config"].getCurrent()
-        if self["config"].getCurrent()[0] == "Type of scan":
+        if self["config"].getCurrent()[0] == "TimerType":
             self.createSetup()
         if self["config"].getCurrent()[0] == "Tuner":
             self.createSetup()