Browse Source

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

master
Sander van Grieken 3 years ago
parent
commit
fa45e1b7ba
  1. 2
      electrum/gui/qml/components/controls/InfoTextArea.qml
  2. 4
      electrum/gui/qml/qeapp.py
  3. 1
      electrum/gui/qml/qetxfinalizer.py

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

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

4
electrum/gui/qml/qeapp.py

@ -298,8 +298,8 @@ class ElectrumQmlApplication(QGuiApplication):
qmlRegisterType(QETxCanceller, 'org.electrum', 1, 0, 'TxCanceller') qmlRegisterType(QETxCanceller, 'org.electrum', 1, 0, 'TxCanceller')
qmlRegisterUncreatableType(QEAmount, 'org.electrum', 1, 0, 'Amount', 'Amount can only be used as property') 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(QENewWalletWizard, 'org.electrum', 1, 0, 'QNewWalletWizard', 'QNewWalletWizard can only be used as property')
qmlRegisterUncreatableType(QEServerConnectWizard, 'org.electrum', 1, 0, 'ServerConnectWizard', 'ServerConnectWizard 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(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') qmlRegisterUncreatableType(QSortFilterProxyModel, 'org.electrum', 1, 0, 'QSortFilterProxyModel', 'QSortFilterProxyModel can only be used as property')

1
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): if self._wallet.wallet.get_swap_by_funding_tx(self._orig_tx):
self._can_change_bump_method = False self._can_change_bump_method = False
self.canChangeBumpMethodChanged.emit()
if not isinstance(self._orig_tx, PartialTransaction): if not isinstance(self._orig_tx, PartialTransaction):
self._orig_tx = PartialTransaction.from_tx(self._orig_tx) self._orig_tx = PartialTransaction.from_tx(self._orig_tx)

Loading…
Cancel
Save