diff --git a/data/keymap.ntr b/data/keymap.ntr index addb4bff510..53ba724ed17 100644 --- a/data/keymap.ntr +++ b/data/keymap.ntr @@ -79,7 +79,7 @@ - + @@ -216,7 +216,6 @@ - diff --git a/data/keymap.u80 b/data/keymap.u80 index c1d98ccf27a..c1ee620c7ed 100644 --- a/data/keymap.u80 +++ b/data/keymap.u80 @@ -75,7 +75,7 @@ - + @@ -190,7 +190,6 @@ - diff --git a/data/keymap.xml b/data/keymap.xml index 863781bff28..7c3fb9f7376 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -83,7 +83,7 @@ - + @@ -218,7 +218,6 @@ - diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 3aac1628ba2..dea20a0e68a 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -150,16 +150,16 @@ def ToggleVideo(): if mode == "letterbox": f = open("/proc/stb/video/policy", "w") f.write("panscan") - f.close() + f.close() elif mode == "panscan": f = open("/proc/stb/video/policy", "w") f.write("letterbox") - f.close() + f.close() else: # if current policy is not panscan or letterbox, set to panscan f = open("/proc/stb/video/policy", "w") f.write("panscan") - f.close() + f.close() resumePointCache = loadResumePoints() resumePointCacheLast = int(time()) @@ -525,7 +525,6 @@ def __init__(self): self["ShowHideActions"] = ActionMap( ["InfobarShowHideActions"] , { "LongOKPressed": self.toggleShowLong, - "InfoPressed": self.InfoBPressed, "toggleShow": self.OkPressed, "hide": self.keyHide, }, 1) # lower prio to make it possible to override ok and cancel.. @@ -567,10 +566,6 @@ def __layoutFinished(self): except: self.pvrStateDialog = None - def InfoBPressed(self): - if config.plisettings.PLIINFO_mode.value == "infobar": - self.toggleShow() - def OkPressed(self): if config.usage.okbutton_mode.value == "0": self.toggleShow() @@ -674,7 +669,7 @@ def doTimerHide(self): try: self.pvrStateDialog.hide() except: - pass + pass elif self.__state == self.STATE_HIDDEN and self.secondInfoBarScreen and self.secondInfoBarScreen.shown: self.secondInfoBarScreen.hide() self.secondInfoBarWasShown = False @@ -685,7 +680,7 @@ def doTimerHide(self): pass self.EventViewIsShown = False elif hasattr(self, "pvrStateDialog"): - try: + try: self.pvrStateDialog.hide() except: pass @@ -719,7 +714,7 @@ def toggleShow(self): self.hide() self.openEventView(True) self.EventViewIsShown = True - self.startHideTimer() + self.startHideTimer() else: self.hide() if self.secondInfoBarScreen and self.secondInfoBarScreen.shown: @@ -1580,9 +1575,7 @@ def RedPressed(self): def InfoPressed(self): if isStandardInfoBar(self) or isMoviePlayerInfoBar(self): - if getBoxType().startswith('vu'): - self.showDefaultEPG() - elif config.plisettings.PLIINFO_mode.value == "eventview": + if config.plisettings.PLIINFO_mode.value == "eventview": self.openEventView() elif config.plisettings.PLIINFO_mode.value == "epgpress": self.showDefaultEPG() @@ -3781,15 +3774,15 @@ def aspectSelected(self, aspect): if aspect[1] == "letterbox": f = open("/proc/stb/video/policy", "w") f.write("panscan") - f.close() + f.close() elif aspect[1] == "panscan": f = open("/proc/stb/video/policy", "w") f.write("letterbox") - f.close() + f.close() else: f = open("/proc/stb/video/policy", "w") f.write(aspect[1]) - f.close() + f.close() self.ExGreen_doHide() else: self.ExGreen_doHide() @@ -3802,7 +3795,7 @@ def __init__(self): def resolutionSelection(self): f = open("/proc/stb/vmpeg/0/xres", "r") xresString = f.read() - f.close() + f.close() f = open("/proc/stb/vmpeg/0/yres", "r") yresString = f.read() f.close() @@ -3859,7 +3852,7 @@ def ResolutionSelected(self, Resolution): if Resolution[1] != "auto": f = open("/proc/stb/video/videomode", "w") f.write(Resolution[1]) - f.close() + f.close() #from enigma import gMainDC #gMainDC.getInstance().setResolution(-1, -1) self.ExGreen_doHide()