[skin_default] Support refactored VirtualKeyBoard (#17)

oe-alliance · Nov 6, 2018 · 8a23e40 · 8a23e40
1 parent b076542
commit 8a23e40
Show file tree

Hide file tree

Showing 33 changed files with 9 additions and 5 deletions.
diff --git a/skin_default.xml b/skin_default.xml
@@ -2120,11 +2120,15 @@ self.autoResize()
 	<screen name="VideoMode" position="center,center" size="250,60" title="VideoMode">
 		<widget name="videomode" position="10,10" size="230,40" font="Regular;23" halign="left"/>
 	</screen>
-	<screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99">
-		<ePixmap pixmap="vkey_text.png" position="9,35" zPosition="-4" size="542,52" alphatest="on"/>
-		<widget name="header" position="10,10" size="500,20" font="Regular;20" transparent="1" noWrap="1"/>
-		<widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right"/>
-		<widget name="list" position="10,100" size="540,225" selectionDisabled="1" foregroundColor="window-fg" backgroundColor="#001c2c5c" transparent="1"/>
+	<screen name="VirtualKeyBoard" position="center,center" size="650,375" zPosition="99">
+		<ePixmap pixmap="vkey_text.png" position="5,35" zPosition="-4" size="640,50" alphatest="on"/>
+		<widget name="header" position="10,10" size="630,25" font="Regular;20" transparent="1" noWrap="1" conditional="header"/>
+		<widget name="prompt" position="10,10" size="630,25" font="Regular;20" transparent="1" noWrap="1" conditional="prompt"/>
+		<widget name="text" position="10,35" size="630,50" font="Regular;40" transparent="1" noWrap="1" halign="right" valign="center"/>
+		<widget name="list" position="10,100" size="630,225" selectionDisabled="1" foregroundColor="window-fg" backgroundColor="#001c2c5c" transparent="1"/>
+		<widget name="locale" position="10,350" size="480,25" font="Regular;20" transparent="1" conditional="locale"/>
+		<widget name="mode" position="580,350" size="60,25" font="Regular;20" halign="right" transparent="1" conditional="mode"/>
+		<widget name="language" position="0,0" size="0,0" font="Regular;20" transparent="1" conditional="language"/>
 	</screen>
 	<!-- Wizzard's -->
 	<screen name="StartWizard" position="0,0" size="1280,720" title="Welcome..." flags="wfNoBorder" backgroundColor="black">

diff --git a/skin_default/buttons/vkey_backspace.png b/skin_default/buttons/vkey_backspace.png
diff --git a/skin_default/buttons/vkey_blue.png b/skin_default/buttons/vkey_blue.png
diff --git a/skin_default/buttons/vkey_enter.png b/skin_default/buttons/vkey_enter.png
diff --git a/skin_default/buttons/vkey_first.png b/skin_default/buttons/vkey_first.png
diff --git a/skin_default/buttons/vkey_green.png b/skin_default/buttons/vkey_green.png
diff --git a/skin_default/buttons/vkey_last.png b/skin_default/buttons/vkey_last.png
diff --git a/skin_default/buttons/vkey_red.png b/skin_default/buttons/vkey_red.png
diff --git a/skin_default/buttons/vkey_sel.png b/skin_default/buttons/vkey_sel.png
diff --git a/skin_default/buttons/vkey_shift0.png b/skin_default/buttons/vkey_shift0.png
diff --git a/skin_default/buttons/vkey_shift1.png b/skin_default/buttons/vkey_shift1.png
diff --git a/skin_default/buttons/vkey_shift2.png b/skin_default/buttons/vkey_shift2.png
diff --git a/skin_default/buttons/vkey_shift3.png b/skin_default/buttons/vkey_shift3.png
diff --git a/skin_default/buttons/vkey_space.png b/skin_default/buttons/vkey_space.png
diff --git a/skin_default/buttons/vkey_space_alt.png b/skin_default/buttons/vkey_space_alt.png
diff --git a/skin_default/buttons/vkey_text.png b/skin_default/buttons/vkey_text.png
diff --git a/skin_default/buttons/vkey_yellow.png b/skin_default/buttons/vkey_yellow.png
diff --git a/skin_default/vkey_backspace.png b/skin_default/vkey_backspace.png
diff --git a/skin_default/vkey_blue.png b/skin_default/vkey_blue.png
diff --git a/skin_default/vkey_enter.png b/skin_default/vkey_enter.png
diff --git a/skin_default/vkey_first.png b/skin_default/vkey_first.png
diff --git a/skin_default/vkey_green.png b/skin_default/vkey_green.png
diff --git a/skin_default/vkey_last.png b/skin_default/vkey_last.png
diff --git a/skin_default/vkey_red.png b/skin_default/vkey_red.png
diff --git a/skin_default/vkey_sel.png b/skin_default/vkey_sel.png
diff --git a/skin_default/vkey_shift0.png b/skin_default/vkey_shift0.png
diff --git a/skin_default/vkey_shift1.png b/skin_default/vkey_shift1.png
diff --git a/skin_default/vkey_shift2.png b/skin_default/vkey_shift2.png
diff --git a/skin_default/vkey_shift3.png b/skin_default/vkey_shift3.png
diff --git a/skin_default/vkey_space.png b/skin_default/vkey_space.png
diff --git a/skin_default/vkey_space_alt.png b/skin_default/vkey_space_alt.png
diff --git a/skin_default/vkey_text.png b/skin_default/vkey_text.png
diff --git a/skin_default/vkey_yellow.png b/skin_default/vkey_yellow.png