X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57cb95e528dd810e03c6b16fbb462ed3b82f1207..b4053026b1af27eee25d483cfdc33d91678479bd:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 272fdcf9..48267066 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -29,6 +29,9 @@
 		<color name="WindowTitleForeground" color="#ffffff" />
 		<color name="WindowTitleBackground" color="#000000" />
 	</windowstyle>
+	<fonts>
+		<font filename="nmsbd.ttf" name="Display" scale="90"/>
+	</fonts>
 	<!-- Screwed Stone II skin (skin_default.xml) /Nemesis -->
 	<!-- About screen -->
 	<screen name="About" position="center,center" size="420,350" title="About">
@@ -1166,75 +1169,75 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 
 	<!-- LCD screen (channelselection) -->
 	<screen name="ChannelSelection_summary" position="0,0" size="132,64" id="1">
-		<widget source="parent.ServiceEvent" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+		<widget source="parent.ServiceEvent" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="parent.ServiceEvent" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Display;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">
+		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Display;16" valign="top">
 			<convert type="ClockToText">Format:%S</convert>
 		</widget>
 	</screen> 
 	<!-- Color OLED screen (ChannelSelection) -->
 	<screen name="ChannelSelection_summary" position="0,0" size="96,64" id="2">
-		<widget source="parent.ServiceEvent" render="Label" position="0,0" size="96,28" font="Regular;16" halign="center" valign="center" >
+		<widget source="parent.ServiceEvent" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 	</screen>
 	<!-- LCD screen (main) -->
 	<screen name="InfoBarSummary" position="0,0" size="132,64" id="1">
-		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.Event_Now" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Display;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">
+		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Display;16" valign="top">
 			<convert type="ClockToText">Format:%S</convert>
 		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34">
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="126,32">
 			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
 	<!-- Color OLED screen (main) -->
 	<screen name="InfoBarSummary" position="0,0" size="96,64" id="2">
-		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Regular;16" halign="center" valign="center" >
+		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
 			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
 	<!-- LCD screen (movieplayer) -->
 	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="132,64" id="1">
-		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.CurrentService" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="ServicePosition">Position</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="120,32" font="Regular;32" halign="center" valign="center">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="120,32" font="Display;32" halign="center" valign="center">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="120,32">
@@ -1244,87 +1247,87 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- Color OLED screen (movieplayer) -->
 	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="96,64" id="2">
-		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Regular;16" halign="center" valign="center" >
+		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
 			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
 	<!-- LCD screen (ChoiceBox) -->
 	<screen name="ChoiceBox_summary" position="0,0" size="132,64" id="1">
-		<widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Regular;11" />
+		<widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Display;11" />
 	</screen>
 	<!-- Color OLED screen (ChoiceBox) -->
 	<screen name="ChoiceBox_summary" position="0,0" size="96,64" id="2">
-		<widget source="parent.summary_list" render="Label" position="0,0" size="96,64" font="Regular;10" />
+		<widget source="parent.summary_list" render="Label" position="0,0" size="96,64" font="Display;10" />
 	</screen>	
 	<!-- LCD screen (MessageBox) -->
 	<screen name="MessageBox_summary" position="0,0" size="132,64" id="1">
-		<widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" />
-		<widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" />
+		<widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Display;11" halign="center" valign="center" />
+		<widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Display;14" halign="center" valign="center" />
 	</screen>
 	<!-- Color OLED screen (MessageBox) -->
 	<screen name="MessageBox_summary" position="0,0" size="96,64" id="2">
-		<widget source="parent.Text" render="Label" position="0,0" size="96,52" font="Regular;10" halign="center" valign="center" />
-		<widget source="parent.selectedChoice" render="Label" position="0,50" size="96,14" font="Regular;12" halign="center" valign="center" />
+		<widget source="parent.Text" render="Label" position="0,0" size="96,52" font="Display;10" halign="center" valign="center" />
+		<widget source="parent.selectedChoice" render="Label" position="0,50" size="96,14" font="Display;12" halign="center" valign="center" />
 	</screen>
 	<!-- LCD screen (menus) -->
 	<screen name="MenuSummary" position="0,0" size="132,64" id="1">
