From f8ebdfe34a353015e1e53554d52542a3ef7bc9ad Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Thu, 26 May 2016 10:10:10 +0900
Subject: [dvbapp] fix LCD skin for solo4k.

---
 meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend   |   2 +-
 .../enigma2/vusolo4k/lcd_icons_vusolo4k/16x9.png   | Bin 3482 -> 4423 bytes
 .../enigma2/vusolo4k/lcd_icons_vusolo4k/CRYPT.png  | Bin 2924 -> 3012 bytes
 .../enigma2/vusolo4k/lcd_icons_vusolo4k/DOLBY.png  | Bin 3142 -> 3799 bytes
 .../enigma2/vusolo4k/lcd_icons_vusolo4k/REC.png    | Bin 3566 -> 4608 bytes
 .../vusolo4k/lcd_icons_vusolo4k/TELETEXT.png       | Bin 3206 -> 3651 bytes
 .../enigma2/vusolo4k/lcd_icons_vusolo4k/time.png   | Bin 0 -> 3541 bytes
 .../enigma2/vusolo4k/skin_user_vusolo4k.xml        | 238 ++++++++++-----------
 8 files changed, 111 insertions(+), 129 deletions(-)
 create mode 100644 meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/time.png

diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend b/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
index aa58a35..f52fd5f 100644
--- a/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
+++ b/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PR .= "-bsp5"
+PR .= "-bsp6"
 
 SRC_URI_append_vusolo = " \
 	file://enigma2_vuplus_misc.patch \
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/16x9.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/16x9.png
index 5063fa6..233fe6f 100644
Binary files a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/16x9.png and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/16x9.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/CRYPT.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/CRYPT.png
index 9feeb90..0e62657 100644
Binary files a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/CRYPT.png and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/CRYPT.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/DOLBY.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/DOLBY.png
index 4a6cfea..2cbb2cf 100644
Binary files a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/DOLBY.png and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/DOLBY.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/REC.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/REC.png
index 4539ad2..53ee611 100644
Binary files a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/REC.png and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/REC.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/TELETEXT.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/TELETEXT.png
index 0bc4352..71c0042 100644
Binary files a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/TELETEXT.png and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/TELETEXT.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/time.png b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/time.png
new file mode 100644
index 0000000..8b0717b
Binary files /dev/null and b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/lcd_icons_vusolo4k/time.png differ
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/skin_user_vusolo4k.xml b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/skin_user_vusolo4k.xml
index 86976b1..cf0ace6 100644
--- a/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/skin_user_vusolo4k.xml
+++ b/meta-bsp/recipes-vuplus/enigma2/enigma2/vusolo4k/skin_user_vusolo4k.xml
@@ -1,270 +1,252 @@
 <skin>
+	<colors>
+		<color name="LCDBackground" value="#191f26" />
+	</colors>
 	<fonts>
-		<font filename="nmsbd.ttf" name="VFD" scale="90"/>
+		<font filename="MyriadPro-Regular.otf" name="Regular" scale="100" />
+		<font filename="MyriadPro-Semibold.otf" name="Semibold" scale="100" />
+		<font filename="MyriadPro-SemiboldIt.otf" name="Semiboldit" scale="100" />
 	</fonts>
 	<windowstyle type="skinned" id="1">
