From c1311444ea249a45d0eceefa15d77fce410a54da Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sun, 11 Dec 2005 22:58:36 +0000
Subject: add some translations (translations in the wizard don't work in some
 places) remove every moving pixmap from the startwizard (because of
 flickering)

---
 data/keymap.xml      |  1 +
 data/skin.xml        |  4 ++--
 data/startwizard.xml | 51 +++++++++++++++++++++------------------------------
 3 files changed, 24 insertions(+), 32 deletions(-)

(limited to 'data')

diff --git a/data/keymap.xml b/data/keymap.xml
index 1a0c5c55..693f9330 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -72,6 +72,7 @@
 		<key id="KEY_UP" mapto="up" flags="mr" />
 		<key id="KEY_DOWN" mapto="down" flags="mr" />
 		<key id="KEY_OK" mapto="ok" flags="m" />
+		<key id="KEY_EXIT" mapto="back" flags="m" />
 	</map>
 	
 	<map context="InfobarMenuActions">
diff --git a/data/skin.xml b/data/skin.xml
index 71b4b168..3c9f55db 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -70,8 +70,8 @@
 			<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="LanguageSelection" position="100,125" size="540,280" title="Language selection">
-			<widget name="list" position="10,50" size="520,175" />
+		<screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
+			<widget name="list" position="10,0" size="190,240" />
 		</screen>
 		<screen name="NimSelection" position="140,165" size="400,100" title="select Slot">
 			<widget name="nimlist" position="20,10" size="360,75" />
diff --git a/data/startwizard.xml b/data/startwizard.xml
index d4c7efab..d15082fd 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -2,9 +2,11 @@
 		<step number="1">
 			<text value="Hello User.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\n\nPress the OK button on your remote control to move to the next step." />
 			<code>
-self["arrowdown"].moveTo(557, 232, 10)
-self["rc"].moveTo(500, 50, 10)		
+self["arrowdown"].moveTo(557, 232, 1)
 self["arrowdown"].startMoving()
+self["arrowup"].moveTo(800, 232, 1)
+self["arrowup"].startMoving()
+self["rc"].moveTo(500, 50, 1)
 self["rc"].startMoving()
 			</code>
 		</step>
@@ -15,34 +17,39 @@ self["rc"].startMoving()
 				<listentry caption="Exit wizard" step="end" />
 			</list>
 			<code>
-self["arrowdown"].moveTo(557, 200, 10)
-self["arrowup"].moveTo(557, 355, 10)
+self["arrowdown"].moveTo(557, 200, 1)
+self["arrowup"].moveTo(557, 355, 1)
 self["arrowdown"].startMoving()
 self["arrowup"].startMoving()
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
 			</code>
 		</step>
 		<step number="3">
-			<text value="Please set up tuner A" />
+			<text value="Use the left and right buttons to change an option.\n\nPlease set up tuner A" />
 			<config screen="NimSetup" module="Satconfig" args="0" type="ConfigList" />
 			<code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(525, 320, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowup2"].moveTo(590, 320, 1)
+self["arrowup2"].startMoving()
+self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
+
 			</code>
 		</step>
 		<step number="4">
 			<text value="Please set up tuner B" />
 			<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
 			<code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(800, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(800, 310, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
-self["arrowdown"].startMoving()
+self["arrowup2"].moveTo(800, 310, 1)
+self["arrowup2"].startMoving()
 			</code>
 		</step>
 		<step number="5">
@@ -55,24 +62,8 @@ self["arrowdown"].startMoving()
 		<step number="6">
 			<text value="What do you want to scan?" />
 			<config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
-			<code>
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
-self["arrowdown"].startMoving()
-			</code>
 		</step>
 		<step number="7">
 			<text value="Thanx for using the wizard. Your box is now ready to use." />
-			<code>
-self["arrowdown"].moveTo(740, 200, 10)
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 600, 5)
-self["rc"].startMoving()
-			</code>
 		</step>	
 </wizard>
-- 
cgit v1.2.3