X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=plugins%2Fqrscanner.py;h=01a048fb9ee7f6618dd1c34a07868b47c806c111;hb=HEAD;hp=c42347c27cb5dfa3142c1cfd614f4eda57b11e2d;hpb=b614a673eb1e05d95e626a658651151b6cf8cc7e;p=electrum-nvc.git

diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py
index c42347c..01a048f 100644
--- a/plugins/qrscanner.py
+++ b/plugins/qrscanner.py
@@ -1,16 +1,16 @@
-from electrum.util import print_error
+from electrum_nvc.util import print_error
 from urlparse import urlparse, parse_qs
 from PyQt4.QtGui import QPushButton, QMessageBox, QDialog, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel, QLineEdit, QComboBox
 from PyQt4.QtCore import Qt
 
-from electrum.i18n import _
+from electrum_nvc.i18n import _
 import re
 import os
-from electrum import Transaction
-from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid
-from electrum_gui.qt.qrcodewidget import QRCodeWidget
-from electrum import bmp
-from electrum_gui.qt import HelpButton, EnterButton
+from electrum_nvc import Transaction
+from electrum_nvc.bitcoin import MIN_RELAY_TX_FEE, is_valid
+from electrum_nvc_gui.qt.qrcodewidget import QRCodeWidget
+from electrum_nvc import bmp
+from electrum_nvc_gui.qt import HelpButton, EnterButton
 import json
 
 try:
@@ -18,7 +18,7 @@ try:
 except ImportError:
     zbar = None
 
-from electrum import BasePlugin
+from electrum_nvc import BasePlugin
 class Plugin(BasePlugin):
 
     def fullname(self): return 'QR scans'
@@ -40,24 +40,19 @@ class Plugin(BasePlugin):
         except zbar.SystemError:
             # Cannot open video device
             pass
-            #return False
 
         return True
 
     def init(self):
         self.win = self.gui.main_window
-        self.win.raw_transaction_menu.addAction(_("&From QR code"), self.read_raw_qr)
 
     def is_available(self):
         return self._is_available
 
-    def scan_qr_hook(self, func):
-        data = self.scan_qr()
-        if type(data) != str:
-            return
-        func(data)
+    def is_enabled(self):
+        return True
 
-    def scan_qr(self):
+    def scan_qr_hook(self):
         proc = zbar.Processor()
         try:
             proc.init(video_device=self.video_device())
@@ -80,23 +75,6 @@ class Plugin(BasePlugin):
                 return r.data
         
 
-    def read_raw_qr(self):
-        qrcode = self.scan_qr()
-        if not qrcode:
-            return
-        data = qrcode
-
-        # transactions are binary, but qrcode seems to return utf8...
-        z = data.decode('utf8')
-        s = ''
-        for b in z:
-            s += chr(ord(b))
-        data = s.encode('hex')
-        tx = self.win.tx_from_text(data)
-        if not tx:
-            return
-        self.win.show_transaction(tx)
-
     def video_device(self):
         device = self.config.get("video_device", "default")
         if device == 'default':