-		<color name="Background" color="#ffffff" />
-		<color name="LabelForeground" color="#000000" />
-		<color name="ListboxBackground" color="#ffffff" />
-		<color name="ListboxForeground" color="#000000" />
-		<color name="ListboxSelectedBackground" color="#ffffff" />
-		<color name="ListboxSelectedForeground" color="#000000" />
-		<color name="ListboxMarkedBackground" color="#ffffff" />
-		<color name="ListboxMarkedForeground" color="#000000" />
-		<color name="ListboxMarkedAndSelectedBackground" color="#ffffff" />
-		<color name="ListboxMarkedAndSelectedForeground" color="#000000" />
-		<color name="WindowTitleForeground" color="#000000" />
-		<color name="WindowTitleBackground" color="#ffffff" />
+		<color name="Background" color="LCDBackground" />
+		<color name="LabelForeground" color="white" />
+		<color name="ListboxBackground" color="LCDBackground" />
+		<color name="ListboxForeground" color="white" />
+		<color name="ListboxSelectedBackground" color="LCDBackground" />
+		<color name="ListboxSelectedForeground" color="white" />
+		<color name="ListboxMarkedBackground" color="LCDBackground" />
+		<color name="ListboxMarkedForeground" color="white" />
+		<color name="ListboxMarkedAndSelectedBackground" color="LCDBackground" />
+		<color name="ListboxMarkedAndSelectedForeground" color="white" />
+		<color name="WindowTitleBackground" color="LCDBackground" />
+		<color name="WindowTitleForeground" color="white" />
 	</windowstyle>
 	<screen name="InfoBarSummary" position="0,0" size="480,320" id="1">
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-
-		<widget source="session.CurrentService" render="Label" position="30,90" size="420,75" font="VFD;42" halign="left" valign="center">
+		<widget source="session.CurrentService" render="Label" position="0,90" size="480,55" font="Semibold;42" halign="center" valign="center" backgroundColor="LCDBackground">
 			<convert type="ServiceName">Name</convert>
 		</widget>
-		<widget source="session.Event_Now" render="Label" position="30,175" size="420,75" font="VFD;40" halign="left" valign="center">
+		<widget source="session.Event_Now" render="Label" position="0,145" size="480,105" font="Regular;40" halign="center" valign="center" backgroundColor="LCDBackground">
 			<convert type="EventName">Name</convert>
 		</widget>
-		<widget source="session.Event_Now" render="Progress" position="30,260" size="420,40" borderWidth="2">
+		<widget source="session.Event_Now" render="Progress" position="60,250" size="360,40" borderWidth="2" backgroundColor="LCDBackground">
 			<convert type="EventTime">Progress</convert>
 		</widget>
 	 </screen>
 	 <screen name="ChannelSelection_summary" position="0,0" size="480,320" id="1">
-		<widget source="parent.ServiceEvent" render="Label" position="30,90" size="420,75" font="VFD;42" halign="left" valign="center" >
-			<convert type="ServiceName">Name</convert>
-		</widget>
-		<widget source="parent.ServiceEvent" render="Label" position="30,175" size="420,75" font="VFD;40" halign="left" valign="center" >
-			<convert type="EventName">Name</convert>
-		</widget>
-		<widget source="session.Event_Now" render="Progress" position="30,260" size="420,40" borderWidth="2">
-			<convert type="EventTime">Progress</convert>
-		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+	 	<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-	</screen>
-	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="480,320" id="1">
-		<widget source="session.CurrentService" render="Label" position="30,90" size="420,170" font="VFD;40" halign="center" valign="center" >
+		<widget source="parent.ServiceEvent" render="Label" position="0,90" size="480,55" font="Semibold;42" halign="center" valign="center" backgroundColor="LCDBackground">
 			<convert type="ServiceName">Name</convert>
 		</widget>
-		<widget source="session.CurrentService" render="Progress" position="30,260" size="420,40" borderWidth="2">
-			<convert type="ServicePosition">Position</convert>
+		<widget source="parent.ServiceEvent" render="Label" position="0,145" size="480,105" font="Regular;40" halign="center" valign="center" backgroundColor="LCDBackground">
+			<convert type="EventName">Name</convert>
+		</widget>
+		<widget source="session.Event_Now" render="Progress" position="60,250" size="360,40" borderWidth="2" backgroundColor="LCDBackground">
+			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+	</screen>
+	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="480,320" id="1">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
+		<widget source="session.CurrentService" render="Label" position="0,90" size="480,160" font="Semibold;40" halign="center" valign="center" backgroundColor="LCDBackground">
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.CurrentService" render="Progress" position="60,250" size="360,40" borderWidth="2" backgroundColor="LCDBackground">
+			<convert type="ServicePosition">Position</convert>
+		</widget>
 	</screen>
 	<screen name="ChoiceBox_summary" position="0,0" size="480,320" id="1">
