X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bdff3888c78c55929c058c0509408e1f9e4f9449..4337dd9e01096cd7dbd045f3922e6a378fa86ce5:/data/skin_default.xml?ds=sidebyside

diff --git a/data/skin_default.xml b/data/skin_default.xml
index f4f140f7..0b34c449 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -38,10 +38,10 @@
 		<widget name="Adaptertext" position="20,325" size="100,21" zPosition="10" font="Regular;19" transparent="1" />
 		<widget name="Adapter" position="110,325" size="300,21" zPosition="10" font="Regular;19" transparent="1" />
 		<widget name="introduction2" position="110,360" size="300,20" zPosition="10" font="Regular;21" halign="center" transparent="1" />
-		<widget name="ButtonRedtext" position="430,325" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
-		<widget name="ButtonRed" pixmap="skin_default/buttons/button_red.png" position="410,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="ButtonBluetext" position="430,360" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
-		<widget name="ButtonBlue" pixmap="skin_default/buttons/button_blue.png" position="410,360" zPosition="10" size="15,16" transparent="1" alphatest="on" />
+		<widget name="ButtonRedtext" position="410,325" size="140,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonRed" pixmap="skin_default/buttons/button_red.png" position="390,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
+		<widget name="ButtonBluetext" position="410,360" size="140,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonBlue" pixmap="skin_default/buttons/button_blue.png" position="390,360" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 	</screen>
 	<screen name="AdapterSetupConfiguration" position="90,100" size="550,400" title="Network Configuration..." >
 		<ePixmap pixmap="skin_default/border_menu.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
@@ -50,10 +50,9 @@
 		<widget name="BottomBG" pixmap="skin_default/bottombar.png" position="5,310" size="540,120" zPosition="1" transparent="1" alphatest="on" />
 		<widget name="IFtext" position="20,325" size="100,21" zPosition="10" font="Regular;19" transparent="1" />
 		<widget name="IF" position="110,325" size="300,21" zPosition="10" font="Regular;19" transparent="1" />
-		<widget name="Statustext" position="20,350" size="60,21" zPosition="10" font="Regular;19" transparent="1"/>
-		<widget name="statuspic_inactive" pixmap="skin_default/buttons/button_green_off.png" position="70,350" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
-		<widget name="statuspic_active" pixmap="skin_default/buttons/button_green.png" position="70,350" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
-		<widget name="ButtonRedtext" position="430,325" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="Statustext" position="20,350" size="115,21" zPosition="10" font="Regular;19" transparent="1"/>
+		<widget name="statuspic" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="120,350" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
+		<widget name="ButtonRedtext" position="430,325" size="120,21" zPosition="10" font="Regular;21" transparent="1" />
 		<widget name="ButtonRed" pixmap="skin_default/buttons/button_red.png" position="410,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 	</screen>
 	<!-- Audio selection -->
@@ -394,16 +393,20 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		</widget>
 	</screen>
 	<!-- Location Box -->
-	<screen name="LocationBox" position="90,95" zPosition="3" size="560,430" title="Select Location">
-		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-		<widget name="green" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-		<widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-		<widget name="text" position="10,45" size="270,22" font="Regular;22" />
-		<widget name="target" position="280,45" size="270,22" font="Regular;22" halign="right" />
-		<widget name="filelist" position="10,80" size="540,347" scrollbarMode="showOnDemand" />
+	<screen name="LocationBox" position="100,75" size="540,460" >
+		<widget name="text" position="0,2" size="540,22" font="Regular;22" />
+		<widget name="target" position="0,23" size="540,22" valign="center" font="Regular;22" />
+		<widget name="filelist" position="0,55" zPosition="1" size="540,210" scrollbarMode="showOnDemand" selectionDisabled="1" />
+		<widget name="textbook" position="0,272" size="540,22" font="Regular;22" />
+		<widget name="booklist" position="5,302" zPosition="2" size="535,100" scrollbarMode="showOnDemand" />
+		<widget name="red" position="0,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+		<widget name="key_red" position="0,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />	
+		<widget name="green" position="135,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+		<widget name="key_green" position="135,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+		<widget name="yellow" position="270,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+		<widget name="key_yellow" position="270,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+		<widget name="blue" position="405,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+		<widget name="key_blue" position="405,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />			
 	</screen>
 	<!-- Mediaplayer -->
 	<screen name="MediaPlayer" position="70,70" size="580,475" title="MediaPlayer">
