From fa45e1b7ba1ea0167021f7fe1926d066ea1c5122 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Thu, 16 Feb 2023 13:22:24 +0100 Subject: [PATCH] qml: fix name clash QML vs registered QObjects NewWalletWizard and ServerConnectWizard --- electrum/gui/qml/components/controls/InfoTextArea.qml | 2 ++ electrum/gui/qml/qeapp.py | 4 ++-- electrum/gui/qml/qetxfinalizer.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qml/components/controls/InfoTextArea.qml b/electrum/gui/qml/components/controls/InfoTextArea.qml index 9acbc90c2..a660a722d 100644 --- a/electrum/gui/qml/components/controls/InfoTextArea.qml +++ b/electrum/gui/qml/components/controls/InfoTextArea.qml @@ -26,6 +26,8 @@ TextHighlightPane { RowLayout { width: parent.width + spacing: constants.paddingLarge + Image { source: iconStyle == InfoTextArea.IconStyle.Info ? "../../../icons/info.png" diff --git a/electrum/gui/qml/qeapp.py b/electrum/gui/qml/qeapp.py index f3ab6dedc..43ddd78db 100644 --- a/electrum/gui/qml/qeapp.py +++ b/electrum/gui/qml/qeapp.py @@ -298,8 +298,8 @@ class ElectrumQmlApplication(QGuiApplication): qmlRegisterType(QETxCanceller, 'org.electrum', 1, 0, 'TxCanceller') qmlRegisterUncreatableType(QEAmount, 'org.electrum', 1, 0, 'Amount', 'Amount can only be used as property') - qmlRegisterUncreatableType(QENewWalletWizard, 'org.electrum', 1, 0, 'NewWalletWizard', 'NewWalletWizard can only be used as property') - qmlRegisterUncreatableType(QEServerConnectWizard, 'org.electrum', 1, 0, 'ServerConnectWizard', 'ServerConnectWizard can only be used as property') + qmlRegisterUncreatableType(QENewWalletWizard, 'org.electrum', 1, 0, 'QNewWalletWizard', 'QNewWalletWizard can only be used as property') + qmlRegisterUncreatableType(QEServerConnectWizard, 'org.electrum', 1, 0, 'QServerConnectWizard', 'QServerConnectWizard can only be used as property') qmlRegisterUncreatableType(QEFilterProxyModel, 'org.electrum', 1, 0, 'FilterProxyModel', 'FilterProxyModel can only be used as property') qmlRegisterUncreatableType(QSortFilterProxyModel, 'org.electrum', 1, 0, 'QSortFilterProxyModel', 'QSortFilterProxyModel can only be used as property') diff --git a/electrum/gui/qml/qetxfinalizer.py b/electrum/gui/qml/qetxfinalizer.py index edd733d05..a7ab66fdf 100644 --- a/electrum/gui/qml/qetxfinalizer.py +++ b/electrum/gui/qml/qetxfinalizer.py @@ -499,6 +499,7 @@ class QETxRbfFeeBumper(TxFeeSlider, TxMonMixin): if self._wallet.wallet.get_swap_by_funding_tx(self._orig_tx): self._can_change_bump_method = False + self.canChangeBumpMethodChanged.emit() if not isinstance(self._orig_tx, PartialTransaction): self._orig_tx = PartialTransaction.from_tx(self._orig_tx)