meta-opendreambox/recipes-dreambox/enigma2/enigma2-4.2.3r1-dm7080/0001-InfoBar-fix-EventList-Timeshift-overlap-with-config..patch

   1 From 981305510cc9d6d470837c6c118b945e64c8f4f7 Mon Sep 17 00:00:00 2001
   2 From: reichi <reichi@opendreambox.org>
   3 Date: Mon, 15 Jun 2015 11:14:43 +0200
   4 Subject: [PATCH] InfoBar: fix EventList/Timeshift overlap with
   5  config.misc.rcused.value==1
   6
   7 ---
   8  lib/python/Screens/InfoBarGenerics.py |    7 +++++--
   9  1 file changed, 5 insertions(+), 2 deletions(-)
  10
  11 diff --git a/usr/lib/enigma2/python/Screens/InfoBarGenerics.py b/usr/lib/enigma2/python/Screens/InfoBarGenerics.py
  12 index 1f57aac..f3be1db 100644
  13 --- a/usr/lib/enigma2/python/Screens/InfoBarGenerics.py
  14 +++ b/usr/lib/enigma2/python/Screens/InfoBarGenerics.py
  15 @@ -597,6 +597,9 @@ class InfoBarEPG:
  16                 yellow = (self.openSingleServiceEPG, _("show single service EPG..."))
  17                 if config.misc.rcused.value == 0:
  18                         yellow = (self.audioSelection, _("Audio Options..."))
  19 +               elif config.misc.rcused.value == 1:
  20 +                       yellow = (self.startTimeshift, _("start timeshift"))
  21 +
  22                 self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
  23                         {
  24                                 "showEventInfo": (self.openEventView, _("show EPG...")),
  25 @@ -2025,10 +2028,10 @@ class InfoBarAdditionalInfo:
  26         def __init__(self):
  27                 self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1)
  28                 self["TimeshiftPossible"] = self["RecordingPossible"]
  29 -               self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value in (0, 2)))
  30                 self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)
  31 +               self["ShowTimeshiftOnYellow"] = Boolean(fixed=config.misc.rcused.value == 1)
  32 +               self["ShowEventListOnYellow"] = Boolean(fixed=config.misc.rcused.value == 2)
  33                 self["ShowRecordOnRed"] = Boolean(fixed=config.misc.rcused.value == 1)
  34 -               self["ShowEventListOnYellow"] = Boolean(fixed=config.misc.rcused.value != 0)
  35                 self["ExtensionsAvailable"] = Boolean(fixed=1)
  36                 self["PendingNotification"] = Boolean(fixed=0)
  37
  38 --
  39 1.7.10.4
  40