From fc224b243391f3080e0cbb934ae45a68f30e266d Mon Sep 17 00:00:00 2001
From: acid-burn <acidburn@opendreambox.org>
Date: Tue, 13 Oct 2009 07:27:23 +0200
Subject: [PATCH] Enigma2{data/skin_default.xml,Videomode/plugin.py}: - revert
 own skin entry for VideoMode Plugin(removed again from skin_default.xml),
 instead use the "Setup" Skin entry, but still allow individual skinning using
 "VideoSetup" as screen name.

---
 data/skin_default.xml                                | 8 --------
 lib/python/Plugins/SystemPlugins/Videomode/plugin.py | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/data/skin_default.xml b/data/skin_default.xml
index b2adfaa3..36b1e1c4 100755
--- 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 db810f0c..733edd6d 100755
--- 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 = [ ]
-- 
2.30.2