X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=skin.py;h=ffaa2018b0265f2aa5842efff490d8e4d5577cf3;hb=f51fb455f939496048538044c1597f2a8e14edba;hp=5706507618e2f2d056f8695a0392af1875dcdf99;hpb=98c4b5bb004e9297bffa8e1c3572572741fda933;p=vuplus_dvbapp

diff --git a/skin.py b/skin.py
index 5706507..ffaa201 100644
--- a/skin.py
+++ b/skin.py
@@ -20,7 +20,7 @@ dom = xml.dom.minidom.parseString(
 		<colors>
 			<color name="white" 	value="#ffffff" />
 			<color name="black" 	value="#000000" />
-			<color name="dark"  	value="#294a6b" />
+			<color name="dark"  	value="#20294a6b" />
 			
 			<color name="red" 		value="#ff0000" />
 			<color name="green" 	value="#00ff00" />
@@ -47,19 +47,27 @@ dom = xml.dom.minidom.parseString(
 				<pixmap pos="bpBottomRight" filename="data/b_w_br.png" />
 			</borderset>
 		</windowstyle> """ """
-		<screen name="Menu" position="300,100" size="300,300" title="real main menu">
+		<screen name="Menu" position="300,100" size="300,200" 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 name="HarddiskSelection" position="140,125" size="460,220">
+		</screen>
+		<screen name="Setup" position="140,125" size="460,220" title="Setup">
+			<widget name="config" position="10,30" size="420,120" />
+			<widget name="ok" position="140,180" size="38,20" font="Arial;20" backgroundColor="green" />
+			<widget name="cancel" position="240,180" size="70,20" font="Arial;20" backgroundColor="red" />
+		</screen>
+		<screen name="About" position="140,125" size="360,200" title="Setup">
+			<widget name="text" position="10,30" size="420,40" font="Arial;20"/>
+			<widget name="tuner" position="10,80" size="420,20"/>
+			<widget name="tunerA" position="10,100" size="420,20"/>
+			<widget name="tunerB" position="10,120" size="420,20"/>
+			<widget name="hdd" position="10,150" size="420,20"/>
+			<widget name="hddA" position="10,170" size="420,20"/>
 		</screen>
 		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
 			<widget name="okbutton" position="20,245" size="205,40" />
@@ -71,7 +79,7 @@ dom = xml.dom.minidom.parseString(
 			<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" />
+			<widget name="config" position="10,30" size="420,220" />
 		</screen>
 		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">
 			<widget name="timerlist" position="10,30" size="400,300" />
@@ -81,28 +89,32 @@ dom = xml.dom.minidom.parseString(
 			<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" />
+		<screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
+			<ePixmap position="0,0" size="720,148" 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" />
+			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
+			<widget name="Volume" position="575,45" size="100,5" backgroundColor="dark" />
+			<widget name="Event_Now" position="273,68" size="282,30" font="Arial;22" backgroundColor="dark" />
+			<widget name="Event_Next" position="273,98" size="282,30" font="Arial;22" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="555,68" size="70,26" font="Arial;22" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="555,98" size="70,26" font="Arial;22" 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" />
+ 		<screen name="ChannelSelection" position="90,100" size="560,420" title="Channel Selection">
+			<widget name="list" position="0,50" size="560,320" />
 <!--			<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 name="MovieSelection" position="150,100" size="400,420" title="Select-a-movie">
+			<widget name="list" position="0,50" size="400,300" />
+		</screen>
+		<screen name="ServiceScan" position="150,100" size="300,90" title="Service Scan">
+			<widget name="scan_progress" position="10,10" size="300,20" />
+			<widget name="scan_state" position="10,40" 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" />
@@ -170,7 +182,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 +244,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 +310,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 +324,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 +357,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)