replace "Arial" by "Regular"

22 files changed, 122 insertions, 328 deletions

diff --git a/data/skin.xml b/data/skin.xml
index f36d2a8d..4c1a25c0 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -37,8 +37,8 @@
 		<screen name="Standby" flags="wfNoBorder" position="0,0" size="720,576" title="Standby">
 		</screen>
 		<screen name="Menu" position="210,150" size="300,235" title="Main menu">
-			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
-			<!--<widget name="menu" position="10,55" size="280,150" font="Arial;23" />-->
+			<widget name="title" position="10,10" size="280,35" font="Regular;23" />
+			<!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
 			<widget name="menu" position="10,55" size="290,175" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="ScartLoopThrough" position="0,0" size="720,576">
@@ -53,22 +53,22 @@
 			<widget name="subservices" position="20,10" size="260,230" scrollbarMode="showOnDemand" />
 		</screen>
 		<screen name="HarddiskWait" position="140,165" size="360,60">
-			<widget name="wait" position="20,10" size="320,25" font="Arial;23"/>
+			<widget name="wait" position="20,10" size="320,25" font="Regular;23"/>
 		</screen>
 		<screen name="HarddiskSelection" position="140,165" size="360,100" title="Select HDD">
 			<widget name="hddlist" position="20,10" size="320,75" />
 		</screen>
 		<screen name="HarddiskSetup" position="140,165" size="420,160" title="Harddisk">
-			<widget name="model" position="20,10" size="380,25" font="Arial;23"  />
-			<widget name="capacity" position="20,40" size="380,25" font="Arial;23"  />
-			<widget name="bus" position="20,70" size="380,25" font="Arial;23"  />
-			<widget name="initialize" position="40,110" size="100,28" font="Arial;25" backgroundColor="red" />
+			<widget name="model" position="20,10" size="380,25" font="Regular;23"  />
+			<widget name="capacity" position="20,40" size="380,25" font="Regular;23"  />
+			<widget name="bus" position="20,70" size="380,25" font="Regular;23"  />
+			<widget name="initialize" position="40,110" size="100,28" font="Regular;25" backgroundColor="red" />
 		</screen>
 		<screen name="Setup" position="100,125" size="540,280" title="Setup">
-			<widget name="title" position="10,10" size="280,35" font="Arial;23" />
+			<widget name="title" position="10,10" size="280,35" font="Regular;23" />
 			<widget name="config" position="10,50" size="520,175" scrollbarMode="showOnDemand" />
-			<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" />
+			<widget name="ok" position="140,240" size="38,20" font="Regular;20" backgroundColor="green" />
+			<widget name="cancel" position="240,240" size="70,20" font="Regular;20" backgroundColor="red" />
 		</screen>
 		<screen name="LanguageSelection" position="200,125" size="220,250" title="Language selection">
 			<widget name="list" position="10,0" size="190,240" scrollbarMode="showOnDemand" />
@@ -80,16 +80,16 @@
 			<widget name="nimlist" position="20,10" size="360,75" />
 		</screen>
 		<screen name="CiWait" position="140,165" size="360,50" title="Common Interface">
-			<widget name="message" position="20,10" size="320,25" font="Arial;23" />
+			<widget name="message" position="20,10" size="320,25" font="Regular;23" />
 		</screen>
 		<screen name="CiSelection" position="140,165" size="360,100" title="Common Interface">
 			<widget name="entries" position="20,10" size="320,75" />
 		</screen>
 		<screen name="CiMmi" position="140,165" size="360,260">
-			<widget name="title" position="10,0" size="320,25" font="Arial;23" />
-			<widget name="subtitle" position="10,35" size="320,25" font="Arial;23" />
+			<widget name="title" position="10,0" size="320,25" font="Regular;23" />
+			<widget name="subtitle" position="10,35" size="320,25" font="Regular;23" />
 			<widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
-			<widget name="bottom" position="20,230" size="320,25" font="Arial;23" />
+			<widget name="bottom" position="20,230" size="320,25" font="Regular;23" />
 		</screen>
 		<screen name="NimSetup" position="130,165" size="440,250" title="Satconfig">
 			<widget name="config" position="20,10" size="400,220" />
