From 380242f0e542dfe52ffa09cea3d86ce7aa4ec3b3 Mon Sep 17 00:00:00 2001 From: slush Date: Fri, 3 Aug 2012 16:04:36 +0200 Subject: [PATCH 1/3] Added package qrscanner --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 1af26625..770c59af 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ setup(name = "Electrum", 'electrum.icons_rc', 'electrum.mnemonic', 'electrum.pyqrnative', + 'electrum.qrscanner', 'electrum.bmp', 'electrum.msqr', 'electrum.util', From 2791ecc167b5f5ba94b7a56cf155f2217d2f8309 Mon Sep 17 00:00:00 2001 From: slush Date: Fri, 3 Aug 2012 16:05:47 +0200 Subject: [PATCH 2/3] Added check if video device is available --- lib/qrscanner.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/qrscanner.py b/lib/qrscanner.py index eb3571a8..bbf11c50 100644 --- a/lib/qrscanner.py +++ b/lib/qrscanner.py @@ -11,6 +11,14 @@ from urlparse import urlparse, parse_qs def is_available(): if not zbar: return False + + try: + proc = zbar.Processor() + proc.init() + except zbar.SystemError: + # Cannot open video device + return False + return True def scan_qr(): From 99f71a188f1bef31d8c5c54e95ede612e61a9bbd Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Fri, 3 Aug 2012 16:07:58 -0300 Subject: [PATCH 3/3] formatting fixes. --- lib/gui_lite.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/gui_lite.py b/lib/gui_lite.py index e3a4d8e2..7408e736 100644 --- a/lib/gui_lite.py +++ b/lib/gui_lite.py @@ -283,12 +283,14 @@ class MiniWindow(QDialog): return quote_text def send(self): - if self.actuator.send(self.address_input.text(), self.amount_input.text(), self): + if self.actuator.send(self.address_input.text(), + self.amount_input.text(), self): self.address_input.setText("") self.amount_input.setText("") def check_button_status(self): - if self.address_input.property("isValid") == True and len(self.amount_input.text()) != 0: + if (self.address_input.property("isValid") is True and + len(self.amount_input.text()) > 0): self.send_button.setDisabled(False) else: self.send_button.setDisabled(True)