diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2008-12-08 16:08:50 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2008-12-08 16:08:50 +0100 |
| commit | 6df771b5f7e744c650b73f8548ab41152c0185eb (patch) | |
| tree | 2c6ba8d941652209b355b868f91e1bdd339e172f /data | |
| parent | 5b37109a8002420247a5abf46841c95365e88036 (diff) | |
| parent | f1b8049d3735b3f6544e84817e9c7d3bca474d5e (diff) | |
| download | enigma2-6df771b5f7e744c650b73f8548ab41152c0185eb.tar.gz enigma2-6df771b5f7e744c650b73f8548ab41152c0185eb.zip | |
Merge branch 'master' into dvd_scale_test
Diffstat (limited to 'data')
| -rwxr-xr-x[-rw-r--r--] | data/skin.xml | 9 | ||||
| -rwxr-xr-x | data/skin_default.xml | 13 | ||||
| -rw-r--r-- | data/skin_default/bar_snr.png | bin | 2051 -> 2075 bytes |
3 files changed, 5 insertions, 17 deletions
diff --git a/data/skin.xml b/data/skin.xml index 96d7067b..e2dbacdd 100644..100755 --- a/data/skin.xml +++ b/data/skin.xml @@ -79,14 +79,9 @@ <widget source="session.FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1"> <convert type="FrontendInfo">SNRdB</convert> </widget> - <!-- Signal Strength --> - <eLabel text="AGC" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" /> - <widget source="session.FrontendStatus" render="Label" position="355,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1"> - <convert type="FrontendInfo">AGC</convert> - </widget> <!-- Bit error rate --> - <eLabel text="BER" position="403,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" /> - <widget source="session.FrontendStatus" render="Label" position="440,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1"> + <eLabel text="BER" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1" /> + <widget source="session.FrontendStatus" render="Label" position="355,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1"> <convert type="FrontendInfo">BER</convert> </widget> <!-- Channellogo (Picon) --> diff --git a/data/skin_default.xml b/data/skin_default.xml index 993fd320..013ca5b4 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" /> diff --git a/data/skin_default/bar_snr.png b/data/skin_default/bar_snr.png Binary files differindex 18050ed1..e4181c48 100644 --- a/data/skin_default/bar_snr.png +++ b/data/skin_default/bar_snr.png |
