Revert "Make hidepip when pig configurable via a skin attribute"
authorlittlesat <littlesat99@yahoo.com>
Fri, 4 Jul 2014 12:24:57 +0000 (14:24 +0200)
committerlittlesat <littlesat99@yahoo.com>
Fri, 4 Jul 2014 12:24:57 +0000 (14:24 +0200)
This reverts commit 37a17830f2c5ec22fc17c56e64b7461e3cd6e731.

As I found a more easy solution via self.skinAttributes

lib/python/Components/Renderer/Pig.py
skin.py

index b884d53..493391d 100644 (file)
@@ -4,7 +4,6 @@
 from Renderer import Renderer
 from enigma import eVideoWidget, eSize, eRect, ePoint, getDesktop
 from Screens.PictureInPicture import PipPigMode
-from Components.config import config
 
 class Pig(Renderer):
        def __init__(self):
@@ -31,9 +30,9 @@ class Pig(Renderer):
                                self.instance.resize(self.Size)
                        if self.Position:
                                self.instance.move(self.Position)
-                       config.skin.hide_pip_when_pig.value and PipPigMode(True)
+                       PipPigMode(True)
 
        def onHide(self):
                if self.instance:
                        self.preWidgetRemove(self.instance)
-                       config.skin.hide_pip_when_pig.value and PipPigMode(False)
\ No newline at end of file
+                       PipPigMode(False)
diff --git a/skin.py b/skin.py
index 54e3b22..2b44e8b 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -6,7 +6,7 @@ import os
 profile("LOAD:enigma_skin")
 from enigma import eSize, ePoint, eRect, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \
        addFont, gRGB, eWindowStyleSkinned, getDesktop
-from Components.config import ConfigSubsection, ConfigText, config, ConfigYesNo
+from Components.config import ConfigSubsection, ConfigText, config
 from Components.Converter.Converter import Converter
 from Components.Sources.Source import Source, ObsoleteSource
 from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS, SCOPE_CURRENT_SKIN, SCOPE_CONFIG, fileExists
@@ -74,7 +74,6 @@ if not fileExists(resolveFilename(SCOPE_SKIN, DEFAULT_SKIN)):
        # in that case, fallback to Magic (which is an SD skin)
        DEFAULT_SKIN = "Magic/skin.xml"
 config.skin.primary_skin = ConfigText(default=DEFAULT_SKIN)
-config.skin.hide_pip_when_pig = ConfigYesNo(True)
 
 profile("LoadSkin")
 try:
@@ -395,8 +394,6 @@ class AttributeParser:
                self.guiObject.setShadowOffset(parsePosition(value, self.scale))
        def noWrap(self, value):
                self.guiObject.setNoWrap(1)
-       def hidePip(self, value):
-               config.skin.hide_pip_when_pig.value = value == 1 or False
 
 def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1))):
        # Someone still using applySingleAttribute?