Browse Source

Qt: remove direct usage of QMessageBox part1

add_frost_channel_encryption
zebra-lucky 2 months ago
parent
commit
4799fffd41
  1. 18
      scripts/joinmarket-qt.py
  2. 5
      scripts/qtsupport.py

18
scripts/joinmarket-qt.py

@ -165,7 +165,10 @@ class HelpLabel(QLabel):
self.setStyleSheet(BLUE_FG) self.setStyleSheet(BLUE_FG)
def mouseReleaseEvent(self, x): def mouseReleaseEvent(self, x):
QMessageBox.information(mainWindow, self.wtitle, self.help_text) asyncio.ensure_future(
JMQtMessageBox(
mainWindow, self.help_text,
mbtype='info', title=self.wtitle))
def enterEvent(self, event): def enterEvent(self, event):
self.font.setUnderline(True) self.font.setUnderline(True)
@ -2361,19 +2364,18 @@ class JMMainWindow(QMainWindow):
return self.walletname return self.walletname
def displayWords(self, words: str, mnemonic_extension: str) -> None: def displayWords(self, words: str, mnemonic_extension: str) -> None:
mb = QMessageBox(self) seed_recovery_warning = "<br/>".join([
seed_recovery_warning = [
"WRITE DOWN THIS WALLET RECOVERY SEED.", "WRITE DOWN THIS WALLET RECOVERY SEED.",
"If you fail to do this, your funds are", "If you fail to do this, your funds are",
"at risk. Do NOT ignore this step!!!" "at risk. Do NOT ignore this step!!!"
] ])
mb.setText("<br/>".join(seed_recovery_warning))
text = "<strong>" + words + "</strong>" text = "<strong>" + words + "</strong>"
if mnemonic_extension: if mnemonic_extension:
text += "<br/><br/>Seed extension: <strong>" + mnemonic_extension.decode('utf-8') + "</strong>" text += "<br/><br/>Seed extension: <strong>" + mnemonic_extension.decode('utf-8') + "</strong>"
mb.setInformativeText(text) asyncio.ensure_future(
mb.setStandardButtons(QMessageBox.Ok) JMQtMessageBox(
ret = mb.exec_() self, seed_recovery_warning, mbtype='info',
title='Show wallet seed phrase', informative_text=text))
def promptUseMnemonicExtension(self) -> bool: def promptUseMnemonicExtension(self) -> bool:
msg = "Would you like to use a two-factor mnemonic recovery phrase?\nIf you don\'t know what this is press No." msg = "Would you like to use a two-factor mnemonic recovery phrase?\nIf you don\'t know what this is press No."

5
scripts/qtsupport.py

@ -150,7 +150,8 @@ donation_more_message = '\n'.join(
async def JMQtMessageBox(parent, msg, mbtype='info', title='', async def JMQtMessageBox(parent, msg, mbtype='info', title='',
detailed_text=None, finished_cb=None): detailed_text=None, informative_text=None,
finished_cb=None):
title = "JoinmarketQt - " + title title = "JoinmarketQt - " + title
result_fut = asyncio.get_event_loop().create_future() result_fut = asyncio.get_event_loop().create_future()
@ -199,6 +200,8 @@ async def JMQtMessageBox(parent, msg, mbtype='info', title='',
mb.setText(msg) mb.setText(msg)
if detailed_text: if detailed_text:
mb.setDetailedText(detailed_text) mb.setDetailedText(detailed_text)
if informative_text:
mb.setInformativeText(informative_text)
if mbtype == 'question': if mbtype == 'question':
mb.setStandardButtons(QMessageBox.Yes | QMessageBox.No) mb.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
mb.setDefaultButton(QMessageBox.No) mb.setDefaultButton(QMessageBox.No)

Loading…
Cancel
Save