@@ -476,6 +479,15 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</applet>
 	</screen>
+	<screen name="MessageBox_summary" position="0,0" size="132,64">
+		 <widget source="parent.Text" render="Label" position="6,0" size="120,32" font="Regular;12" halign="center" valign="center" />
+		 <widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
+			  <convert type="ClockToText">Format:%H:%M</convert>
+		 </widget>
+		 <widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
+			  <convert type="ClockToText">Format:%S</convert>
+		 </widget>
+	</screen>
 	<!-- Minute input -->
 	<screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
 		<widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
@@ -520,7 +532,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<screen name="NameserverSetup" position="90,100" size="550,400" title="Nameserver Setup" >
 		<widget name="config" position="10,10" size="530,175" scrollbarMode="showOnDemand" />
 		<ePixmap pixmap="skin_default/bottombar.png" position="5,310" size="540,120" zPosition="1" transparent="1" alphatest="on" />
-		<widget name="ButtonRedtext" position="430,325" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonRedtext" position="430,325" size="120,21" zPosition="10" font="Regular;21" transparent="1" />
 		<ePixmap pixmap="skin_default/buttons/button_red.png" position="410,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 		<widget name="ButtonGreentext" position="60,325" size="150,21" zPosition="10" font="Regular;21" transparent="1" />
 		<ePixmap pixmap="skin_default/buttons/button_green.png" position="30,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
@@ -531,54 +543,42 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<screen name="NetworkAdapterSelection" position="130,140" size="460,330" title="Select Network Adapter">
 		<widget name="adapterlist" position="10,10" size="440,310" />
 	</screen>
-	<!-- Network adapter test -->
+	<!-- Network adapter test Black = "#000000" Grey = "#8c8c93" Green = "#1cff1c" Red = #f23d21-->
 	<screen name="NetworkAdapterTest" position="70,100" size="570,400" title="Network test..." >
-		<widget name="Adaptertext" position="10,20" size="120,21" zPosition="1" font="Regular;19" foregroundColor="#8c8c93" />			
-		<widget name="Adapter" position="130,20" size="270,21" zPosition="1" font="Regular;19" halign="center" foregroundColor="#8c8c93" />
-		<widget name="AdapterInfo" pixmap="skin_default/buttons/blue.png" position="425,10" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="AdapterInfo_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,10" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="AdapterInfo_Text" position="440,20" size="110,21" zPosition="2" font="Regular;19" foregroundColor="#8c8c93" transparent="1" />
+		<widget name="Adaptertext" position="10,20" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />			
+		<widget name="Adapter" position="130,20" size="270,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
+		<widget name="AdapterInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,10" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="AdapterInfo_Text" position="440,20" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
 		<widget name="AdapterInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,15" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="Networktext" position="10,70" size="120,21" zPosition="1" font="Regular;19" foregroundColor="#8c8c93" />			
