X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/91cc542ac90b8eb7559fad677ac5e46ed44e2283..ea00936ee1a6bab7a2ba5957f7a46e8091050f22:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index a4a65ed4..82c48d8a 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -20,20 +20,20 @@
 			<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" />
+				<pixmap pos="bpTopLeft"     filename="/usr/share/enigma2/b_w_tl.png" />
+				<pixmap pos="bpTop"         filename="/usr/share/enigma2/b_w_t.png"  />
+				<pixmap pos="bpTopRight"    filename="/usr/share/enigma2/b_w_tr.png" />
+				<pixmap pos="bpLeft"        filename="/usr/share/enigma2/b_w_l.png"  />
+				<pixmap pos="bpRight"       filename="/usr/share/enigma2/b_w_r.png"  />
+				<pixmap pos="bpBottomLeft"  filename="/usr/share/enigma2/b_w_bl.png" />
+				<pixmap pos="bpBottom"      filename="/usr/share/enigma2/b_w_b.png"  />
+				<pixmap pos="bpBottomRight" filename="/usr/share/enigma2/b_w_br.png" />
 			</borderset>
 		</windowstyle> """ """
-		<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 name="Menu" position="210,150" size="300,235" title="real main menu">
+			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
+			<!--<widget name="menu" position="10,55" size="280,150" font="Arial;23" />-->
+			<widget name="menu" position="10,55" size="280,175"/>
 		</screen>
 		<screen name="ScartLoopThrough" position="0,0" size="720,576">
 		</screen>
@@ -46,29 +46,52 @@
 			<widget name="bus" position="20,50" size="300,20" />
 			<widget name="initialize" position="40,80" size="75,20" font="Arial;20" backgroundColor="red" />
 		</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="About">
-			<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="Network" position="140,125" size="360,200" title="Network">
-			<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 name="Setup" position="140,125" size="460,280" title="Setup">
+			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
+			<widget name="config" position="10,50" size="420,175" />
+			<widget name="ok" position="140,240" size="38,20" font="Arial;20" backgroundColor="green" />
+			<widget name="cancel" position="240,240" size="70,20" font="Arial;20" backgroundColor="red" />
+		</screen>
+		<screen name="NimSelection" position="140,165" size="360,100">
+			<widget name="nimlist" position="20,10" size="320,75" />
+		</screen>
+		<screen name="CiSelection" position="140,165" size="360,100">
+			<widget name="entries" position="20,10" size="320,75" />
+		</screen>
+		<screen name="CiMmi" position="140,165" size="360,260">
+			<widget name="title" position="10,0" size="320,25" font="Arial;23" />
+			<widget name="subtitle" position="10,35" size="320,25" font="Arial;23" />
+			<widget name="entries" position="20,70" size="320,150" />
+			<widget name="bottom" position="20,230" size="320,25" font="Arial;23" />
+		</screen>
+		<screen name="NimSetup" position="140,165" size="360,180">
+			<widget name="config" position="20,10" size="320,150" />
+		</screen>
+		<screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
+			<widget name="config" position="10,50" size="420,150" />
+		</screen>
+		<screen name="ScanSetup" position="100,100" size="500,400" title="Service scan">
+			<widget name="config" position="20,10" size="460,350" />
+			<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />
+		</screen>
+		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
+			<widget name="config" position="10,50" size="420,175" />
+			<widget name="introduction" position="10,230" size="400,30" font="Arial;23" />
+		</screen>
+		<screen name="PluginBrowser" position="190,125" size="360,250" title="Plugins">
+			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
+			<widget name="pluginlist" position="10,50" size="320,200" />
+		</screen>
+		<screen name="About" position="140,125" size="360,250" title="About">
+			<widget name="text" position="10,30" size="420,40" font="Arial;18"/>
+			<widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>
+			<widget name="tuner0" position="10,100" size="420,20" font="Arial;18"/>
+			<widget name="tuner1" position="10,120" size="420,20" font="Arial;18"/>
+			<widget name="hdd" position="10,170" size="420,20" font="Arial;18"/>
+			<widget name="hddA" position="10,190" size="420,20" font="Arial;18"/>
 		</screen>
 		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
-			<widget name="okbutton" position="20,245" size="205,40" />
+			<widget name="okbutton" position="20,270" 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" />
@@ -79,7 +102,8 @@
 		<screen name="configTest" position="300,100" size="300,300" title="config menu">
 			<widget name="config" position="10,30" size="420,220" />
 		</screen>
-		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">
+<!--		<screen name="TimerEditList" position="160,100" size="420,430" title="Timer Editor">-->
+		<screen name="TimerEditList" position="160,100" size="420,330" title="Timer Editor">
 			<widget name="timerlist" position="10,30" size="400,300" />
 		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
@@ -88,13 +112,13 @@
 			<widget name="theClock" position="10,60" size="280,50" />
 		</screen>
 		<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" />
+			<ePixmap position="0,0" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
 			
 			<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" position="273,68" size="282,22" font="Arial;20" backgroundColor="dark" />
+			<widget name="Event_Next" position="273,98" size="282,22" font="Arial;20" 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" /> -->
@@ -102,17 +126,18 @@
  		<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" />
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
 		</screen>
  		<screen name="MovieSelection" position="150,100" size="400,420" title="Select-a-movie">
 			<widget name="list" position="0,50" size="400,300" />
+			<widget name="freeDiskSpace" position="0,360" size="400,40" />
 		</screen>
-		<screen name="ServiceScan" position="150,100" size="300,90" title="Service Scan">
+		<screen name="ServiceScan" position="200,100" size="300,200" title="Service Scan">
 			<widget name="scan_progress" position="10,10" size="300,20" />
-			<widget name="scan_state" position="10,40" size="280,30" />
+			<widget name="scan_state" position="10,40" size="280,60" font="Arial;20" />
 		</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" />
@@ -123,7 +148,7 @@
 			<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" />
+			<widget name="text" position="0,0" size="650,0" font="Arial;22" />
 			<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrated applets.
 from enigma import eSize, ePoint
@@ -147,4 +172,4 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			</applet>
 		</screen>
-	</skin>
\ No newline at end of file
+	</skin>