@@ -99,30 +99,30 @@
 		</screen>
 		<screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
 			<widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
-			<widget name="introduction" position="20,360" size="350,30" font="Arial;23" />
+			<widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
 		</screen>
 		<screen name="ScanSimple" position="150,100" size="400,300" title="Service scan">
-			<widget name="header" position="20,10" size="280,25" font="Arial;23"/>
+			<widget name="header" position="20,10" size="280,25" font="Regular;23"/>
 			<widget name="config" position="20,45" size="360,200" scrollbarMode="showOnDemand" />
-			<widget name="footer" position="20,250" size="360,25" font="Arial;23"/>
-			<!--<widget name="introduction" position="20,360" size="280,30" font="Arial;23" />-->
+			<widget name="footer" position="20,250" size="360,25" font="Regular;23"/>
+			<!--<widget name="introduction" position="20,360" size="280,30" font="Regular;23" />-->
 		</screen>
 		<screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
 			<widget name="config" position="5,10" size="480,350" />
-			<widget name="ok" position="140,365" size="38,20" font="Arial;20" backgroundColor="green" />
-			<widget name="cancel" position="240,365" size="70,20" font="Arial;20" backgroundColor="red" />
+			<widget name="ok" position="140,365" size="38,20" font="Regular;20" backgroundColor="green" />
+			<widget name="cancel" position="240,365" size="70,20" font="Regular;20" backgroundColor="red" />
 		</screen>
 		<screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
 			<widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
-			<widget name="introduction" position="10,230" size="400,30" font="Arial;23" />
+			<widget name="introduction" position="10,230" size="400,30" font="Regular;23" />
 		</screen>
 		<screen name="About" position="140,125" size="360,250" title="About">
-			<widget name="text" position="10,30" size="420,40" font="Arial;18"/>
-			<widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>
-			<widget name="tuner0" position="10,100" size="420,20" font="Arial;18"/>
-			<widget name="tuner1" position="10,120" size="420,20" font="Arial;18"/>
-			<widget name="hdd" position="10,170" size="420,20" font="Arial;18"/>
-			<widget name="hddA" position="10,190" size="420,20" font="Arial;18"/>
+			<widget name="text" position="10,30" size="420,40" font="Regular;18"/>
+			<widget name="tuner" position="10,80" size="420,20" font="Regular;18"/>
+			<widget name="tuner0" position="10,100" size="420,20" font="Regular;18"/>
+			<widget name="tuner1" position="10,120" size="420,20" font="Regular;18"/>
+			<widget name="hdd" position="10,170" size="420,20" font="Regular;18"/>
+			<widget name="hddA" position="10,190" size="420,20" font="Regular;18"/>
 		</screen>
 		<screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
 			<widget name="okbutton" position="20,270" size="205,40" />
@@ -138,10 +138,10 @@
 		</screen>
 		<screen name="TimerEditList" position="70,100" size="560,400" title="Timer Editor">
 			<widget name="timerlist" position="10,50" size="520,300" scrollbarMode="showOnDemand" />
-			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
-			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
-			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
-			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="clockDisplay" position="300,100" size="300,300">
 			<widget name="okbutton" position="10,10" size="280,40" />
@@ -151,12 +151,12 @@
 		<screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,148" title="InfoBar">
 			<ePixmap position="0,0" zPosition="-1" size="720,148" pixmap="/usr/share/enigma2/info-bg.png" />
 
-			<widget name="snr" text="SNR:" position="195,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
-			<widget name="agc" text="AGC:" position="275,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
-			<widget name="ber" text="BER:" position="355,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
-			<widget name="snr_percent" position="232,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
-			<widget name="agc_percent" position="314,0" size="40,22" valign="center" font="Arial;15" transparent="1" />
-			<widget name="ber_count" position="392,0" size="53,22" valign="center" font="Arial;15" transparent="1" />
+			<widget name="snr" text="SNR:" position="195,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="agc" text="AGC:" position="275,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="ber" text="BER:" position="355,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="snr_percent" position="232,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="agc_percent" position="314,0" size="40,22" valign="center" font="Regular;15" transparent="1" />
+			<widget name="ber_count" position="392,0" size="53,22" valign="center" font="Regular;15" transparent="1" />
 			<widget name="snr_progress" position="447,1" size="88,6" />
 			<widget name="agc_progress" position="447,8" size="88,6" />
 			<widget name="ber_progress" position="447,15" size="88,6" />