-		<widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/>
-		<widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center">
+		<widget source="parent.title" render="Label" position="6,0" size="120,32" font="Display;14" halign="center" valign="center"/>
+		<widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Display;16" halign="center" valign="center">
 			<convert type="StringListSelection" />
 		</widget>
 	</screen> 
 	<!-- Color OLED screen (menus) -->
 	<screen name="MenuSummary" position="0,0" size="96,64" id="2">
-		<widget source="parent.title" render="Label" position="0,0" size="96,32" font="Regular;15" halign="center" valign="center"/>
-		<widget source="parent.menu" render="Label" position="0,32" size="96,32" font="Regular;16" halign="center" valign="top">
+		<widget source="parent.title" render="Label" position="0,0" size="96,32" font="Display;15" halign="center" valign="center"/>
+		<widget source="parent.menu" render="Label" position="0,32" size="96,32" font="Display;16" halign="center" valign="top">
 			<convert type="StringListSelection" />
 		</widget>
 	</screen>	
 	<!-- LCD screen (ServiceScan) -->
 	<screen name="ServiceScanSummary" position="0,0" size="132,64" id="1">
-		<widget name="Title" position="6,4" size="120,42" font="Regular;16" transparent="1" />
-		<widget name="Service" position="6,22" size="120,26" font="Regular;12" transparent="1" />
+		<widget name="Title" position="6,4" size="120,42" font="Display;16" transparent="1" />
+		<widget name="Service" position="6,22" size="120,26" font="Display;12" transparent="1" />
 		<widget name="scan_progress" position="6,50" zPosition="1" borderWidth="1" size="56,12" backgroundColor="dark" />
 	</screen>
 	<!-- Color OLED screen (ServiceScan) -->
 	<screen name="ServiceScanSummary" position="0,0" size="96,64" id="2">
-		<widget name="Title" position="0,0" size="96,30" font="Regular;14" transparent="1" />
-		<widget name="Service" position="0,30" size="96,20" font="Regular;10" transparent="1" />
+		<widget name="Title" position="0,0" size="96,30" font="Display;14" transparent="1" />
+		<widget name="Service" position="0,30" size="96,20" font="Display;10" transparent="1" />
 		<widget name="scan_progress" position="0,50" zPosition="1" borderWidth="1" size="96,12" backgroundColor="dark" />
 	</screen>
 	<!-- LCD screen (setup) -->
 	<screen name="SetupSummary" position="0,0" size="132,64" id="1">
-		<widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" />
-		<widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" />
-		<widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" />
+		<widget source="SetupTitle" render="Label" position="6,0" size="120,24" halign="left" font="Display;12" />
+		<widget source="SetupEntry" render="Label" position="6,24" size="120,24" halign="center" font="Display;12" />
+		<widget source="SetupValue" render="Label" position="6,48" size="120,16" halign="right" font="Display;12" />
 	</screen>
 	<!-- Color OLED screen (setup) -->
 	<screen name="SetupSummary" position="0,0" size="96,64" id="2">
-		<widget source="SetupTitle" render="Label" position="0,0" size="96,16" font="Regular;10" />
-		<widget source="SetupEntry" render="Label" position="0,16" size="96,32" font="Regular;10" />
-		<widget source="SetupValue" render="Label" position="0,48" size="96,16" font="Regular;10" />
+		<widget source="SetupTitle" render="Label" position="0,0" size="96,24" halign="left" font="Display;10" />
+		<widget source="SetupEntry" render="Label" position="0,24" size="96,24" halign="center" font="Display;10" />
+		<widget source="SetupValue" render="Label" position="0,48" size="96,16" halign="right" font="Display;10" />
 	</screen>
 	<!-- LCD screen (misc) -->
 	<screen name="SimpleSummary" position="0,0" size="132,64" id="1">
-		<widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Regular;16" halign="center" valign="center" />
+		<widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Display;16" halign="center" valign="center" />
 	</screen>
 	<!-- Color OLED screen (misc) -->
 	<screen name="SimpleSummary" position="0,0" size="96,64" id="2">
