diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-07 12:43:22 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-11 23:03:55 +0100 |
| commit | c278f726f27c5645569c407a71ac972363600ae8 (patch) | |
| tree | 0279ff10b21b089993636aed84e18a0bbcb82d26 | |
| parent | 5fdd7a8c7ad6c371cd1344898f68e1980e2a94b9 (diff) | |
| download | enigma2-c278f726f27c5645569c407a71ac972363600ae8.tar.gz enigma2-c278f726f27c5645569c407a71ac972363600ae8.zip | |
fixes bug #283
if nothing is connected to any nim, don't die entering scan setup
| -rwxr-xr-x | data/skin_default.xml | 4 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/data/skin_default.xml b/data/skin_default.xml index 72dc3577..16504abf 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -803,9 +803,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" /> </screen> <!-- Scan setup --> - <screen name="ScanSetup" position="center,center" size="520,390" title="Service scan"> + <screen name="ScanSetup" position="center,center" size="520,450" title="Service scan"> <widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" /> - <widget name="introduction" position="10,365" size="500,25" font="Regular;20" halign="center" /> + <widget name="introduction" position="10,365" size="500,75" font="Regular;20" halign="center" /> </screen> <!-- Scan simple --> <screen name="ScanSimple" position="center,center" size="420,350" title="Service scan"> diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index d0af8f7e..bea08724 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -295,9 +295,11 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): self.list = [] ConfigListScreen.__init__(self, self.list) - self.createSetup() - - self["introduction"] = Label(_("Press OK to start the scan")) + if not self.scan_nims.value == "": + self.createSetup() + self["introduction"] = Label(_("Press OK to start the scan")) + else: + self["introduction"] = Label(_("Nothing to scan!\nPlease setup your tuner settings before you start a service scan.")) def runAsync(self, finished_cb): self.finished_cb = finished_cb @@ -709,6 +711,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport): tlist.append(buildTerTransponder(*args, **kwargs)) def keyGo(self): + if self.scan_nims.value == "": + return tlist = [] flags = None startScan = True |