qr scanner: show error if not installed

This commit is contained in:
ThomasV 2014-09-19 11:08:43 +02:00
parent 44464e7e21
commit 17006e5285
2 changed files with 7 additions and 2 deletions

View File

@ -2144,7 +2144,12 @@ class ElectrumWindow(QMainWindow):
def read_tx_from_qrcode(self):
data = run_hook('scan_qr_hook')
from electrum import qrscanner
try:
data = qrscanner.scan_qr(self.config)
except BaseException, e:
QMessageBox.warning(self, _('Error'), _(e), _('OK'))
return
if not data:
return
# transactions are binary, but qrcode seems to return utf8...

View File

@ -8,7 +8,7 @@ except ImportError:
def scan_qr(config):
if not zbar:
return
raise BaseException("The zbar package is not available.\nOn Linux, try 'sudo apt-get install python-zbar'")
device = config.get("video_device", "default")
if device == 'default':
device = ''