X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=gui%2Fqt%2Fqrtextedit.py;h=d6b20f3baf8345afd24a105fe2c884ec3b741eac;hb=81d1e67253c8ca581e821a6cd9e5ee1502fffd08;hp=4d6a67e67a1af8fc2a13fe552e1d4cf6bf7f53a8;hpb=e2d03f1cc9c2a412a5336051a9aa2d1872e81f13;p=electrum-nvc.git diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py index 4d6a67e..d6b20f3 100644 --- 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)