Browse Source

qr scanner: show error if not installed

283
ThomasV 10 years ago
parent
commit
17006e5285
  1. 7
      gui/qt/main_window.py
  2. 2
      lib/qrscanner.py

7
gui/qt/main_window.py

@ -2144,7 +2144,12 @@ class ElectrumWindow(QMainWindow):
def read_tx_from_qrcode(self): 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: if not data:
return return
# transactions are binary, but qrcode seems to return utf8... # transactions are binary, but qrcode seems to return utf8...

2
lib/qrscanner.py

@ -8,7 +8,7 @@ except ImportError:
def scan_qr(config): def scan_qr(config):
if not zbar: 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") device = config.get("video_device", "default")
if device == 'default': if device == 'default':
device = '' device = ''

Loading…
Cancel
Save