-		<widget source="parent.summary_list" render="Label" position="30,20" size="420,280" font="Regular;32" valign="center" />
+		<widget source="parent.summary_list" render="Label" position="30,10" size="420,300" font="Regular;32" backgroundColor="LCDBackground"/>
 	</screen>
 	<screen name="MessageBox_summary" position="0,0" size="480,320" id="1">
-		<widget source="parent.Text" render="Label" position="15,10" size="450,200" font="Regular;42" halign="center" valign="center" />
-		<widget source="parent.selectedChoice" render="Label" position="15,210" size="450,90" font="Regular;48" halign="center" valign="center" />
+		<widget source="parent.Text" render="Label" position="20,15" size="450,200" font="Regular;38" halign="center" valign="center" backgroundColor="LCDBackground"/>
+		<widget source="parent.selectedChoice" render="Label" position="20,215" size="450,40" font="Regular;38" halign="center" valign="center" backgroundColor="LCDBackground"/>
 	</screen>
 	<screen name="MenuSummary" position="0,0" size="480,320" id="1">
-		<widget source="parent.title" render="Label" position="15,100" size="450,90" font="VFD;52" halign="center" valign="center"/>
-		<widget source="parent.menu" render="Label" position="15,190" size="450,120" font="VFD;52" halign="center" valign="center">
-			<convert type="StringListSelection" />
-		</widget>
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%H:%M</convert>
-		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
+			<convert type="ClockToText">Format:%H:%M</convert>
+		</widget>
+		<widget source="parent.title" render="Label" position="15,87" size="450,73" font="Semibold;48" halign="center" valign="center" backgroundColor="LCDBackground"/>
+		<widget source="parent.menu" render="Label" position="15,160" size="450,120" font="Semibold;52" halign="center" valign="center" backgroundColor="LCDBackground">
+			<convert type="StringListSelection" />
+		</widget>
 	</screen>
 	<screen name="ServiceScanSummary" position="0,0" size="480,320" id="1">
-		<widget name="Title" position="15,10" size="450,130" font="VFD;48" transparent="1" />
-		<widget name="Service" position="15,140" size="450,150" font="VFD;36" transparent="1" />
-		<widget name="scan_progress" position="0,290" zPosition="1" borderWidth="2" size="480,25" backgroundColor="dark" />
+		<widget name="Title" position="25,20" size="430,80" font="Regular;50" transparent="1" backgroundColor="LCDBackground" />
+		<widget name="Service" position="25,100" size="430,150" font="Regular;38" transparent="1" backgroundColor="LCDBackground" />
+		<widget name="scan_progress" position="60,250" size="360,40" zPosition="1" borderWidth="2" backgroundColor="LCDBackground" />
 	</screen>
 	<screen name="SetupSummary" position="0,0" size="480,320" id="1">
