always enable qr scanner plugin

[electrum-nvc.git] / gui / qt / qrtextedit.py

diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py
index 4d6a67e..d6b20f3 100644 (file)
--- a/gui/qt/qrtextedit.py
+++ b/gui/qt/qrtextedit.py
@@ -2,7 +2,7 @@ from electrum.i18n import _
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-class QRTextEdit(QTextEdit):
+class QRTextEdit(QPlainTextEdit):
 
     def __init__(self, text=None):
         QTextEdit.__init__(self, text)
@@ -11,11 +11,10 @@ class QRTextEdit(QTextEdit):
         self.button.setStyleSheet("QToolButton { border: none; padding: 0px; }")
         self.button.setVisible(True)
         self.button.clicked.connect(lambda: self.qr_show() if self.isReadOnly() else self.qr_input())
-        self.scan_f = self.setText
-
+        self.setText = self.setPlainText
 
     def resizeEvent(self, e):
-        o = QTextEdit.resizeEvent(self, e)
+        o = QPlainTextEdit.resizeEvent(self, e)
         sz = self.button.sizeHint()
         frameWidth = self.style().pixelMetric(QStyle.PM_DefaultFrameWidth)
         self.button.move(self.rect().right() - frameWidth - sz.width(),
@@ -36,5 +35,7 @@ class QRTextEdit(QTextEdit):
 
     def qr_input(self):
         from electrum.plugins import run_hook
-        if not run_hook('scan_qr_hook', self.scan_f):
-            QMessageBox.warning(self, _('Error'), _('QR Scanner not enabled'), _('OK'))
+        data = run_hook('scan_qr_hook')
+        if type(data) != str:
+            return
+        self.setText(data)