@@ -167,19 +167,19 @@
 			<widget name="DolbyActive" pixmap="/usr/share/enigma2/dolby.png" position="585,40" size="25,15" />
 			<widget name="FormatActive" pixmap="/usr/share/enigma2/format.png" position="613,40" size="28,15" />
 
-			<widget name="ServiceName" position="69,26" size="427,34" valign="center" font="Arial;22" backgroundColor="#101258" />
-			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
-			<widget name="Event_Now_StartTime" position="210,68" size="60,22" font="Arial;20" backgroundColor="dark" />
-			<widget name="Event_Next_StartTime" position="210,98" size="60,22" font="Arial;20" backgroundColor="dark" />
-			<widget name="Event_Now" position="273,68" size="282,22" font="Arial;20" backgroundColor="dark" />
-			<widget name="Event_Next" position="273,98" size="282,22" font="Arial;20" backgroundColor="dark" />
-			<widget name="Event_Now_Duration" position="555,68" size="150,26" font="Arial;22" backgroundColor="dark" />
-			<widget name="Event_Next_Duration" position="555,98" size="150,26" font="Arial;22" backgroundColor="dark" />
+			<widget name="ServiceName" position="69,26" size="427,34" valign="center" font="Regular;22" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" />
+			<widget name="Event_Now_StartTime" position="210,68" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next_StartTime" position="210,98" size="60,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now" position="273,68" size="282,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Next" position="273,98" size="282,22" font="Regular;20" backgroundColor="dark" />
+			<widget name="Event_Now_Duration" position="555,68" size="150,26" font="Regular;22" backgroundColor="dark" />
+			<widget name="Event_Next_Duration" position="555,98" size="150,26" font="Regular;22" backgroundColor="dark" />
 
 			<widget name="ButtonRed" pixmap="/usr/share/enigma2/button_red.png" position="210,132" size="27,12" />
-			<widget name="ButtonRedText" position="240,130" size="85,22" font="Arial;14" backgroundColor="blue" transparent="1" />
+			<widget name="ButtonRedText" position="240,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
 			<widget name="ButtonGreen" pixmap="/usr/share/enigma2/button_green.png" position="320,132" size="27,12" />
-			<widget name="ButtonGreenText" position="350,130" size="85,22" font="Arial;14" backgroundColor="blue" transparent="1" />
+			<widget name="ButtonGreenText" position="350,130" size="85,22" font="Regular;14" backgroundColor="blue" transparent="1" />
 			<widget name="ButtonYellow" pixmap="/usr/share/enigma2/button_yellow.png" position="430,132" size="27,12" />
 			<widget name="ButtonBlue" pixmap="/usr/share/enigma2/button_blue.png" position="540,132" size="27,12" />
 			
@@ -197,18 +197,18 @@
 			<ePixmap position="410,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/stopbutton.png" />
 			<ePixmap position="455,70" zPosition="0" size="40,40" pixmap="/usr/share/enigma2/recordbutton.png" />
 -->
-<!--			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
-			<widget name="CurrentTime" position="575,85" size="90,30" backgroundColor="dark" font="Arial;19" />
-			<eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Arial;20" />
+<!--			<widget name="ServiceName" position="250,75" size="427,26" valign="center" font="Regular;22" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,85" size="90,30" backgroundColor="dark" font="Regular;19" />
+			<eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Regular;20" />
 -->
-			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Arial;22" backgroundColor="#101258" />
-			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Arial;19" />
+			<widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Regular;22" backgroundColor="#101258" />
+			<widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" />
 		</screen>
 
 
 		<screen name="NumberZap" position="200,140" size="280,60" title="Channel">
-			<widget name="channel" position="50,15" size="110,25" font="Arial;23" />
-			<widget name="number" position="160,15" size="80,25" halign="right" font="Arial;23" />
+			<widget name="channel" position="50,15" size="110,25" font="Regular;23" />
+			<widget name="number" position="160,15" size="80,25" halign="right" font="Regular;23" />
 		</screen>
 		<screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume">
 			<ePixmap position="0,0" zPosition="0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" />
