auf Grund der grossen Nachfrage gibt es wieder ein poweroff im "main", Powertaste...

diff --git a/data/keymap.xml b/data/keymap.xml
index 1009d393b56c1b652a7441d020a4e90510978674..59949962f6edf8f61a9214b66c4719bde823a416 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -71,7 +71,8 @@
                <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" />
                <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" />
                <key id="KEY_MUTE" mapto="volumeMute" flags="mr" />
-               <key id="KEY_POWER" mapto="quit" flags="m" />
+               <key id="KEY_POWER" mapto="powerdown" flags="m" />
+               <key id="KEY_POWER" mapto="powerup" flags="b" />
                <key id="KEY_1" mapto="1" flags="m" />
                <key id="KEY_2" mapto="2" flags="m" />
                <key id="KEY_3" mapto="3" flags="m" />

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 78a47dddf03735587ccf56afb76c1574136f511e..3c776178b799633944e944957238788f54c6ef84 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -91,6 +91,9 @@ class InfoBar(Screen):
                
                self.hideVolTimer = eTimer()
                self.hideVolTimer.timeout.get().append(self.volHide)
+               
+               self.powerKeyTimer = eTimer()
+               self.powerKeyTimer.timeout.get().append(self.powertimer)
 
                #self["actions"] = ActionMap( [ "InfobarActions" ], 
                self["actions"] = NumberActionMap( [ "InfobarActions" ], 
@@ -107,7 +110,9 @@ class InfoBar(Screen):
                                "hide": self.hide,
                                "toggleShow": self.toggleShow,
                                "showMovies": self.showMovies,
-                               "quit": self.quit,
+                               #"quit": self.quit,
+                               "powerdown": self.powerdown,
+                               "powerup": self.powerup,
                                "1": self.keyNumberGlobal,
                                "2": self.keyNumberGlobal,
                                "3": self.keyNumberGlobal,
@@ -150,6 +155,18 @@ class InfoBar(Screen):
                assert menu.tagName == "menu", "root element in menu must be 'menu'!"
                self.session.open(MainMenu, menu, menu.childNodes)
 
+       def powertimer(self):   
+               print "PowerOff - Now!"
+               configfile.save()
+               quitMainloop()
+       
+       def powerdown(self):
+               self.powerKeyTimer.start(3000)
+
+       def powerup(self):
+               self.powerKeyTimer.stop()
+               self.session.open(Standby, self)
+
        def keyNumberGlobal(self, number):
                print "You pressed number " + str(number)
                self.session.open(NumberZap, number)
@@ -231,8 +248,8 @@ class InfoBar(Screen):
                else:
                        print 'no epg for service', ref.toString()
 
-       def quit(self):
-               self.session.open(Standby)
+       #def quit(self):
+       #       self.session.open(Standby, self)
                #configfile.save()
                #quitMainloop()
        
@@ -280,3 +297,4 @@ class InfoBar(Screen):
                
        def unPauseService(self):
                self.session.nav.pause(0)
+