git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when background jobs fail and user presses red key
[enigma2.git]
/
lib
/
python
/
Components
/
ServiceScan.py
diff --git
a/lib/python/Components/ServiceScan.py
b/lib/python/Components/ServiceScan.py
index ebd623e9b624e324e1cd9e4af982823511d7bdb5..5a7b3dea5691628e4933526dd40397dc07ef0bf3 100644
(file)
--- a/
lib/python/Components/ServiceScan.py
+++ b/
lib/python/Components/ServiceScan.py
@@
-18,6
+18,7
@@
class ServiceScan:
def scanStatusChanged(self):
if self.state == self.Running:
self.progressbar.setValue(self.scan.getProgress())
def scanStatusChanged(self):
if self.state == self.Running:
self.progressbar.setValue(self.scan.getProgress())
+ self.lcd_summary.updateProgress(self.scan.getProgress())
if self.scan.isDone():
errcode = self.scan.getError()
if self.scan.isDone():
errcode = self.scan.getError()
@@
-29,7
+30,7
@@
class ServiceScan:
self.network.setText("")
self.transponder.setText("")
else:
self.network.setText("")
self.transponder.setText("")
else:
- self.text.setText(_("scan in progress - %d
%% done! %d services found!") % (self.scan.getProgress(),
self.foundServices + self.scan.getNumServices()))
+ self.text.setText(_("scan in progress - %d
%% done!") % self.scan.getProgress() + ' ' + _("%d services found!") % (
self.foundServices + self.scan.getNumServices()))
transponder = self.scan.getCurrentTransponder()
network = ""
tp_text = ""
transponder = self.scan.getCurrentTransponder()
network = ""
tp_text = ""
@@
-78,21
+79,19
@@
class ServiceScan:
tp = transponder.getDVBT()
if not tp[0]:
tp = tp[1]
tp = transponder.getDVBT()
if not tp[0]:
tp = tp[1]
- tp_text = ("DVB-T %s %d
/ %d
") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
+ tp_text = ("DVB-T %s %d
%s
") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
tp.frequency,
tp.frequency,
-
tp.symbol_rate/1000
)
+
{ 0 : "Bw 8MHz", 1 : "Bw 7MHz", 2 : "Bw 6MHz", 3 : "Bw Auto" }[tp.bandwidth]
)
else:
print "unknown transponder type in scanStatusChanged"
self.network.setText(network)
self.transponder.setText(tp_text)
if self.state == self.Done:
else:
print "unknown transponder type in scanStatusChanged"
self.network.setText(network)
self.transponder.setText(tp_text)
if self.state == self.Done:
- if self.scan.getNumServices() == 1:
- self.text.setText(_("scan done! One service found!"))
- elif self.scan.getNumServices() == 0:
- self.text.setText(_("scan done! No service found!"))
+ if self.scan.getNumServices() == 0:
+ self.text.setText(_("scan done!") + ' ' + _("%d services found!") % 0 )
else:
else:
- self.text.setText(_("scan done!
%d services found!") % (self.foundServices + self.scan.getNumServices()))
+ self.text.setText(_("scan done!
") + ' ' + _("
%d services found!") % (self.foundServices + self.scan.getNumServices()))
if self.state == self.Error:
self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )
if self.state == self.Error:
self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )
@@
-104,7
+103,7
@@
class ServiceScan:
self.run += 1
self.execBegin()
self.run += 1
self.execBegin()
- def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo):
+ def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo
, lcd_summary
):
self.foundServices = 0
self.progressbar = progressbar
self.text = text
self.foundServices = 0
self.progressbar = progressbar
self.text = text
@@
-115,6
+114,7
@@
class ServiceScan:
self.transponder = transponder
self.network = network
self.run = 0
self.transponder = transponder
self.network = network
self.run = 0
+ self.lcd_summary = lcd_summary
def doRun(self):
self.scan = eComponentScan()
def doRun(self):
self.scan = eComponentScan()
@@
-160,6
+160,7
@@
class ServiceScan:
def newService(self):
newServiceName = self.scan.getLastServiceName()
self.servicelist.addItem(newServiceName)
def newService(self):
newServiceName = self.scan.getLastServiceName()
self.servicelist.addItem(newServiceName)
+ self.lcd_summary.updateService(self.scan.getLastServiceName())
def destroy(self):
pass
def destroy(self):
pass