finish language-menu - the RT_VALIGN_CENTER doesn't work in eListboxPythonMultiConten...

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 58abce152b81e7b03d3a9ba1daa2822c02872649..74603ff50697d9bd48b3955bd8a804b216e75c6a 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -69,7 +69,7 @@ class InfoBarVolumeControl:
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()
-               self.hideVolTimer.start(3000)
+               self.hideVolTimer.start(3000, True)
 
        def     volDown(self):
                if (eDVBVolumecontrol.getInstance().isMuted()):
@@ -78,7 +78,7 @@ class InfoBarVolumeControl:
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.volSave()
-               self.hideVolTimer.start(3000)
+               self.hideVolTimer.start(3000, True)
                
        def volHide(self):
                self.volumeDialog.instance.hide()
@@ -119,7 +119,7 @@ class InfoBarShowHide:
                
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
-               self.hideTimer.start(5000)
+               self.hideTimer.start(5000, True)
 
        def delHideTimer(self):
                del self.hideTimer
@@ -129,8 +129,7 @@ class InfoBarShowHide:
                
        def show(self):
                self.state = self.STATE_SHOWN
-               self.hideTimer.stop()
-               self.hideTimer.start(5000)
+               self.hideTimer.start(5000, True)
 
        def doTimerHide(self):
                self.hideTimer.stop()
@@ -167,7 +166,7 @@ class NumberZap(Screen):
                self.close(int(self["number"].getText()))
 
        def keyNumberGlobal(self, number):
-               self.Timer.start(3000)          #reset timer
+               self.Timer.start(3000, True)            #reset timer
                self.field = self.field + str(number)
                self["number"].setText(self.field)
                if len(self.field) >= 4:
@@ -199,7 +198,7 @@ class NumberZap(Screen):
 
                self.Timer = eTimer()
                self.Timer.timeout.get().append(self.keyOK)
-               self.Timer.start(3000)
+               self.Timer.start(3000, True)
 
 class InfoBarPowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -221,7 +220,7 @@ class InfoBarPowerKey:
        
        def powerdown(self):
                self.standbyblocked = 0
-               self.powerKeyTimer.start(3000)
+               self.powerKeyTimer.start(3000, True)
 
        def powerup(self):
                self.powerKeyTimer.stop()
@@ -400,7 +399,7 @@ class InfoBarTuner:
                self["ber_progress"] = ProgressBar()
                self.timer = eTimer()
                self.timer.timeout.get().append(self.updateTunerInfo)
-               self.timer.start(500)
+               self.timer.start(1000)
 
        def calc(self,val):
                if not val:
@@ -459,6 +458,10 @@ class InfoBarPVR:
        SEEK_STATE_BACK_32X = (0, 0, 0, -32)
        SEEK_STATE_BACK_64X = (0, 0, 0, -64)
        
+       SEEK_STATE_SM_HALF = (0, 0, 2, 0)
+       SEEK_STATE_SM_QUARTER = (0, 0, 4, 0)
+       SEEK_STATE_SM_EIGHTH = (0, 0, 8, 0)
+       
        """handles PVR specific actions like seeking, pause"""
        def __init__(self):
                self["PVRActions"] = HelpableActionMap(self, "InfobarPVRActions", 
@@ -476,7 +479,6 @@ class InfoBarPVR:
                self.skipinterval = 500 # 500ms skip interval
        
        def seekTimerFired(self):
-               print "skip", self.skipmode
                if self.skipmode > 0:
                        self.doSeek(+1, self.skipmode * self.skipinterval)
                else:
@@ -492,7 +494,6 @@ class InfoBarPVR:
                        return
                
                pauseable = service.pause()
-               print "newstate: ", self.seekstate
                
                for i in range(4):
                        if oldstate[i] != self.seekstate[i]:
@@ -524,7 +525,7 @@ class InfoBarPVR:
        def seekFwd(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_FF_2X,
-                               self.SEEK_STATE_PAUSE: self.SEEK_STATE_PLAY,
+                               self.SEEK_STATE_PAUSE: self.SEEK_STATE_SM_EIGHTH,
                                self.SEEK_STATE_FF_2X: self.SEEK_STATE_FF_4X,
                                self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_8X,
                                self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_32X,
@@ -532,14 +533,17 @@ class InfoBarPVR:
                                self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_64X,
                                self.SEEK_STATE_BACK_4X: self.SEEK_STATE_PLAY,
                                self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_4X,
-                               self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X
+                               self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
+                               self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_HALF,
+                               self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_HALF,
+                               self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_SM_QUARTER
                        }
                self.setSeekState(lookup[self.seekstate]);
        
        def seekBack(self):
                lookup = {
                                self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_4X,
-                               self.SEEK_STATE_PAUSE: self.SEEK_STATE_BACK_4X,
+                               self.SEEK_STATE_PAUSE: self.SEEK_STATE_PAUSE,
                                self.SEEK_STATE_FF_2X: self.SEEK_STATE_PLAY,
                                self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_2X,
                                self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_4X,
@@ -547,7 +551,10 @@ class InfoBarPVR:
                                self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_32X,
                                self.SEEK_STATE_BACK_4X: self.SEEK_STATE_BACK_32X,
                                self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
-                               self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_64X
+                               self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_64X,
+                               self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_QUARTER,
+                               self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_EIGHTH,
+                               self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_PAUSE
                        }
                self.setSeekState(lookup[self.seekstate]);