@@ -224,55 +224,55 @@
 		</screen>
  		<screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="10,45" size="550,364" scrollbarMode="showOnDemand" />
-			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
-			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
-			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
-			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="10,45" size="540,364" scrollbarMode="showOnDemand" />
-			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
-			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Arial;21" />
-			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Arial;21" />
-			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Arial;21" />
+			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="EPGSelection" position="90,100" size="560,415" title="EPG Selection">
 			<widget name="list" position="10,40" size="550,370" scrollbarMode="showOnDemand" />
-			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
-			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
-			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Arial;21" />
-			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Arial;21" />
+			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
+			<widget name="key_yellow" position="280,0" size="140,30" backgroundColor="yellow" font="Regular;21" />
+			<widget name="key_blue" position="420,0" size="140,30" backgroundColor="blue" font="Regular;21" />
 		</screen>
 		<screen name="EventView" position="100,100" size="520,380" title="Eventview">
-			<widget name="epg_description" position="10,5" size="500,335" font="Arial;22" />
-			<widget name="datetime" position="10,345" size="130,30" font="Arial;22" />
-			<widget name="duration" position="140,345" size="100,30" font="Arial;22" />
-			<widget name="channel" position="240,345" size="270,30" font="Arial;22" />
+			<widget name="epg_description" position="10,5" size="500,335" font="Regular;22" />
+			<widget name="datetime" position="10,345" size="130,30" font="Regular;22" />
+			<widget name="duration" position="140,345" size="100,30" font="Regular;22" />
+			<widget name="channel" position="240,345" size="270,30" font="Regular;22" />
 		</screen>
 		<screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
 			<widget name="list" position="0,0" size="560,375" scrollbarMode="showOnDemand" />
-			<widget name="freeDiskSpace" position="10,380" size="540,30" font="Arial;25" />
+			<widget name="freeDiskSpace" position="10,380" size="540,30" font="Regular;25" />
 		</screen>
 		<screen name="ServiceScan" position="200,100" size="300,200" title="Service Scan">
 			<widget name="scan_progress" position="10,10" size="300,20" />
-			<widget name="scan_state" position="10,40" size="280,60" font="Arial;20" />
+			<widget name="scan_state" position="10,40" size="280,60" font="Regular;20" />
 		</screen>
 		<screen name="TimerEdit" position="70,100" size="590,335" title="Timer Edit">
-			<widget name="description" position="10,10" size="580,40" font="Arial;25" />
-			<widget name="lbegin" position="405,102" size="103,30" font="Arial;25" foregroundColor="red" />
-			<widget name="lend" position="405,158" size="103,30" font="Arial;25" foregroundColor="green" />
-			<widget name="begin" position="508,105" size="72,35" font="Arial;25" />
-			<widget name="end" position="508,150" size="72,35" font="Arial;25" />
+			<widget name="description" position="10,10" size="580,40" font="Regular;25" />
+			<widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red" />
+			<widget name="lend" position="405,158" size="103,30" font="Regular;25" foregroundColor="green" />
+			<widget name="begin" position="508,105" size="72,35" font="Regular;25" />
+			<widget name="end" position="508,150" size="72,35" font="Regular;25" />
 			<widget name="apply" position="10,240" size="250,35" />
 		</screen>
 		<screen name="HelpMenu" flags="wfNoBorder" position="0,0" size="720,576" title="Menu">
 			<widget name="list" position="100,100" size="550,375" scrollbarMode="showOnDemand" />
-			<eLabel position="500,40" size="220,60" text="help..." font="Arial;50" />
+			<eLabel position="500,40" size="220,60" text="help..." font="Regular;50" />
 		</screen>
 		<screen name="MessageBox" position="0,300" size="720,10" title="Message">
-			<widget name="text" position="0,35" size="650,0" font="Arial;22" />
-			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
-			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
+			<widget name="text" position="0,35" size="650,0" font="Regular;22" />
+			<widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Regular;21" />
+			<widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Regular;21" />
 			<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
