X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=gui%2Fqt%2Fqrtextedit.py;h=b4902645e0279ad38ecfd3e40cc2384786d4f46d;hb=c0fe5962ad32ab43d75b9cee124b860c0acbdf24;hp=742b97e013df8a6a79f2e3acc4d6c41fee50f2dd;hpb=d2cad7bbbbfa1b6b175ec39de36a76453192137d;p=electrum-nvc.git

diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py
index 742b97e..b490264 100644
--- a/gui/qt/qrtextedit.py
+++ b/gui/qt/qrtextedit.py
@@ -2,23 +2,20 @@ from electrum.i18n import _
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-class QRTextEdit(QTextEdit):
+class QRTextEdit(QPlainTextEdit):
 
-    def __init__(self):
-        QTextEdit.__init__(self)
+    def __init__(self, text=None):
+        QTextEdit.__init__(self, text)
         self.button = QToolButton(self)
         self.button.setIcon(QIcon(":icons/qrcode.png"))
         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())
-        #frameWidth = self.style().pixelMetric(QStyle.PM_DefaultFrameWidth)
-        #self.setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(self.button.sizeHint().width() + frameWidth + 1))
-        #msz = self.minimumSizeHint()
-        #self.setMinimumSize(max(msz.width(), self.button.sizeHint().height() + frameWidth * 2 + 2),
-        #                    max(msz.height(), self.button.sizeHint().height() + frameWidth * 2 + 2))
+        self.setText = self.setPlainText
+        self.scan_f = self.setText
 
     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(),
@@ -39,5 +36,5 @@ class QRTextEdit(QTextEdit):
 
     def qr_input(self):
         from electrum.plugins import run_hook
-        run_hook('scan_qr_hook', self.setText)
-
+        if not run_hook('scan_qr_hook', self.scan_f):
+            QMessageBox.warning(self, _('Error'), _('QR Scanner not enabled'), _('OK'))