X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSleepTimerEdit.py;h=1305b62481a553f241b6ecfef64e60dd52c6682c;hp=ff061d8800fe9e9f6d666594e52ab7141277aa0b;hb=36cca1d3f31265929ef3443999ab7fd242b4dae5;hpb=944a34684b55482a6413d658498a3e5b01df2f76

diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py
old mode 100644
new mode 100755
index ff061d8..1305b62
--- a/lib/python/Screens/SleepTimerEdit.py
+++ b/lib/python/Screens/SleepTimerEdit.py
@@ -5,6 +5,7 @@ from Components.Input import Input
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.config import config, ConfigInteger
+from Components.SystemInfo import SystemInfo
 from enigma import eEPGCache
 from SleepTimer import SleepTimer
 from time import time
@@ -39,7 +40,7 @@ class SleepTimerEdit(Screen):
 		self.status = True
 		self.updateColors()
 		
-		self["pretext"] = Label(_("Shutdown Dreambox after"))
+		self["pretext"] = Label(_("Shutdown STB after"))
 		self["aftertext"] = Label(_("minutes"))
 		
 		self["actions"] = NumberActionMap(["SleepTimerEditorActions", "TextEntryActions", "KeyboardInputActions"], 
@@ -77,7 +78,11 @@ class SleepTimerEdit(Screen):
 			self["red_text"].setText(_("Action:") + " " + _("Disable timer"))
 		
 		if config.SleepTimer.action.value == "shutdown":
-			self["green_text"].setText(_("Sleep timer action:") + " " + _("Deep Standby"))
+			if SystemInfo["DeepstandbySupport"]:
+				shutdownString = _("Deep Standby")
+			else:
+				shutdownString = _("Shutdown")
+			self["green_text"].setText(_("Sleep timer action:") + " " + shutdownString)
 		elif config.SleepTimer.action.value == "standby":
 			self["green_text"].setText(_("Sleep timer action:") + " " + _("Standby"))
 		
@@ -94,18 +99,30 @@ class SleepTimerEdit(Screen):
 
 	def select(self):
 		if self.status:
-			time = int(self["input"].getText())
-			config.SleepTimer.defaulttime.setValue(time)
-			config.SleepTimer.defaulttime.save()
-			config.SleepTimer.action.save()
-			self.session.nav.SleepTimer.setSleepTime(time)
-			self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been activated."), MessageBox.TYPE_INFO)
+#	ikseong
+			if self["input"].getText()=='':
+				self.session.nav.SleepTimer.clear()
+				self.session.openWithCallback(self.close, MessageBox, _("The sleep timer is invalid."), MessageBox.TYPE_INFO)
+			else:				
+				time = int(self["input"].getText())
+				config.SleepTimer.defaulttime.setValue(time)
+				config.SleepTimer.defaulttime.save()
+				config.SleepTimer.action.save()
+				config.SleepTimer.ask.save()
+				self.session.nav.SleepTimer.setSleepTime(time)
+				self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been activated."), MessageBox.TYPE_INFO)
 		else:
 			self.session.nav.SleepTimer.clear()
 			self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been disabled."), MessageBox.TYPE_INFO)
 
 	def keyNumberGlobal(self, number):
-		self["input"].number(number)
+#	ikseong
+		if self["input"].getText() == '' :
+			inputtime=0
+		else:
+			inputtime= int(self["input"].getText())*10 +number
+		if inputtime < 10000 :
+			self["input"].number(number)
 
 	def selectLeft(self):
 		self["input"].left()