AaronFiore/electrum
1
0
Fork 0
Code Activity

receive tab: disable widgets if request has expired, instead of applying red stylesheet

Browse Source
This commit is contained in:
ThomasV
2023-03-19 11:13:45 +01:00
parent 4243b250b1
commit 8b0a6940bc
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/qt/qrcodewidget.py
View File

@@ -60,8 +60,9 @@ class QRCodeWidget(QWidget):
return return
black = QColor(0, 0, 0, 255) black = QColor(0, 0, 0, 255)
grey = QColor(196, 196, 196, 255)
white = QColor(255, 255, 255, 255) white = QColor(255, 255, 255, 255)
black_pen = QPen(black) black_pen = QPen(black) if self.isEnabled() else QPen(grey)
black_pen.setJoinStyle(Qt.MiterJoin) black_pen.setJoinStyle(Qt.MiterJoin)
if not self.qr: if not self.qr:
@@ -95,13 +96,14 @@ class QRCodeWidget(QWidget):
qp.setPen(white) qp.setPen(white)
qp.drawRect(0, 0, framesize, framesize) qp.drawRect(0, 0, framesize, framesize)
# Draw qr code # Draw qr code
qp.setBrush(black) qp.setBrush(black if self.isEnabled() else grey)
qp.setPen(black_pen) qp.setPen(black_pen)
for r in range(k): for r in range(k):
for c in range(k): for c in range(k):
if matrix[r][c]: if matrix[r][c]:
qp.drawRect(int(left+c*boxsize), int(top+r*boxsize), qp.drawRect(
boxsize - 1, boxsize - 1) int(left+c*boxsize), int(top+r*boxsize),
boxsize - 1, boxsize - 1)
qp.end() qp.end()
def grab(self) -> QtGui.QPixmap: def grab(self) -> QtGui.QPixmap:

17
electrum/gui/qt/receive_tab.py
View File

@@ -281,9 +281,13 @@ class ReceiveTab(QWidget, MessageBoxMixin, Logger):
self.receive_lightning_e.setText(lnaddr) # TODO maybe prepend "lightning:" ?? self.receive_lightning_e.setText(lnaddr) # TODO maybe prepend "lightning:" ??
self.receive_lightning_help_text.setText(ln_help) self.receive_lightning_help_text.setText(ln_help)
self.receive_lightning_qr.setData(lnaddr.upper()) self.receive_lightning_qr.setData(lnaddr.upper())
self.update_textedit_warning(text_e=self.receive_address_e, warning_text=address_help) def update_warnings(text_e, qr_e, warning_text):
self.update_textedit_warning(text_e=self.receive_URI_e, warning_text=URI_help) for w in [text_e, qr_e]:
self.update_textedit_warning(text_e=self.receive_lightning_e, warning_text=ln_help) w.setEnabled(bool(text_e.toPlainText()) and not warning_text)
w.setToolTip(warning_text)
update_warnings(self.receive_address_e, self.receive_address_qr, address_help)
update_warnings(self.receive_URI_e, self.receive_URI_qr, URI_help)
update_warnings(self.receive_lightning_e, self.receive_lightning_qr, ln_help)
# macOS hack (similar to #4777) # macOS hack (similar to #4777)
self.receive_lightning_e.repaint() self.receive_lightning_e.repaint()
self.receive_URI_e.repaint() self.receive_URI_e.repaint()
@@ -374,13 +378,6 @@ class ReceiveTab(QWidget, MessageBoxMixin, Logger):
self.receive_amount_e.setAmount(None) self.receive_amount_e.setAmount(None)
self.request_list.clearSelection() self.request_list.clearSelection()
def update_textedit_warning(self, *, text_e: ButtonsTextEdit, warning_text: Optional[str]):
if bool(text_e.toPlainText()) and warning_text:
text_e.setStyleSheet(ColorScheme.RED.as_stylesheet(True))
text_e.setToolTip(warning_text)
else:
text_e.setStyleSheet("")
text_e.setToolTip('')
class ReceiveTabWidget(QWidget): class ReceiveTabWidget(QWidget):