electrum

commit cba55d5dec1a8ba9f71f63d3d6aa156b2ece0bf7
parent 3c24c7d426cf6772ea75fb4577f0cb3915cd0c5e
Author: Maran <maran.hidskes@gmail.com>
Date:   Sun, 12 Aug 2012 20:48:09 +0200

Merge branch 'master' of https://github.com/spesmilo/electrum

Diffstat:
M
lib/gui_lite.py
 | 
6
++++--
M
lib/qrscanner.py
 | 
8
++++++++
M
setup.py
 | 
1
+

3 files changed, 13 insertions(+), 2 deletions(-)
diff --git 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)
diff --git 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():
diff --git 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',