diff options
| author | acid-burn <acidburn@opendreambox.org> | 2009-10-14 11:06:41 +0000 |
|---|---|---|
| committer | acid-burn <acidburn@opendreambox.org> | 2009-10-14 11:06:41 +0000 |
| commit | cccb35a4aeef1ba919411b35553902c86f57b856 (patch) | |
| tree | 1cd1a5da7cb17c1d388124ecdd76c3caf81d1573 | |
| parent | 755936c5114029219a6800b81b74ffdfbcbbfe30 (diff) | |
| parent | 1562ec44f47fbe9722c95ac1bcc31658c672af2d (diff) | |
| download | enigma2-cccb35a4aeef1ba919411b35553902c86f57b856.tar.gz enigma2-cccb35a4aeef1ba919411b35553902c86f57b856.zip | |
Merge branch 'master' of /git/enigma2
| -rwxr-xr-x | data/skin_default.xml | 4 | ||||
| -rw-r--r-- | lib/dvb/frontend.cpp | 2 | ||||
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index 0192d805..6efa9699 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -109,7 +109,7 @@ </widget> </screen> <!-- Channel selection - Radio --> - <screen name="ChannelSelectionRadio" position="center,center" size="560,298" title="Channel Selection"> + <screen name="ChannelSelectionRadio" position="center,95" size="560,298" title="Channel Selection"> <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" /> <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" /> <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" /> @@ -692,7 +692,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" /> </screen> <!-- Radio infobar --> - <screen name="RadioInfoBar" position="85,408" size="560,120" zPosition="-1" title="Radio"> + <screen name="RadioInfoBar" position="center,408" size="560,120" zPosition="-1" title="Radio"> <widget source="session.CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1"> <convert type="ServiceName">Name</convert> </widget> diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 0319c4c9..c6bf6aa8 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -804,7 +804,7 @@ int eDVBFrontend::readFrontendData(int type) ret = (int)(snr_in_db * 100); } else if (strstr(m_description, "Alps BSBE1 C01A") || - !strcmp(m_description, "Alps -S(STV0288)")) + strstr(m_description, "Alps -S(STV0288)")) { if (snr == 0) ret = 0; diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py index c10a7e5f..3a1f835f 100755 --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py @@ -1217,9 +1217,9 @@ class PluginManagerInfo(Screen): if action == 'install': return(( _('Installing'), info, installpng, divpng)) elif action == 'remove': - return(( _('Removeing'), info, removepng, divpng)) + return(( _('Removing'), info, removepng, divpng)) else: - return(( _('Upgradeing'), info, upgradepng, divpng)) + return(( _('Upgrading'), info, upgradepng, divpng)) def exit(self): self.close(False) |