diff --git a/lib/components/listboxepg.cpp b/lib/components/listboxepg.cpp
index 0d5c5412..e69de29b 100644
--- a/lib/components/listboxepg.cpp
+++ b/lib/components/listboxepg.cpp
@@ -1,206 +0,0 @@
-#include <lib/components/listboxepg.h>
-#include <lib/dvb/epgcache.h>
-#include <lib/service/service.h>
-
-void eListboxEPGContent::setRoot(const eServiceReference &root)
-{
-	eEPGCache *epg=eEPGCache::getInstance();
-	if ( epg )
-	{
-		m_list.clear();
-		m_root = root;
-
-		epg->Lock();
-		if (!epg->startTimeQuery(root))
-		{
-			ePtr<eServiceEvent> ptr;
-			while( !epg->getNextTimeEntry(ptr) )
-				m_list.push_back(ptr);
-		}
-		else
-			eDebug("startTimeQuery failed %s", root.toString().c_str());
-		epg->Unlock();
-
-		m_size = m_list.size();
-		cursorHome();
-
-		if (m_listbox)
-			m_listbox->entryReset();
-	}
-}
-
-RESULT eListboxEPGContent::getCurrent(ePtr<eServiceEvent> &evt)
-{
-	if (cursorValid())
-	{
-		evt = *m_cursor;
-		return 0;
-	}
-	else
-		evt = 0;
-	return -1;
-}
-
-void eListboxEPGContent::setElementPosition(int element, eRect where)
-{
-	if ((element >= 0) && (element < celElements))
-		m_element_position[element] = where;
-}
-
-void eListboxEPGContent::setElementFont(int element, gFont *font)
-{
-	if ((element >= 0) && (element < celElements))
-		m_element_font[element] = font;
-}
-
-void eListboxEPGContent::sort()
-{
-#if 0
-	ePtr<iListableService> lst;
-	if (!m_service_center->list(m_root, lst))
-	{
-		m_list.sort(iListableServiceCompare(lst));
-			/* FIXME: is this really required or can we somehow keep the current entry? */
-		cursorHome();
-		if (m_listbox)
-			m_listbox->entryReset();
-	}
-#endif
-}
-
-DEFINE_REF(eListboxEPGContent);
-
-eListboxEPGContent::eListboxEPGContent()
-	:m_size(0)
-{
-	cursorHome();
-}
-
-void eListboxEPGContent::cursorHome()
-{
-	m_cursor = m_list.begin();
-	m_cursor_number = 0;
-}
-
-void eListboxEPGContent::cursorEnd()
-{
-	m_cursor = m_list.end();
-	m_cursor_number = m_size;
-}
-
-int eListboxEPGContent::cursorMove(int count)
-{
-	list::iterator old = m_cursor;
-
-	if (count > 0)
-	{
-		while(count && (m_cursor != m_list.end()))
-		{
-			++m_cursor;
-			++m_cursor_number;
-			--count;
-		}
-	} else if (count < 0)
-	{
-		while (count && (m_cursor != m_list.begin()))
-		{
-			--m_cursor;
-			--m_cursor_number;
-			++count;
-		}
-	}
-
-	return 0;
-}
-
-int eListboxEPGContent::cursorValid()
-{
-	return m_cursor != m_list.end();
-}
-
-int eListboxEPGContent::cursorSet(int n)
-{
-	cursorHome();
-	cursorMove(n);
-
-	return 0;
-}
-
-int eListboxEPGContent::cursorGet()
-{
-	return m_cursor_number;
-}
-
-void eListboxEPGContent::cursorSave()
-{
-	m_saved_cursor = m_cursor;
-	m_saved_cursor_number = m_cursor_number;
-}
-
-void eListboxEPGContent::cursorRestore()
-{
-	m_cursor = m_saved_cursor;
-	m_cursor_number = m_saved_cursor_number;
-	m_saved_cursor = m_list.end();
-}
-
-int eListboxEPGContent::size()
-{
-	return m_size;
-}
-
-void eListboxEPGContent::setSize(const eSize &size)
-{
-	m_itemsize = size;
-	eSize s = m_itemsize;
-	s.setWidth(size.width()/20*5);
-	m_element_position[celBeginTime] = eRect(ePoint(0, 0), s);
-	m_element_font[celBeginTime] = new gFont("Arial", 22);
-	s.setWidth(size.width()/20*15);
-	m_element_position[celTitle] = eRect(ePoint(size.width()/20*5, 0), s);
-	m_element_font[celTitle] = new gFont("Arial", 22);
-}
-
-void eListboxEPGContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-	painter.clip(eRect(offset, m_itemsize));
-	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
-
-	if (cursorValid())
-	{
-		for (int e = 0; e < celElements; ++e)
-		{
-			if (!m_element_font[e])
-				continue;
-
-			painter.setFont(m_element_font[e]);
-
-			std::string text = "<n/a>";
-
-			switch (e)
-			{
-			case celBeginTime:
-			{
-				text=(*m_cursor)->getBeginTimeString();
-				break;
-			}
-			case celTitle:
-			{
-				text = (*m_cursor)->m_event_name;
-				break;
-			}
-			}
-			
-			eRect area = m_element_position[e];
-			area.moveBy(offset.x(), offset.y());
-			
-			painter.renderText(area, text);
-		}
-		
-		if (selected)
-			style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
-	}
-	painter.clippop();
-}
-
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 95d92e09..6e49dcb5 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -110,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size)
 
 void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_size));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -219,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size)
 
 void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -328,7 +328,7 @@ void eListboxPythonStringContent::setSize(const eSize &size)
 
 void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -398,8 +398,8 @@ void eListboxPythonStringContent::invalidate()
 
 void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 20);