-		<widget source="parent.Title" render="Label" position="0,0" size="96,64" font="Regular;14" halign="center" valign="center" />
+		<widget source="parent.Title" render="Label" position="0,0" size="96,64" font="Display;14" halign="center" valign="center" />
 	</screen>
 	<!-- LCD screen (standby) -->
 	<screen name="StandbySummary" position="0,0" size="132,64" id="1">
-		<widget source="global.CurrentTime" render="Label" position="6,0" size="120,64" font="Regular;40" halign="center" valign="center">
+		<widget source="global.CurrentTime" render="Label" position="6,0" size="120,64" font="Display;40" halign="center" valign="center">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 		<widget source="session.RecordState" render="FixedLabel" position="6,0" zPosition="1" size="120,64" text=" ">
@@ -1334,7 +1337,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- Color OLED screen (standby) -->
 	<screen name="StandbySummary" position="0,0" size="96,64" id="2">
-		<widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Regular;38" halign="center" valign="center">
+		<widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Display;38" halign="center" valign="center">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 		<widget source="session.RecordState" render="FixedLabel" position="0,0" zPosition="1" size="96,64" text=" ">
@@ -1344,33 +1347,33 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- LCD screen (JobView) -->
 	<screen name="JobView_summary" position="0,0" size="132,64" id="1">
-		<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" />
-		<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" />
+		<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Display;16" />
+		<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Display;12" />
 		<widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" />
-		<widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Regular;12" zPosition="2" halign="center" transparent="1"  >
+		<widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Display;12" zPosition="2" halign="center" transparent="1"  >
 			<convert type="ProgressToText" />
 		</widget>
 	</screen>
 	<!-- Color OLED screen (JobView) -->
 	<screen name="JobView_summary" position="0,0" size="96,64" id="2">
-		<widget source="parent.summary_job_name" render="Label" position="0,4" size="96,42" font="Regular;14" />
-		<widget source="parent.summary_job_task" render="Label" position="0,22" size="96,26" font="Regular;10" />
+		<widget source="parent.summary_job_name" render="Label" position="0,4" size="96,42" font="Display;14" />
+		<widget source="parent.summary_job_task" render="Label" position="0,22" size="96,26" font="Display;10" />
 		<widget source="parent.summary_job_progress" render="Progress" position="0,50" size="60,12" borderWidth="1" zPosition="1" />
-		<widget source="parent.summary_job_progress" render="Label" position="60,50" size="36,12" font="Regular;10" zPosition="2" halign="center" transparent="1"  >
+		<widget source="parent.summary_job_progress" render="Label" position="60,50" size="36,12" font="Display;10" zPosition="2" halign="center" transparent="1"  >
 			<convert type="ProgressToText" />
 		</widget>
 	</screen>
 	<!-- LCD screen (Wizard) -->
 	<screen name="WizardSummary" position="0,0" size="132,64" id="1">
-		<widget source="text" render="Label" position="6,0" size="120,16" font="Regular;16" transparent="1" />
-		<widget source="parent.list" render="Label" position="6,18" size="120,46" font="Regular;12">
+		<widget source="text" render="Label" position="6,0" size="120,16" font="Display;16" transparent="1" />
+		<widget source="parent.list" render="Label" position="6,18" size="120,46" font="Display;12">
 			<convert type="StringListSelection" />
 		</widget>
 	</screen>
 	<!-- Color OLED screen (Wizard) -->
 	<screen name="WizardSummary" position="0,0" size="96,64" id="2">
-		<widget source="text" render="Label" position="0,0" size="96,16" font="Regular;14" transparent="1" />
-		<widget source="parent.list" render="Label" position="0,18" size="96,46" font="Regular;12">
+		<widget source="text" render="Label" position="0,0" size="96,16" font="Display;14" transparent="1" />
+		<widget source="parent.list" render="Label" position="0,18" size="96,46" font="Display;12">
 			<convert type="StringListSelection" />
 		</widget>
 	</screen>