-		<widget name="Network" position="160,70" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColor="#8c8c93" />
-		<widget name="NetworkInfo" pixmap="skin_default/buttons/blue.png" position="425,60" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="NetworkInfo_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,60" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="NetworkInfo_Text" position="440,70" size="110,21" zPosition="2" font="Regular;19" foregroundColor="#8c8c93" transparent="1"/>
-		<widget name="NetworkInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,65" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="NetworkInfo_NOK" pixmap="skin_default/icons/lock_error.png" position="400,65" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="Dhcptext" position="10,120" size="120,21" zPosition="1" font="Regular;19" foregroundColor="#8c8c93" />			
-		<widget name="Dhcp" position="160,120" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColor="#8c8c93" />
-		<widget name="DhcpInfo" pixmap="skin_default/buttons/blue.png" position="425,110" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="DhcpInfo_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,110" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="DhcpInfo_Text" position="440,120" size="110,21" zPosition="2" font="Regular;19" foregroundColor="#8c8c93" transparent="1" />
-		<widget name="DhcpInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,115" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="DhcpInfo_NOK" pixmap="skin_default/icons/lock_error.png" position="400,115" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="IPtext" position="10,170" size="120,21" zPosition="1" font="Regular;19" foregroundColor="#8c8c93" />			
-		<widget name="IP" position="160,170" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColor="#8c8c93" />
-		<widget name="IPInfo" pixmap="skin_default/buttons/blue.png" position="425,160" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="IPInfo_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,160" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="IPInfo_Text" position="440,170" size="110,21" zPosition="2" font="Regular;19" foregroundColor="#8c8c93" transparent="1" />
-		<widget name="IPInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,165" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="IPInfo_NOK" pixmap="skin_default/icons/lock_error.png" position="400,165" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="DNStext" position="10,220" size="120,21" zPosition="1" font="Regular;19" foregroundColor="#8c8c93" />			
-		<widget name="DNS" position="160,220" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColor="#8c8c93" />
-		<widget name="DNSInfo" pixmap="skin_default/buttons/blue.png" position="425,210" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="DNSInfo_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,210" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="DNSInfo_Text" position="440,220" size="110,21" zPosition="2" font="Regular;19" foregroundColor="#8c8c93" transparent="1" />
-		<widget name="DNSInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,215" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="DNSInfo_NOK" pixmap="skin_default/icons/lock_error.png" position="400,215" size="38,31" alphatest="on" zPosition="2" />
-		<widget name="EditSettingsButton" pixmap="skin_default/buttons/blue.png" position="425,260" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="EditSettingsButton_selected" pixmap="skin_default/buttons/blue_pressed.png" position="425,260" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="EditSettings_Text" position="440,270" size="110,21" zPosition="2" font="Regular;19" foregroundColor="black" transparent="1" />
+		<widget name="Networktext" position="10,70" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />			
+		<widget name="Network" position="160,70" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
+		<widget name="NetworkInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,60" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="NetworkInfo_Text" position="440,70" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
+		<widget name="NetworkInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,65" size="38,31" alphatest="on" zPosition="2" />
+		<widget name="Dhcptext" position="10,120" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />			
+		<widget name="Dhcp" position="160,120" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
+		<widget name="DhcpInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,110" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="DhcpInfo_Text" position="440,120" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
+		<widget name="DhcpInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,115" size="38,31" alphatest="on" zPosition="2" />
+		<widget name="IPtext" position="10,170" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />			
+		<widget name="IP" position="160,170" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
+		<widget name="IPInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,160" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="IPInfo_Text" position="440,170" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
+		<widget name="IPInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,165" size="38,31" alphatest="on" zPosition="2" />
+		<widget name="DNStext" position="10,220" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />			
+		<widget name="DNS" position="160,220" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
+		<widget name="DNSInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,210" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="DNSInfo_Text" position="440,220" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
+		<widget name="DNSInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,215" size="38,31" alphatest="on" zPosition="2" />
+		<widget name="EditSettingsButton" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,260" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="EditSettings_Text" position="440,270" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#000000,#8c8c93,#1cff1c" />
 		<ePixmap pixmap="skin_default/bottombar.png" position="15,310" size="540,120" zPosition="1" transparent="1" alphatest="on" />
-		<widget name="ButtonRedtext" position="430,325" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonRedtext" position="430,325" size="120,21" zPosition="10" font="Regular;21" transparent="1" />
 		<widget name="ButtonRed" pixmap="skin_default/buttons/button_red.png" position="410,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="ButtonGreentext" position="60,325" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
-		<widget name="ButtonGreen" pixmap="skin_default/buttons/button_green.png" position="30,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="ButtonGreen_off" pixmap="skin_default/buttons/button_green_off.png" position="30,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="ButtonYellowtext" position="60,355" size="80,21" zPosition="10" font="Regular;21" transparent="1" />
-		<widget name="ButtonYellow" pixmap="skin_default/buttons/button_yellow.png" position="30,355" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="ButtonYellow_off" pixmap="skin_default/buttons/button_yellow_off.png" position="30,355" zPosition="10" size="15,16" transparent="1" alphatest="on" />
+		<widget name="ButtonGreentext" position="60,325" size="250,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonGreen_Check" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="30,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
+		<widget name="ButtonYellowtext" position="60,355" size="250,21" zPosition="10" font="Regular;21" transparent="1" />
+		<widget name="ButtonYellow_Check" pixmaps="skin_default/buttons/button_yellow.png,skin_default/buttons/button_yellow_off.png" position="30,355" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 		<widget name="InfoTextBorder" pixmap="skin_default/border_info.png" position="0,0" zPosition="20" size="550,300" alphatest="on" />
 		<widget name="InfoText" position="5,5" size="541,290" zPosition="25" font="Regular;21" />
 	</screen>
