AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: fix name clash QML vs registered QObjects NewWalletWizard and ServerConnectWizard

Browse Source
This commit is contained in:
Sander van Grieken
2023-02-16 13:22:24 +01:00
parent 46ed94eb3a
commit fa45e1b7ba
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/controls/InfoTextArea.qml
View File

@@ -26,6 +26,8 @@ TextHighlightPane {
RowLayout {
width: parent.width
spacing: constants.paddingLarge
Image {
source: iconStyle == InfoTextArea.IconStyle.Info
? "../../../icons/info.png"

4
electrum/gui/qml/qeapp.py
View File

@@ -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')

1
electrum/gui/qml/qetxfinalizer.py
View File

@@ -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)