-	ePtr<gFont> fnt2 = new gFont("Arial", 16);
+	ePtr<gFont> fnt = new gFont("Regular", 20);
+	ePtr<gFont> fnt2 = new gFont("Regular", 16);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 79024a35..86ff8a42 100644
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -38,7 +38,7 @@ eWindowStyleSimple::eWindowStyleSimple()
 	m_border_left = m_border_right = m_border_bottom = 2;
 	m_border_top = 30;
 
-	m_fnt = new gFont("Arial", 25);
+	m_fnt = new gFont("Regular", 25);
 	
 	m_border_color_tl = gColor(0x1f);
 	m_border_color_br = gColor(0x14);
@@ -141,13 +141,13 @@ RESULT eWindowStyleSimple::getFont(int what, ePtr<gFont> &fnt)
 	switch (what)
 	{
 	case fontStatic:
-		fnt = new gFont("Arial", 12);
+		fnt = new gFont("Regular", 12);
 		break;
 	case fontButton:
-		fnt = new gFont("Arial", 20);
+		fnt = new gFont("Regular", 20);
 		break;
 	case fontTitlebar:
-		fnt = new gFont("Arial", 25);
+		fnt = new gFont("Regular", 25);
 		break;
 	default:
 		return -1;
diff --git a/lib/gui/ewindowstyleskinned.cpp b/lib/gui/ewindowstyleskinned.cpp
index 20d508f6..5da4696e 100644
--- a/lib/gui/ewindowstyleskinned.cpp
+++ b/lib/gui/ewindowstyleskinned.cpp
@@ -196,13 +196,13 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr<gFont> &fnt)
 	switch (what)
 	{
 	case fontStatic:
-		fnt = new gFont("Arial", 12);
+		fnt = new gFont("Regular", 12);
 		break;
 	case fontButton:
-		fnt = new gFont("Arial", 20);
+		fnt = new gFont("Regular", 20);
 		break;
 	case fontTitlebar:
-		fnt = new gFont("Arial", 25);
+		fnt = new gFont("Regular", 25);
 		break;
 	default:
 		return -1;
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 56282581..6ab3f748 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -35,9 +35,9 @@ class EPGList(HTMLComponent, GUIComponent):
 #			self.l.setVisualMode(eListboxServiceContent.visModeSimple)
 #		else:
 #			self.instance.setItemHeight(40)
-#			self.l.setElementFont(self.l.celServiceName, gFont("Arial", 30))
+#			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 30))
 #			self.l.setElementPosition(self.l.celServiceName, eRect(40, 0, self.instance.size().width(), 40))
-#			self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
+#			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 #			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 10, 40, 30))
 #
 #			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 58335c08..8905944a 100644
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -44,8 +44,8 @@ class HelpMenuList(GUIComponent):
 		
 		self.l.setList(l)
 		
-		self.l.setFont(0, gFont("Arial", 36))
-		self.l.setFont(1, gFont("Arial", 18))
+		self.l.setFont(0, gFont("Regular", 36))
+		self.l.setFont(1, gFont("Regular", 18))
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index def29c93..09423741 100644
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -33,7 +33,7 @@ class LanguageList(HTMLComponent, GUIComponent, MenuList):
 		self.l = eListboxPythonMultiContent()
 		self.list = list
 		self.l.setList(list)
-		self.l.setFont(0, gFont("Arial", 20))
+		self.l.setFont(0, gFont("Regular", 20))
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 3c5f7e24..0c0bba9b 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -61,8 +61,8 @@ class MovieList(HTMLComponent, GUIComponent):
 		self.l = eListboxPythonMultiContent()
 		self.load(root)
 		self.l.setList(self.list)
-		self.l.setFont(0, gFont("Arial", 30))
-		self.l.setFont(1, gFont("Arial", 18))
+		self.l.setFont(0, gFont("Regular", 30))
+		self.l.setFont(1, gFont("Regular", 18))
 
 	def moveToIndex(self, index):
 		self.instance.moveSelectionTo(index)
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index d2ae64a7..9dec041b 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -33,8 +33,8 @@ class PluginList(HTMLComponent, GUIComponent, MenuList):
 		self.l = eListboxPythonMultiContent()
 		self.list = list
 		self.l.setList(list)
-		self.l.setFont(0, gFont("Arial", 20))
-		self.l.setFont(1, gFont("Arial", 10))
+		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setFont(1, gFont("Regular", 10))
 	
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 4c10c660..2cef35c1 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -130,13 +130,13 @@ class ServiceList(HTMLComponent, GUIComponent):
 		if mode == self.MODE_NORMAL:
 			self.instance.setItemHeight(28)
 			self.l.setVisualMode(eListboxServiceContent.visModeSimple)
-			self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
 		else:
 			self.instance.setItemHeight(28)
-			self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
+			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 40, 28))
-			self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(50, 0, self.instance.size().width()-50, 28))
-			self.l.setElementFont(self.l.celServiceInfo, gFont("Arial", 18))
+			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
 			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index f4176fad..8f8dc50c 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -66,8 +66,8 @@ class TimerList(HTMLComponent, GUIComponent):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
 		self.l.setList(list)
