Enigma2{data/skin_default.xml,Videomode/plugin.py}: - revert own skin entry for Video...

instead use the "Setup" Skin entry, but still allow individual skinning using "VideoSetup" as screen name.

diff --git a/data/skin_default.xml b/data/skin_default.xml
index b2adfaa..36b1e1c 100755 (executable)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1175,12 +1175,4 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
                <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
        </screen>
-       <!-- VideoSetup (VideoMode Plugin) -->
-       <screen name="VideoSetup" position="center,center" size="560,430" title="VideoSetup">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
-       </screen>
 </skin>

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index db810f0..733edd6 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -13,6 +13,8 @@ class VideoSetup(Screen, ConfigListScreen):
 
        def __init__(self, session, hw):
                Screen.__init__(self, session)
+               # for the skin: first try VideoSetup, then Setup, this allows individual skinning
+               self.skinName = ["VideoSetup", "Setup" ]
                self.setup_title = _("A/V Settings")
                self.hw = hw
                self.onChangedEntry = [ ]