AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #5833 from SomberNight/201912_qt_blocking_waiting_dialog

Browse Source 
Qt: introduce BlockingWaitingDialog
This commit is contained in:
ThomasV
2019-12-12 17:53:03 +01:00
committed by GitHub
parent 308517d473 1088cf4444
commit 7324817ff3
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qt/confirm_tx_dialog.py
View File

@@ -34,7 +34,7 @@ from electrum.transaction import Transaction, PartialTransaction
from electrum.simple_config import FEERATE_WARNING_HIGH_FEE from electrum.simple_config import FEERATE_WARNING_HIGH_FEE
from electrum.wallet import InternalAddressCorruption from electrum.wallet import InternalAddressCorruption
from .util import WindowModalDialog, ColorScheme, HelpLabel, Buttons, CancelButton from .util import WindowModalDialog, ColorScheme, HelpLabel, Buttons, CancelButton, BlockingWaitingDialog
from .fee_slider import FeeSlider from .fee_slider import FeeSlider
@@ -156,7 +156,7 @@ class ConfirmTxDialog(TxEditor, WindowModalDialog):
self.send_button.clicked.connect(self.on_send) self.send_button.clicked.connect(self.on_send)
self.send_button.setDefault(True) self.send_button.setDefault(True)
vbox.addLayout(Buttons(CancelButton(self), self.send_button)) vbox.addLayout(Buttons(CancelButton(self), self.send_button))
self.update_tx() BlockingWaitingDialog(window, _("Preparing transaction..."), self.update_tx)
self.update() self.update()
self.is_send = False self.is_send = False

24
electrum/gui/qt/util.py
View File

@@ -9,7 +9,7 @@ import os
import webbrowser import webbrowser
from functools import partial, lru_cache from functools import partial, lru_cache
from typing import NamedTuple, Callable, Optional, TYPE_CHECKING, Union, List, Dict from typing import NamedTuple, Callable, Optional, TYPE_CHECKING, Union, List, Dict, Any
from PyQt5.QtGui import (QFont, QColor, QCursor, QPixmap, QStandardItem, from PyQt5.QtGui import (QFont, QColor, QCursor, QPixmap, QStandardItem,
QPalette, QIcon, QFontMetrics) QPalette, QIcon, QFontMetrics)
@@ -280,7 +280,7 @@ class WindowModalDialog(QDialog, MessageBoxMixin):
class WaitingDialog(WindowModalDialog): class WaitingDialog(WindowModalDialog):
'''Shows a please wait dialog whilst running a task. It is not '''Shows a please wait dialog whilst running a task. It is not
necessary to maintain a reference to this dialog.''' necessary to maintain a reference to this dialog.'''
def __init__(self, parent, message, task, on_success=None, on_error=None): def __init__(self, parent: QWidget, message: str, task, on_success=None, on_error=None):
assert parent assert parent
if isinstance(parent, MessageBoxMixin): if isinstance(parent, MessageBoxMixin):
parent = parent.top_level_window() parent = parent.top_level_window()
@@ -305,6 +305,26 @@ class WaitingDialog(WindowModalDialog):
self.message_label.setText(msg) self.message_label.setText(msg)
class BlockingWaitingDialog(WindowModalDialog):
"""Shows a waiting dialog whilst running a task.
Should be called from the GUI thread. The GUI thread will be blocked while
the task is running; the point of the dialog is to provide feedback
to the user regarding what is going on.
"""
def __init__(self, parent: QWidget, message: str, task: Callable[[], Any]):
assert parent
if isinstance(parent, MessageBoxMixin):
parent = parent.top_level_window()
WindowModalDialog.__init__(self, parent, _("Please wait"))
self.message_label = QLabel(message)
vbox = QVBoxLayout(self)
vbox.addWidget(self.message_label)
self.show()
QCoreApplication.processEvents()
task()
self.accept()
def line_dialog(parent, title, label, ok_label, default=None): def line_dialog(parent, title, label, ok_label, default=None):
dialog = WindowModalDialog(parent, title) dialog = WindowModalDialog(parent, title)
dialog.setMinimumWidth(500) dialog.setMinimumWidth(500)