X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a8644e3e187fa0301e72ad752b1c8f2a20e848e5..3d05da66ac0fb10d27409fc8b8f5cd99aedf939b:/data/skin.xml

diff --git a/data/skin.xml b/data/skin.xml
index 58ea6d58..66bcd202 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -35,44 +35,44 @@
 		</windowstyle> """ """
 		<screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby">
 		</screen>
-		<screen name="Menu" position="210,150" size="300,235" title="real main menu">
+		<screen name="Menu" position="210,150" size="300,235" title="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>
-		<screen name="ServiceInfo" position="180,120" size="360,330">
+		<screen name="ServiceInfo" position="180,120" size="360,330" title="Serviceinfo">
 			<widget name="infolist" position="20,10" size="320,325" />
 		</screen>
-		<screen name="AudioSelection" position="210,150" size="300,170">
+		<screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
 			<widget name="tracks" position="20,10" size="260,150" />
 		</screen>
 		<screen name="HarddiskWait" position="140,165" size="360,60">
 			<widget name="wait" position="20,10" size="320,25" font="Arial;23"/>
 		</screen>
-		<screen name="HarddiskSelection" position="140,165" size="360,100">
+		<screen name="HarddiskSelection" position="140,165" size="360,100" title="Select HDD">
 			<widget name="hddlist" position="20,10" size="320,75" />
 		</screen>
-		<screen name="HarddiskSetup" position="140,165" size="420,160">
+		<screen name="HarddiskSetup" position="140,165" size="420,160" title="Harddisk">
 			<widget name="model" position="20,10" size="380,25" font="Arial;23"  />
 			<widget name="capacity" position="20,40" size="380,25" font="Arial;23"  />
 			<widget name="bus" position="20,70" size="380,25" font="Arial;23"  />
 			<widget name="initialize" position="40,110" size="100,28" font="Arial;25" backgroundColor="red" />
 		</screen>
-		<screen name="Setup" position="140,125" size="460,280" title="Setup">
+		<screen name="Setup" position="100,125" size="540,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="config" position="10,50" size="520,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 name="NimSelection" position="140,165" size="400,100" title="select Slot">
+			<widget name="nimlist" position="20,10" size="360,75" />
 		</screen>
-		<screen name="CiWait" position="140,165" size="360,50">
+		<screen name="CiWait" position="140,165" size="360,50" title="Common Interface">
 			<widget name="message" position="20,10" size="320,25" font="Arial;23" />
 		</screen>
-		<screen name="CiSelection" position="140,165" size="360,100">
+		<screen name="CiSelection" position="140,165" size="360,100" title="Common Interface">
 			<widget name="entries" position="20,10" size="320,75" />
 		</screen>
 		<screen name="CiMmi" position="140,165" size="360,260">
@@ -81,15 +81,15 @@
 			<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 name="NimSetup" position="140,165" size="360,250" title="Satconfig">
+			<widget name="config" position="20,10" size="320,220" />
 		</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">
+		<screen name="ScanSetup" position="90,100" size="520,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" />
+			<widget name="introduction" position="20,360" size="350,30" font="Arial;23" />
 		</screen>
 		<screen name="ScanSimple" position="150,100" size="400,300" title="Service scan">
 			<widget name="header" position="20,10" size="280,25" font="Arial;23"/>
@@ -99,6 +99,8 @@
 		</screen>
 		<screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
 			<widget name="config" position="5,10" size="480,350" />
+			<widget name="ok" position="140,365" size="38,20" font="Arial;20" backgroundColor="green" />
+			<widget name="cancel" position="240,365" size="70,20" font="Arial;20" backgroundColor="red" />
 		</screen>
 		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
 			<widget name="config" position="10,50" size="420,175" />
@@ -142,7 +144,7 @@
 		</screen>
 		<screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
 			<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="Event_Now_StartTime" position="210,68" size="60,22" font="Arial;20" backgroundColor="dark" />
@@ -162,8 +164,9 @@
 		</screen>
 
 
-		<screen name="NumberZap" flags="wfNoBorder" position="300,120" size="120,60">
-			<widget name="number" position="30,15" size="80,25" font="Arial;23" />
+		<screen name="NumberZap" position="200,140" size="280,60" title="Channel">
+			<widget name="channel" position="50,15" size="110,25" font="Arial;23" />
+			<widget name="number" position="160,15" size="80,25" halign="right" font="Arial;23" />
 		</screen>
 		<screen name="Volume" flags="wfNoBorder" position="400,125" size="180,60" title="Volume">
 			<ePixmap position="0,0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
@@ -173,16 +176,27 @@
 		<screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute">
 			<ePixmap position="0,0" size="59,80" pixmap="/usr/share/enigma2/mute-fs8.png" />
 		</screen>
- 		<screen name="ChannelSelection" position="90,100" size="560,450" title="Channel Selection">
-			<widget name="list" position="10,50" size="540,400" />
-<!--			<widget name="okbutton" position="340,50" size="140,30" />-->
+ 		<screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
+			<widget name="list" position="10,45" size="540,364" />
+			<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="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
+			<widget name="list" position="10,45" size="540,364" />
 			<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="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
-			<widget name="list" position="10,5" size="550,400" />
+			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
+			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
+			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Arial;21" />
+			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Arial;21" />
+
+			<widget name="list" position="10,40" size="550,370" />
 		</screen>
 		<screen name="EventView" position="100,100" size="520,380" title="Eventview">
 			<widget name="epg_description" position="10,5" size="500,335" font="Arial;22" />
@@ -206,8 +220,14 @@
 			<widget name="end" position="508,150" size="72,35" font="Arial;25" />
 			<widget name="apply" position="10,240" size="250,35" />
 		</screen>
+		<screen name="HelpMenu" flags="wfNoBorder" position="0,0" size="720,576" title="Menu">
+			<widget name="list" position="100,100" size="550,375" />
+			<eLabel position="500,40" size="220,60" text="help..." font="Arial;50" />
+		</screen>
 		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
-			<widget name="text" position="0,0" size="650,0" font="Arial;22" />
+			<widget name="text" position="0,35" size="650,0" font="Arial;22" />
+			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
+			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
 			<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
@@ -218,7 +238,12 @@ textsize = self["text"].getSize()
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0], textsize[1] + 50)
-wsize = (textsize[0] + 50, textsize[1] + 50)
+wsizex = textsize[0] + 50
+wsizey = textsize[1] + 50
+if (280 > wsizex):
+	wsizex = 280
+wsize = (wsizex, wsizey)
+
 
 # resize 
 self.instance.resize(eSize(*wsize))