@@ -852,15 +852,16 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="Preview" position="305,45" size="280,210" alphatest="on" />
 	</screen>
 	<!-- Sleeptimer edit -->
-	<screen name="SleepTimerEdit" position="110,215" size="500,160" title="Sleep Timer">
-		<widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,48" size="12,12" alphatest="on" />
-		<widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,88" size="12,12" alphatest="on" />
-		<widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,128" size="12,12" alphatest="on" />
+	<screen name="SleepTimerEdit" position="110,215" size="500,200" title="Sleep Timer">
+		<widget name="current_status" position="40,40" size="400,30" valign="center" font="Regular;20" />
+		<widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,88" size="12,12" alphatest="on" />
+		<widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,128" size="12,12" alphatest="on" />
+		<widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,168" size="12,12" alphatest="on" />
 		<widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,168" size="12,12" alphatest="on" />
-		<widget name="red_text" position="40,40" size="400,30" valign="center" font="Regular;20" />
-		<widget name="green_text" position="40,80" size="400,30" valign="center" font="Regular;20" />
-		<widget name="yellow_text" position="40,120" size="400,30" valign="center" font="Regular;20" />
-		<widget name="blue_text" position="40,160" size="400,30" valign="center" font="Regular;20" />
+		<widget name="red_text" position="40,80" size="400,30" valign="center" font="Regular;20" />
+		<widget name="green_text" position="40,120" size="400,30" valign="center" font="Regular;20" />
+		<widget name="yellow_text" position="40,160" size="400,30" valign="center" font="Regular;20" />
+		<widget name="blue_text" position="40,200" size="400,30" valign="center" font="Regular;20" />
 		<widget name="pretext" position="15,10" size="235,25" font="Regular;19" />
 		<widget name="input" position="260,10" size="40,25" font="Regular;19" />
 		<widget name="aftertext" position="305,10" size="100,25" font="Regular;19" />
@@ -937,11 +938,10 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<screen name="TimerEntry" position="90,95" size="560,430" title="Timer entry">
 		<widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
 		<widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<widget name="location" pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
 		<ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
 		<widget name="canceltext" position="0,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#9f1313" transparent="1" />
 		<widget name="oktext" position="140,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#1f771f" transparent="1" />
-		<widget name="locationtext" position="280,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#a08500" transparent="1" />
 		<widget name="config" position="10,45" size="540,385" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Timer log -->
@@ -967,9 +967,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 		<widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
 		<widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-		<widget name="timer1" position="10,45" size="280,80" scrollbarMode="showOnDemand" />
-		<widget name="timer2" position="310,45" size="280,80" scrollbarMode="showOnDemand" />
-		<widget name="list" position="0,140" size="250,290" scrollbarMode="showOnDemand" />
+		<widget name="timer1" position="10,45" size="280,220" scrollbarMode="showOnDemand" />
+		<widget name="timer2" position="310,45" size="280,220" scrollbarMode="showOnDemand" />
+		<widget name="list" position="0,280" size="500,290" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Timer Selection -->
 	<screen name="TimerSelection" position="90,95" size="560,430" title="Timer selection">
@@ -1083,11 +1083,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</widget>
 	</screen>
 	<screen name="JobView" position="84,122" size="522,324" title="Job View">
-		<widget source="job_progress" render="Progress" position="130,184" size="362,29" borderWidth="1" />
-		<widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;32" />
-		<widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;32" />
-		<widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;32" />
-		<widget source="job_progress" render="Label" position="18,164" size="106,65" font="Regular;48">
+		<widget source="job_progress" render="Progress" position="130,184" size="362,28" borderWidth="1" />
+		<widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;28" />
+		<widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;28" />
+		<widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;28" />
+		<widget source="job_progress" render="Label" position="18,182" size="106,65" font="Regular;32">
 			<convert type="ProgressToText" />
 		</widget>
 		<widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="339,251" size="140,40" alphatest="on" >