Support turbo2.

[vuplus_dvbapp] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
old mode 100755 (executable)
new mode 100644 (file)
index 0b01bf8..bc66f1f
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -44,6 +44,9 @@ from RecordTimer import RecordTimerEntry, RecordTimer, findSafeRecordPath
 # hack alert!
 from Menu import MainMenu, mdom
 
+def isStandardInfoBar(self):
+       return self.__class__.__name__ == "InfoBar"
+
 class InfoBarDish:
        def __init__(self):
                self.dishDialog = self.session.instantiateDialog(Dish)
@@ -235,7 +238,7 @@ class InfoBarNumberZap:
                        else:
                                self.servicelist.recallPrevService()
                else:
-                       if self.has_key("TimeshiftActions") and not self.timeshift_enabled:
+                       if not (self.has_key("TimeshiftActions") and self.timeshift_enabled):
                                self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
        def numberEntered(self, retval):
@@ -852,7 +855,7 @@ class InfoBarSeek:
                return seek
 
        def isSeekable(self):
-               if self.getSeek() is None:
+               if self.getSeek() is None or (isStandardInfoBar(self) and not self.timeshift_enabled):
                        return False
                return True
 
@@ -1185,11 +1188,12 @@ class InfoBarShowMovies:
 
 class InfoBarTimeshift:
        def __init__(self):
-               self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
-                       {
-                               "timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
-                               "timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
-                       }, prio=1)
+               if SystemInfo["PVRSupport"]:
+                       self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions",
+                               {
+                                       "timeshiftStart": (self.startTimeshift, _("start timeshift")),  # the "yellow key"
+                                       "timeshiftStop": (self.stopTimeshift, _("stop timeshift"))      # currently undefined :), probably 'TV'
+                               }, prio=1)
                self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
                        {
                                "timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
@@ -1520,10 +1524,11 @@ class InfoBarInstantRecord:
        """Instant Record - handles the instantRecord action in order to
        start/stop instant records"""
        def __init__(self):
-               self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
-                       {
-                               "instantRecord": (self.instantRecord, _("Instant Record...")),
-                       })
+               if SystemInfo["PVRSupport"]:
+                       self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord",
+                               {
+                                       "instantRecord": (self.instantRecord, _("Instant Record...")),
+                               })
                self.recording = []
 
        def stopCurrentRecording(self, entry = -1):