-		<widget source="SetupTitle" render="Label" position="15,80" size="450,60" font="VFD;52" />
-		<widget source="SetupEntry" render="Label" position="15,140" size="450,120" font="VFD;42" />
-		<widget source="SetupValue" render="Label" position="15,260" size="450,60" font="VFD;42" />
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%H:%M</convert>
-		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-	</screen>
-	<screen name="StandbySummary" position="0,0" size="480,320" id="1">
-		<widget source="global.CurrentTime" render="Label" position="40,75" size="400,110" font="VFD;72" halign="center">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="40,185" size="400,110" font="VFD;95" halign="center">
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+		<widget source="SetupTitle" render="Label" position="25,65" size="430,60" font="Semibold;52" halign="center" backgroundColor="LCDBackground" />
+		<widget source="SetupEntry" render="Label" position="25,125" size="430,120" font="Semibold;38" halign="center" backgroundColor="LCDBackground" />
+		<widget source="SetupValue" render="Label" position="25,245" size="430,40" font="Regular;42" halign="center" backgroundColor="LCDBackground" />
+	</screen>
+	<screen name="StandbySummary" position="0,0" size="480,320" id="1">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-	</screen>
-	<screen name="SimpleSummary" position="0,0" size="480,320" id="1">
-		<widget source="parent.Title" render="Label" position="30,90" size="420,200" font="VFD;52" halign="center" valign="center" />
-		<widget source="global.CurrentTime" render="Label" position="320,10" size="150,35" font="VFD;32" halign="right">
-			<convert type="ClockToText">Format:%d.%m.%Y</convert>
-		</widget>
-
-		<widget source="global.CurrentTime" render="Label" position="320,45" size="150,35" font="VFD;32" halign="right">
+		<widget source="global.CurrentTime" render="Label" position="40,70" size="400,180" font="Regular;130" halign="center" valign="center" backgroundColor="LCDBackground">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="55,42" alphatest="blend">
+	</screen>
+	<screen name="SimpleSummary" position="0,0" size="480,320" id="1">
+		<widget source="session.RecordState" render="Pixmap" pixmap="lcd_icons/REC.png" position="20,15"  size="57,34" alphatest="blend">
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="75,15"  size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/CRYPT.png" position="89,15"  size="47,34" alphatest="blend">
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="130,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/TELETEXT.png" position="146,12" size="50,39" alphatest="blend">
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="185,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/16x9.png" position="207,12" size="51,39" alphatest="blend">
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="240,15" size="55,42" alphatest="blend">
+		<widget source="session.CurrentService" render="Pixmap" pixmap="lcd_icons/DOLBY.png" position="269,15" size="53,34" alphatest="blend">
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
+		<ePixmap pixmap="lcd_icons/time.png" position="360,20"  size="28,28" alphatest="blend" />
+		<widget source="global.CurrentTime" render="Label" position="393,20" size="85,38" font="Regular;32" halign="left" backgroundColor="LCDBackground">
+			<convert type="ClockToText">Format:%H:%M</convert>
+		</widget>
+		<widget source="parent.Title" render="Label" position="30,90" size="420,200" font="Semibold;52" halign="center" valign="center" backgroundColor="LCDBackground"/>
 	</screen>
 	<screen name="MediaPlayerLCDScreen" position="0,0" size="480,320" id="1">
-		<widget name="text1" position="25,20" size="450,130" font="VFD;48"/>
-		<widget name="text3" position="25,155" size="450,75" font="VFD;36"/>
-		<widget name="text4" position="25,240" size="450,75" font="VFD;36"/>
+		<widget name="text1" position="25,10" size="450,140" font="Regular;42" backgroundColor="LCDBackground"/>
+		<widget name="text3" position="25,160" size="450,70" font="Regular;32" backgroundColor="LCDBackground"/>
+		<widget name="text4" position="25,230" size="450,70" font="Regular;32" backgroundColor="LCDBackground"/>
 	</screen>
 	<screen name="WizardSummary" position="0,0" size="480,320" id="1">
-		<widget source="text" render="Label" position="15,10" size="450,80" font="VFD;40" transparent="1" />
-		<widget source="parent.list" render="Label" position="15,100" size="450,220" font="VFD;32">
+		<widget source="text" render="Label" position="15,10" size="450,80" font="Regular;40" transparent="1" backgroundColor="LCDBackground"/>
+		<widget source="parent.list" render="Label" position="15,100" size="450,220" font="Regular;32">
 			<convert type="StringListSelection" />
 		</widget>
 	</screen>
-- 
cgit