From 5f8883ca9bab4cd9c3996d818dfb3caee11ecab7 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Mon, 12 Oct 2009 12:41:48 +0200 Subject: [PATCH] - fix storing last used sleep timer time - revert previous change to reuse last used sleep timer time again - add blue button control to set sleep timer time to the remaining time of the currently running service --- data/keymap.xml | 2 +- data/skin_default.xml | 6 +-- lib/python/Screens/SleepTimerEdit.py | 59 +++++++++++++++------------- po/de.po | 45 ++++++++------------- 4 files changed, 53 insertions(+), 59 deletions(-) diff --git a/data/keymap.xml b/data/keymap.xml index e207c3c9..25538f87 100755 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -586,7 +586,7 @@ - + diff --git a/data/skin_default.xml b/data/skin_default.xml index 100bd5bf..1bf410c9 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -893,16 +893,16 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + - + diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py index 6e1991b7..1a4b6561 100644 --- a/lib/python/Screens/SleepTimerEdit.py +++ b/lib/python/Screens/SleepTimerEdit.py @@ -33,31 +33,6 @@ class SleepTimerEdit(Screen): if self.is_active: self.time = self.session.nav.SleepTimer.getCurrentSleepTime() else: - remaining = None - ref = self.session.nav.getCurrentlyPlayingServiceReference() - if ref: - path = ref.getPath() - if path: # Movie - service = self.session.nav.getCurrentService() - seek = service and service.seek() - if seek: - length = seek.getLength() - position = seek.getPlayPosition() - if length and position: - remaining = length[1] - position[1] - if remaining > 0: - remaining = remaining / 90000 - else: # DVB - epg = eEPGCache.getInstance() - event = epg.lookupEventTime(ref, -1, 0) - if event: - now = int(time()) - start = event.getBeginTime() - duration = event.getDuration() - end = start + duration - remaining = end - now - if remaining: - config.SleepTimer.defaulttime.value = (remaining / 60) + 2 self.time = config.SleepTimer.defaulttime.value self["input"] = Input(text = str(self.time), maxSize = False, type = Input.NUMBER) @@ -91,7 +66,8 @@ class SleepTimerEdit(Screen): "deleteBackward": self.deleteBackward, "disableTimer": self.disableTimer, "toggleAction": self.toggleAction, - "toggleAsk": self.toggleAsk + "toggleAsk": self.toggleAsk, + "useServiceTime": self.useServiceTime }, -1) def updateColors(self): @@ -109,7 +85,7 @@ class SleepTimerEdit(Screen): self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("yes")) else: self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("no")) - self["blue_text"].setText(_("Settings")) + self["blue_text"].setText(_("Use time of currently running service")) def cancel(self): config.SleepTimer.ask.cancel() @@ -120,6 +96,7 @@ class SleepTimerEdit(Screen): if self.status: time = int(self["input"].getText()) config.SleepTimer.defaulttime.setValue(time) + config.SleepTimer.defaulttime.save() self.session.nav.SleepTimer.setSleepTime(time) self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been activated."), MessageBox.TYPE_INFO) else: @@ -161,3 +138,31 @@ class SleepTimerEdit(Screen): def toggleAsk(self): config.SleepTimer.ask.value = not config.SleepTimer.ask.value self.updateColors() + + def useServiceTime(self): + remaining = None + ref = self.session.nav.getCurrentlyPlayingServiceReference() + if ref: + path = ref.getPath() + if path: # Movie + service = self.session.nav.getCurrentService() + seek = service and service.seek() + if seek: + length = seek.getLength() + position = seek.getPlayPosition() + if length and position: + remaining = length[1] - position[1] + if remaining > 0: + remaining = remaining / 90000 + else: # DVB + epg = eEPGCache.getInstance() + event = epg.lookupEventTime(ref, -1, 0) + if event: + now = int(time()) + start = event.getBeginTime() + duration = event.getDuration() + end = start + duration + remaining = end - now + if remaining: + config.SleepTimer.defaulttime.value = (remaining / 60) + 2 + self["input"].setText(str((remaining / 60) + 2)) diff --git a/po/de.po b/po/de.po index 15499fae..ba83daa5 100755 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 13:06+0200\n" -"PO-Revision-Date: 2009-09-03 14:50+0100\n" +"POT-Creation-Date: 2009-10-12 12:40+0200\n" +"PO-Revision-Date: 2009-10-12 12:38+0100\n" "Last-Translator: Stefan Pluecken \n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -98,6 +98,13 @@ msgstr "" "Wählen Sie Ihr Sicherungs-Laufwerk.\n" "Aktuelles Laufwerk: " +msgid "" +"\n" +"System will restart after the restore!" +msgstr "" +"\n" +"Das System wird nach der Wiederherstellung neu starten!" + msgid "" "\n" "View, install and remove available or installed packages." @@ -989,6 +996,11 @@ msgstr "" msgid "CrashlogAutoSubmit settings..." msgstr "" +msgid "" +"Crashlogs found!\n" +"Send them to Dream Multimedia ?" +msgstr "" + msgid "" "Crashlogs found!\n" "Send them to Dream Multimedia?" @@ -1481,12 +1493,6 @@ msgstr "" "\n" "© 2006 - Stephan Reichholf" -#. #-#-#-#-# enigma2.pot (PACKAGE VERSION) #-#-#-#-# -#. TRANSLATORS: Note that "Enter" in the two strings below should *not* -#. be interpreted as "Give speed as input". The intended meaning is -#. instead "Initial speed when starting winding", i.e. the speed at -#. which "winding mode" is entered when first pressing "rewind" or -#. "fast forward". msgid "Enter Fast Forward at speed" msgstr "Anfängliche Vorlaufgeschwindigkeit eingeben" @@ -4250,19 +4256,6 @@ msgstr "Verwende Stromaufnahmen-Messung" msgid "Use a gateway" msgstr "Einen Gateway verwenden?" -#. #-#-#-#-# enigma2.pot (PACKAGE VERSION) #-#-#-#-# -#. TRANSLATORS: The effect of "Non-smooth winding" is that rather -#. than using ordinary "continuous" or "smooth" winding, a fast -#. sequence of stills is shown when winding at high speeds. This -#. makes it much easier too follow when almost each frame comes from -#. a new scene. The effect is achieved by repeating each shown frame -#. a couple of times. The settings control both at which speed this -#. winding mode sets in, and how many times each frame should be -#. repeated. This was previously called "Discontinuous playback" -#. which was incomprehensible. "Non-smooth winding" may be a better -#. term, but note that there is nothing irregular about it. Synonyms -#. better suited for translation to other languages may be "stepwise -#. winding/playback", or "winding/playback using stills". msgid "Use non-smooth winding at speeds above" msgstr "" @@ -4291,6 +4284,9 @@ msgstr "" msgid "Use this video enhancement settings?" msgstr "" +msgid "Use time of currently running service" +msgstr "Benutze Zeit vom aktuell laufenden Programm" + msgid "Use usals for this sat" msgstr "USALS für diesen Sat benutzen" @@ -5700,13 +5696,6 @@ msgstr "umgeschaltet" #~ "\n" #~ "Enigma2 wird nach der Wiederherstellung neu starten" -#~ msgid "" -#~ "\n" -#~ "System will restart after the restore!" -#~ msgstr "" -#~ "\n" -#~ "Das System wird nach der Wiederherstellung neu starten!" - #~ msgid "AGC:" #~ msgstr "AGC:" -- 2.30.2