[sleeptimer] add powertimer to key_sleep

openhdf · Aug 22, 2014 · 851477e · 851477e
1 parent 55cfbc8
commit 851477e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/data/keymap.xpe b/data/keymap.xpe
@@ -118,7 +118,7 @@
 		<key id="KEY_SUBTITLE" mapto="subtitleSelection" flags="l" />
 		<key id="KEY_SUBTITLE" mapto="subtitleSelection" flags="b" />
 		<!--key id="KEY_BOOKMARKS" mapto="showPluginBrowser" flags="mr" /-->
-		<key id="KEY_SLEEP" mapto="openTimerList" flags="b" />
+		<!--key id="KEY_SLEEP" mapto="timerAdd" flags="b" /-->
 		<key id="KEY_SLEEP" mapto="openAutoTimerList" flags="l" />
 		<key id="KEY_PROGRAM" mapto="openTimerList" flags="b" />
 		<key id="KEY_PROGRAM" mapto="openAutoTimerList" flags="l" />
@@ -243,6 +243,7 @@
 		<key id="KEY_PVR" mapto="showMovies" flags="m" />
 		<key id="KEY_TEXT" mapto="showText" flags="m" />
 		<key id="KEY_WWW" mapto="showWWW" flags="m" />
+		<key id="KEY_SLEEP" mapto="openSleepTimer" flags="b" />
 		<!-- comment in to use media as EMC for LX STBs KEY_BOOKMARKS -->
 		<key id="KEY_DIRECTORY" mapto="showPluginBrowser" flags="mm" />			
 	</map>

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
@@ -58,6 +58,7 @@ def __init__(self, session):
 				"showTv": (self.TvRadioToggle, _("Show the tv player...")),
 				"showMediaPlayer": (self.showMediaPlayer, _("Show the media player...")),
 				"openBouquetList": (self.openBouquetList, _("open bouquetlist")),
+				"openSleepTimer": (self.openPowerTimerList, _("Show the Sleep Timer...")),
 				"showEMC": (self.showEMC, _("Show the media center...")),
 				"showETPORTAL": (self.showETPORTAL, _("Open EtPortal...")),
 				"showMEDIAPORTAL": (self.showMEDIAPORTAL, _("Open MediaPortal...")),
@@ -204,6 +205,14 @@ def showWWW(self):
 		except Exception, e:
 			self.session.open(MessageBox, _("The EtPortal plugin is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
 
+	def openSleepTimer(self):
+		from Screens.SleepTimerEdit import SleepTimerEdit
+		self.session.open(SleepTimerEdit)
+
+	def openPowerTimerList(self):
+		from Screens.PowerTimerEdit import PowerTimerEditList
+		self.session.open(PowerTimerEditList)
+
 	def showPluginBrowser(self):
 		from Screens.PluginBrowser import PluginBrowser
 		self.session.open(PluginBrowser)