fix crash on display settings

[dreambox-avalon_II.git] / usr / share / enigma2 / Avalon_II / skin.xml

diff --git a/usr/share/enigma2/Avalon_II/skin.xml b/usr/share/enigma2/Avalon_II/skin.xml
index dc31aa560337ab165a10117ec0a9e5c53202a8ef..e4dafb2d2fb12b9995409992c7ba6f4a671e059d 100644 (file)
--- a/usr/share/enigma2/Avalon_II/skin.xml
+++ b/usr/share/enigma2/Avalon_II/skin.xml
@@ -34,7 +34,7 @@
                <font filename="valis_enigma.ttf" name="Regular" scale="100" replacement="1" />\r
                <font filename="valis_lcd.ttf" name="LCD" scale="100" />\r
                <font filename="goodtime.ttf" name="OLED" scale="100" />\r
-               <font filename="tuxtxt.ttf" name="Console" scale="100" />\r
+               <font filename="valis_enigma.ttf" name="Console" scale="100" />\r
        </fonts>\r
        <windowstyle type="skinned" id="0">\r
                <title offset="15,10" font="Regular;20" />\r
@@ -157,9 +157,10 @@
                <widget source="session.RecordState" render="Pixmap" pixmap="Avalon_II/icons/rec.png" position="187,440" zPosition="3" size="12,12" alphatest="on" transparent="1" >\r
                        <convert type="ConditionalShowHide">Blink</convert>\r
                </widget>\r
-               <widget source="session.FrontendStatus" render="Label" position="587,437" zPosition="3" size="75,24" font="Regular;15" halign="right" foregroundColor="clText" transparent="1"  backgroundColor="clBack">\r
+               <widget source="session.FrontendStatus" render="Label" position="587,439" zPosition="3" size="75,24" font="Regular;15" halign="right" foregroundColor="clText" transparent="1"  backgroundColor="clBack">\r
                        <convert type="FrontendInfo">SNRdB</convert>\r
                </widget>\r
+               <widget source="session.CurrentService" render="SmartLabel" position="572,419" zPosition="4" size="90,20" noWrap="1" halign="right" font="Regular;15" foregroundColor="clText" transparent="1"  backgroundColor="clBack" />\r
        </screen>\r
        \r
        \r
@@ -726,6 +727,7 @@
                <widget name="timerlist" position="0,60" size="560,350" scrollbarMode="showOnDemand" />\r
        </screen>\r
        <!-- Timer entry -->\r
+<!-- crashes dm7025_2.6.1.nfi\r
        <screen name="TimerEntry" position="80,87" size="560,430" title="Timer entry">\r
                <widget name="cancel" pixmap="Avalon_II/buttons/red.png" position="0,0" size="140,40" alphatest="on" />\r
                <widget name="ok" pixmap="Avalon_II/buttons/green.png" position="140,0" size="140,40" alphatest="on" />\r
@@ -736,6 +738,7 @@
                <widget name="locationtext" position="280,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;18" backgroundColor="#a08500" transparent="1" />\r
                <widget name="config" position="10,45" size="540,385" scrollbarMode="showOnDemand" />\r
        </screen>\r
+-->\r
        <!-- Timer log -->\r
        <screen name="TimerLog" position="80,87" size="560,430" title="Timer log">\r
                <ePixmap pixmap="Avalon_II/buttons/red.png" position="0,0" size="140,40" alphatest="on" />\r
@@ -767,6 +770,7 @@
        \r
        <!-- ########## Setup ########## -->\r
        <!-- Setup -->\r
+<!--\r
        <screen name="Setup" position="80,87" size="560,430" title="Setup">\r
                <widget name="cancel" pixmap="Avalon_II/buttons/red.png" position="0,0" size="140,40" alphatest="on" />\r
                <widget name="ok" pixmap="Avalon_II/buttons/green.png" position="140,0" size="140,40" alphatest="on" />\r
@@ -777,9 +781,10 @@
                <widget name="title" position="10,45" size="280,35" font="Regular;22" />\r
                <widget name="config" position="10,95" size="540,325" scrollbarMode="showOnDemand" />\r
        </screen>\r
+-->\r
        <!-- Console -->\r
        <screen name="Console" position="80,87" size="560,430" title="Command execution...">\r
-               <widget name="text" position="10,10" size="540,410" font="Regular;18" />\r
+               <widget name="text" position="10,10" size="540,410" font="Console;20" />\r
        </screen>\r
        <!-- Harddisk setup -->\r
        <screen name="HarddiskSetup" position="140,200" size="420,160" title="Harddisk">\r
@@ -796,14 +801,6 @@
                <widget name="status" position="10,60" size="550,45" font="Regular;18" />\r
                <widget name="slider" position="10,100" size="530,15" pixmap="Avalon_II/window/misc_p_bar_big.png" borderWidth="1" borderColor="#cccccc" />\r
        </screen>\r
-       <!-- Nameserver -->\r
-       <screen name="NameserverSetup" position="130,140" size="460,330" title="Nameserver Setup">\r
-               <ePixmap pixmap="Avalon_II/buttons/red.png" position="0,0" size="140,40" alphatest="on" />\r
-               <ePixmap pixmap="Avalon_II/buttons/green.png" position="315,0" size="140,40" alphatest="on" />\r
-               <widget name="red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" transparent="1" />\r
-               <widget name="green" position="315,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" transparent="1" />\r
-               <widget name="config" position="10,50" size="440,175" scrollbarMode="showOnDemand" />\r
-       </screen>\r
        <!-- Plugin browser -->\r
        <screen name="PluginBrowser" position="160,95" size="400,405" title="Plugin browser">\r
                <ePixmap pixmap="Avalon_II/buttons/red-big.png" position="0,0" size="200,40" alphatest="on" />\r