display "audio" instead of "timeshift" in the infobar next to the yellow knob for...

diff --git a/data/skin.xml b/data/skin.xml
index a05128f53e9212971f958e83178e7f34a3f9e106..f1e25496bb0b7189757273e50f90739e044e8a92 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -204,10 +204,20 @@
                <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
                        <convert type="ConditionalShowHide" />
                </widget>
                <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
                        <convert type="ConditionalShowHide" />
                </widget>

-               <eLabel text="Timeshift" position="460,130" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
+               <widget source="ShowTimeshiftOnYellow" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" shadowOffset="-1,-1" transparent="1">
+                       <convert type="ConditionalShowHide" />
+               </widget>

                <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
                        <convert type="ConditionalShowHide" />
                </widget>
                <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
                        <convert type="ConditionalShowHide" />
                </widget>

+               
+               <!-- Yellow button (used for audio on boxes with new rc?) -->
+               <widget source="ShowAudioOnYellow" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="ShowAudioOnYellow" render="FixedLabel" text="Audio" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
+                       <convert type="ConditionalShowHide" />
+               </widget>

                <!-- Blue button (is extensions available?) -->
                <ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" />
                <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on">
                <!-- Blue button (is extensions available?) -->
                <ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" />
                <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on">

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4526a0c607f9b0c58d40b15a850e41ed10a60b68..718c2d5402b1d478629e4c786436fa9505beb4fa 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1732,7 +1732,9 @@ class InfoBarAdditionalInfo:
        def __init__(self):
 
                self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
        def __init__(self):
 
                self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)

-               self["TimeshiftPossible"] = self["RecordingPossible"]
+               self["TimeshiftPossible"] = Boolean(fixed=(harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1))
+               self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0))
+               self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0)

                self["ExtensionsAvailable"] = Boolean(fixed=1)
 
 class InfoBarNotifications:
                self["ExtensionsAvailable"] = Boolean(fixed=1)
 
 class InfoBarNotifications:

diff --git a/mytest.py b/mytest.py
index 8c900c18f5e59dcbde70125ea5909229ac4e9829..0c448d702a774dba1d6ac2a09f9285c82c34ae64 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -72,10 +72,11 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager

+from Screens.DefaultWizard import *

 from Screens.ImageWizard import *
 from Screens.StartWizard import *
 from Screens.ImageWizard import *
 from Screens.StartWizard import *

-from Screens.DefaultWizard import *

 from Screens.TutorialWizard import *
 from Screens.TutorialWizard import *

+import Screens.Rc

 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor