Merge branch 'master' of /git/enigma2
authoracid-burn <acidburn@opendreambox.org>
Wed, 14 Oct 2009 11:06:41 +0000 (11:06 +0000)
committeracid-burn <acidburn@opendreambox.org>
Wed, 14 Oct 2009 11:06:41 +0000 (11:06 +0000)
data/skin_default.xml
lib/dvb/frontend.cpp
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py

index 0192d80..6efa969 100755 (executable)
                </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>
index 0319c4c..c6bf6aa 100644 (file)
@@ -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;
index c10a7e5..3a1f835 100755 (executable)
@@ -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)