From 93fe9a37c89cbb2c4ea31808bf3196b1603ad234 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Thu, 10 Nov 2005 01:23:39 +0000 Subject: [PATCH] volume-control: move volumeBar from infobar to a single screen Volume timer: change input type of configelement for start- and endtime --- data/skin.xml | 16 ++++++++++------ data/volumeslider-fs8.png | Bin 0 -> 265 bytes lib/python/Components/config.py | 3 +++ lib/python/Screens/InfoBar.py | 22 ++++++++++++++++------ lib/python/Screens/TimerEntry.py | 22 +++++++++++++++------- 5 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 data/volumeslider-fs8.png 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 @@ - - - + + + @@ -107,8 +107,8 @@ - - + + @@ -120,13 +120,17 @@ - + + + + + diff --git a/data/volumeslider-fs8.png b/data/volumeslider-fs8.png new file mode 100644 index 0000000000000000000000000000000000000000..328b47cd4744bf321ed2e0a72ef83c343b2e7d56 GIT binary patch literal 265 zcmV+k0rvihP)T z)Y~~eM69;Ma~R+C0002ENkl 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() -- 2.30.2