diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
| commit | bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch) | |
| tree | c5945c791698c14723e989449e6b4bfcc275c05d /data/skin_default.xml | |
| parent | 4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff) | |
| parent | 5e6f814d005a01caa437a532e61f4b338617ff67 (diff) | |
| download | enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/dvb/decoder.cpp
Diffstat (limited to 'data/skin_default.xml')
| -rwxr-xr-x | data/skin_default.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index 993fd320..d60933eb 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -789,18 +789,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget source="Frontend" render="Label" position="460,35" size="60,22" font="Regular;21"> <convert type="FrontendInfo">SNR</convert> </widget> - <eLabel name="agc" text="AGC:" position="120,60" size="60,22" font="Regular;21" halign="right" transparent="1" /> - <widget source="Frontend" render="Progress" position="190,60" size="260,20" pixmap="skin_default/bar_snr.png" borderWidth="2" borderColor="#cccccc"> - <convert type="FrontendInfo">AGC</convert> - </widget> - <widget source="Frontend" render="Label" position="460,60" size="60,22" font="Regular;21"> - <convert type="FrontendInfo">AGC</convert> - </widget> - <eLabel name="ber" text="BER:" position="120,85" size="60,22" font="Regular;21" halign="right" transparent="1" /> - <widget source="Frontend" render="Progress" position="190,85" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc"> + <eLabel name="ber" text="BER:" position="120,60" size="60,22" font="Regular;21" halign="right" transparent="1" /> + <widget source="Frontend" render="Progress" position="190,60" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc"> <convert type="FrontendInfo">BER</convert> </widget> - <widget source="Frontend" render="Label" position="460,85" size="60,22" font="Regular;21"> + <widget source="Frontend" render="Label" position="460,60" size="60,22" font="Regular;21"> <convert type="FrontendInfo">BER</convert> </widget> <eLabel name="lock" text="Lock:" position="120,115" size="60,22" font="Regular;21" halign="right" /> @@ -813,7 +806,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <convert type="ConditionalShowHide">Invert</convert> </widget> <ePixmap pixmap="skin_default/div-h.png" position="10,152" zPosition="1" size="500,2" /> - <widget name="config" position="10,165" size="500,240" scrollbarMode="showOnDemand" /> + <widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" /> </screen> <!-- Scan setup --> <screen name="ScanSetup" position="100,115" size="520,390" title="Service scan"> @@ -947,6 +940,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) </screen> <!-- Subtitle area --> <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" /> + <!-- TextBox --> + <screen name="TextBox" position="90,50" size="550,400" title="Message..."> + <widget name="text" position="0,0" size="540,390" font="Regular;18" /> + <!--widget source="text" render="Label" position="0,0" size="540,390" font="Regular;18" /--> + </screen> <!-- Time & date input --> <screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input"> <widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" /> |