X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/98c4b5bb004e9297bffa8e1c3572572741fda933..4c6f2641f8262e72a0df0e6d1225e121a4210867:/skin.py

diff --git a/skin.py b/skin.py
index 57065076..9d4b7571 100644
--- a/skin.py
+++ b/skin.py
@@ -14,130 +14,16 @@ def dump(x, i=0):
 	except:
 		None
 
-dom = xml.dom.minidom.parseString(
-	"""<skin>
-	
-		<colors>
-			<color name="white" 	value="#ffffff" />
-			<color name="black" 	value="#000000" />
-			<color name="dark"  	value="#294a6b" />
-			
-			<color name="red" 		value="#ff0000" />
-			<color name="green" 	value="#00ff00" />
-			<color name="blue" 		value="#0000ff" />
-			<color name="yellow"	value="#c0c000" />
-		</colors>
-		<windowstyle type="skinned">
-			<color name="Background" color="#4075a7" />
-			<color name="LabelForeground" color="#ffffff" />
-			<color name="ListboxBackground" color="#4075a7" />
-			<color name="ListboxForeground" color="#ffffff" />
-			<color name="ListboxSelectedBackground" color="#404080" />
-			<color name="ListboxSelectedForeground" color="#ffffff" />
-			<color name="ListboxMarkedBackground" color="#ff0000" />
-			<color name="ListboxMarkedForeground" color="#ffffff" />
-			<borderset name="bsWindow">
-				<pixmap pos="bpTopLeft"     filename="data/b_w_tl.png" />
-				<pixmap pos="bpTop"         filename="data/b_w_t.png"  />
-				<pixmap pos="bpTopRight"    filename="data/b_w_tr.png" />
-				<pixmap pos="bpLeft"        filename="data/b_w_l.png"  />
-				<pixmap pos="bpRight"       filename="data/b_w_r.png"  />
-				<pixmap pos="bpBottomLeft"  filename="data/b_w_bl.png" />
-				<pixmap pos="bpBottom"      filename="data/b_w_b.png"  />
-				<pixmap pos="bpBottomRight" filename="data/b_w_br.png" />
-			</borderset>
-		</windowstyle> """ """
-		<screen name="Menu" position="300,100" size="300,300" title="real main menu">
-<!--			<widget name="okbutton" position="10,190" size="280,50" font="Arial;20" valign="center" halign="center" />-->
-			<widget name="title" position="10,10" size="280,20" />
-			<widget name="menu" position="10,30" size="280,200" />
-			
-		</screen>
-		<screen name="ScartLoopThrough" position="0,0" size="720,576">
-		</screen>
-		<screen name="ConfigMenu" position="300,100" size="300,300" title="real main menu">
-			<widget name="txt_var_1" position="20,20" size="100,20" />
-			<widget name="btn_var_1" position="110,20" size="200,20" />
-			<widget name="txt_var_2" position="20,60" size="100,20" />
-			<widget name="btn_var_2" position="110,60" size="200,20" />
-		</screen>
-		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
-			<widget name="okbutton" position="20,245" size="205,40" />
-			<widget name="txt_alpha" position="20,20" size="110,20" />
-			<widget name="sld_alpha" position="150,20" size="290,20" />
-			<widget name="txt_brightness" position="20,60" size="120,20" />
-			<widget name="sld_brightness" position="150,20" size="290,20" />
-			<widget name="txt_gamma" position="20,100" size="120,20" />
-			<widget name="sld_gamma" position="150,100" size="290,20" />
-		</screen>
-		<screen name="configTest" position="300,100" size="300,300" title="config menu">
-			<widget name="config" position="10,30" size="280,140" />
-		</screen>
-		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">
-			<widget name="timerlist" position="10,30" size="400,300" />
-		</screen>
-		<screen name="clockDisplay" position="300,100" size="300,300">
-			<widget name="okbutton" position="10,10" size="280,40" />
-			<widget name="title" position="10,120" size="280,50" />
-			<widget name="theClock" position="10,60" size="280,50" />
-		</screen>
-		<screen name="InfoBar" position="0,380" size="720,151" title="InfoBar" flags="wfNoBorder">
-			<ePixmap position="0,0" size="720,151" pixmap="data/info-bg.png" />
-			
-			<widget name="ServiceName" position="69,30" size="427,26" valign="center" font="Arial;32" backgroundColor="#101258" />
-			<widget name="CurrentTime" position="575,10" size="66,30" backgroundColor="dark" font="Arial;16" />
-			<widget name="Event_Now" position="273,68" size="282,30" font="Arial;29" backgroundColor="dark" />
-			<widget name="Event_Next" position="273,98" size="282,30" font="Arial;29" backgroundColor="dark" />
-			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;26" backgroundColor="dark" />
-			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;26" backgroundColor="dark" />
-<!--			<eLabel position="70,0" size="300,30" text=".oO skin Oo." font="Arial;20" /> -->
-		</screen>
-		<screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
-			<widget name="list" position="0,50" size="560,340" />
-<!--			<widget name="okbutton" position="340,50" size="140,30" />-->
-			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" />
-			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" />
-			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" />
-			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" />
-		</screen>
-		<screen name="ServiceScan" position="150,100" size="300,200" title="Service Scan">
-			<widget name="scan_progress" position="10,10" size="280,50" />
-			<widget name="scan_state" position="10,60" size="280,30" />
-		</screen>
-		<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
-			<widget name="description" position="10,10" size="580,40" font="Arial;25" />
-			<widget name="lbegin" position="405,102" size="103,30" font="Arial;25" foregroundColor="red" />
-			<widget name="lend" position="405,158" size="103,30" font="Arial;25" foregroundColor="green" />
-			<widget name="begin" position="508,105" size="72,35" font="Arial;25" />
-			<widget name="end" position="508,150" size="72,35" font="Arial;25" />
-			<widget name="apply" position="10,240" size="250,35" />
-		</screen>
-		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
-			<widget name="text" position="0,0" size="500,0" font="Arial;25" />
-			<applet type="onLayoutFinish">
-# this should be factored out into some helper code, but currently demonstrated applets.
-from enigma import eSize, ePoint
-
-orgwidth = self.instance.size().width()
-orgpos = self.instance.position()
-textsize = self["text"].getSize()
-
-# y size still must be fixed in font stuff...
-textsize = (textsize[0], textsize[1] + 20)
-wsize = (textsize[0] + 20, textsize[1] + 20)
-
-# resize 
-self.instance.resize(eSize(*wsize))
-
-# resize label
-self["text"].instance.resize(eSize(*textsize))
+# read the skin
+try:
+	# first we search in the current path
+	skinfile = file('data/skin.xml', 'r')
+except:
+	# if not found in the current path, we use the global datadir-path
+	skinfile = file('/usr/share/enigma2/skin.xml', 'r')
+dom = xml.dom.minidom.parseString(skinfile.read())
+skinfile.close()
 
-# center window
-newwidth = wsize[0]
-self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
-			</applet>
-		</screen>
-	</skin>""")
 
 def parsePosition(str):
 	x, y = str.split(',')