-		self.l.setFont(0, gFont("Arial", 20))
-		self.l.setFont(1, gFont("Arial", 18))
+		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setFont(1, gFont("Regular", 18))
 	
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
diff --git a/lib/python/Plugins/example.py b/lib/python/Plugins/example.py
index 86e2cd14..5b96ee37 100644
--- a/lib/python/Plugins/example.py
+++ b/lib/python/Plugins/example.py
@@ -6,7 +6,7 @@ from Components.Label import Label
 class Example(Screen):
 	skin = """
 		<screen position="100,100" size="200,200" title="Example plugin..." >
-			<widget name="text" position="0,0" size="100,50" font="Arial;23" />
+			<widget name="text" position="0,0" size="100,50" font="Regular;23" />
 		</screen>"""
 		
 	def __init__(self, session):
diff --git a/lib/python/Plugins/update.py b/lib/python/Plugins/update.py
index 7126875b..756ed381 100644
--- a/lib/python/Plugins/update.py
+++ b/lib/python/Plugins/update.py
@@ -8,7 +8,7 @@ import os
 class Example(Screen):
 	skin = """
 		<screen position="100,100" size="550,400" title="IPKG upgrade..." >
-			<widget name="text" position="0,0" size="550,400" font="Arial;15" />
+			<widget name="text" position="0,0" size="550,400" font="Regular;15" />
 		</screen>"""
 		
 	def __init__(self, session):
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 6b0a2e00..5b0b6220 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -25,7 +25,7 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
 		self.l = eListboxPythonMultiContent()
 		self.list = source
 		self.l.setList(self.list)
