electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit c0fe5962ad32ab43d75b9cee124b860c0acbdf24
parent 769b4002cd0c7e03ca9f490481e7e6d64a323a7d
Author: ThomasV <thomasv@gitorious>
Date:   Tue,  8 Jul 2014 17:00:52 +0200

use QPlainTextEdit instead of QTextEdit

Diffstat:
Mgui/qt/paytoedit.py | 14+++++++-------
Mgui/qt/qrtextedit.py | 6+++---
2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gui/qt/paytoedit.py b/gui/qt/paytoedit.py @@ -28,7 +28,7 @@ RE_ADDRESS = '[1-9A-HJ-NP-Za-km-z]{26,}' RE_ALIAS = '(.*?)\s*\<([1-9A-HJ-NP-Za-km-z]{26,})\>' frozen_style = "QWidget { background-color:none; border:none;}" -normal_style = "QTextEdit { }" +normal_style = "QPlainTextEdit { }" class PayToEdit(QRTextEdit): @@ -39,8 +39,6 @@ class PayToEdit(QRTextEdit): self.document().contentsChanged.connect(self.update_size) self.heightMin = 0 self.heightMax = 150 - self.setMinimumHeight(27) - self.setMaximumHeight(27) self.c = None self.textChanged.connect(self.check_text) self.outputs = [] @@ -161,9 +159,11 @@ class PayToEdit(QRTextEdit): def update_size(self): docHeight = self.document().size().height() - if self.heightMin <= docHeight <= self.heightMax: - self.setMinimumHeight(docHeight + 2) - self.setMaximumHeight(docHeight + 2) + h = docHeight*17 + 11 + if self.heightMin <= h <= self.heightMax: + self.setMinimumHeight(h) + self.setMaximumHeight(h) + self.verticalScrollBar().hide() def setCompleter(self, completer): @@ -207,7 +207,7 @@ class PayToEdit(QRTextEdit): e.ignore() return - QTextEdit.keyPressEvent(self, e) + QPlainTextEdit.keyPressEvent(self, e) ctrlOrShift = e.modifiers() and (Qt.ControlModifier or Qt.ShiftModifier) if self.c is None or (ctrlOrShift and e.text().isEmpty()): diff --git 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,11 @@ 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.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(),