@@ -170,7 +56,7 @@ def collectAttributes(skinAttributes, node):
 		# TODO: localization? as in e1?
 		value = str(a.value)
 		
-		skinAttributes[attrib] = value
+		skinAttributes.append((attrib, value))
 
 def applySingleAttribute(guiObject, desktop, attrib, value):		
 	# and set attributes
@@ -232,7 +118,7 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
 		print "widget %s (%s) doesn't support attribute %s!" % ("", guiObject.__class__.__name__, attrib)
 
 def applyAllAttributes(guiObject, desktop, attributes):
-	for (attrib, value) in attributes.items():
+	for (attrib, value) in attributes:
 		applySingleAttribute(guiObject, desktop, attrib, value)
 
 def loadSkin(desktop):
@@ -298,7 +184,7 @@ def readSkin(screen, skin, name, desktop):
 	
 	assert myscreen != None, "no skin for screen '" + name + "' found!"
 
-	screen.skinAttributes = { }	
+	screen.skinAttributes = [ ]
 	collectAttributes(screen.skinAttributes, myscreen)
 	
 	screen.additionalWidgets = [ ]
@@ -312,7 +198,7 @@ def readSkin(screen, skin, name, desktop):
 		
 		# get corresponding gui object
 		try:
-			attributes = screen[wname].skinAttributes = { }
+			attributes = screen[wname].skinAttributes = [ ]
 		except:
 			raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")
 		
@@ -345,7 +231,7 @@ def readSkin(screen, skin, name, desktop):
 		else:
 			raise str("unsupported stuff : %s" % widget.tagName)
 		
-		w.skinAttributes = { }
+		w.skinAttributes = [ ]
 		collectAttributes(w.skinAttributes, widget)
 		
 		# applyAttributes(guiObject, widget, desktop)