-		self.l.setFont(0, gFont("Arial", 23))
+		self.l.setFont(0, gFont("Regular", 23))
 
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index f96d38d1..7a374543 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -10,7 +10,7 @@ config.misc.firstrun = configElementBoolean("config.misc.firstrun", 1);
 class StartWizard(Wizard):
 	skin = """
 		<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
-			<widget name="text" position="153,50" size="340,270" font="Arial;23" />
+			<widget name="text" position="153,50" size="340,270" font="Regular;23" />
 			<widget name="list" position="50,300" zPosition="1" size="440,200" />
 			<widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" />			
 			<widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" />
diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py
index 68a7d84a..3febb1af 100644
--- a/lib/python/Screens/TutorialWizard.py
+++ b/lib/python/Screens/TutorialWizard.py
@@ -11,7 +11,7 @@ config.misc.firstruntutorial = configElementBoolean("config.misc.firstruntutoria
 class TutorialWizard(Wizard):
 	skin = """
 		<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
-			<widget name="text" position="50,100" size="440,200" font="Arial;23" />
+			<widget name="text" position="50,100" size="440,200" font="Regular;23" />
 			<widget name="list" position="50,300" zPosition="1" size="440,200" />
 			<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
 			<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index cd48c62e..9a8ea29f 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -142,7 +142,7 @@ void eListboxServiceContent::setVisualMode(int mode)
 	if (m_visual_mode == visModeSimple)
 	{
 		m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
-		m_element_font[celServiceName] = new gFont("Arial", 23);
+		m_element_font[celServiceName] = new gFont("Regular", 23);
 		m_element_position[celServiceNumber] = eRect();
 		m_element_font[celServiceNumber] = 0;
 		m_element_position[celIcon] = eRect();
diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 43c422f8..9c3eed9d 100644
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -68,7 +68,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
 
 	p.resetClip(gRegion(eRect(0, 0, 720, 576)));
 	
@@ -102,7 +102,7 @@ int main()
 	p.setBackgroundColor(gColor(0x1f));
 	p.setForegroundColor(gColor(0x10));
 
-	ePtr<gFont> fnt = new gFont("Arial", 70);
+	ePtr<gFont> fnt = new gFont("Regular", 70);
 	p.setFont(fnt);
 	p.renderText(eRect(100, 100, 500, 200), "Hello welt!");
 	
diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp
index 67d9c0c5..e53fccab 100644
--- a/main/enigma-gui.cpp
+++ b/main/enigma-gui.cpp
@@ -67,7 +67,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	dsk.setDC(my_dc);
diff --git a/main/enigma.cpp b/main/enigma.cpp
index 0d1ce6ec..4f538e46 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
@@ -219,14 +219,14 @@ int main(int argc, char **argv)
 	lcd_label = new eLabel(lcd_win);
 	lcd_label->move(ePoint(0, 4));
 	lcd_label->resize(eSize(132, 42));
-	ePtr<gFont> font = new gFont("Arial", 19);
-	//ePtr<gFont> font = new gFont("Arial", 16);
+	ePtr<gFont> font = new gFont("Regular", 19);
+	//ePtr<gFont> font = new gFont("Regular", 16);
 	lcd_label->setFont(font);
 
 	lcd_clock = new eLabel(lcd_win);
 	lcd_clock->move(ePoint(50, 46));
 	lcd_clock->resize(eSize(132, 18));
-	ePtr<gFont> clkfont = new gFont("Arial", 16);
+	ePtr<gFont> clkfont = new gFont("Regular", 16);
 	lcd_clock->setFont(clkfont);
 
 	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
diff --git a/skin.py b/skin.py
index 8535dc81..c6d0678a 100644
--- a/skin.py
+++ b/skin.py
@@ -165,7 +165,7 @@ def loadSkin(desktop):
 	for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"):
 		style = eWindowStyleSkinned()
 		
-		style.setTitleFont(gFont("Arial", 20));
+		style.setTitleFont(gFont("Regular", 20));
 		style.setTitleOffset(eSize(20, 5));
 		
 		for borderset in elementsWithTag(windowstyle.childNodes, "borderset"):