AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: rename QETxFeeBumper -> QETxRbfFeeBumper, BumpFeeDialog.qml -> RbfBumpFeeDialog.qml

Browse Source
This commit is contained in:
Sander van Grieken
2022-11-23 10:21:07 +01:00
parent 7397a0c2b4
commit 8fbfe87e78
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
electrum/gui/qml/components/BumpFeeDialog.qml → electrum/gui/qml/components/RbfBumpFeeDialog.qml
View File

@@ -11,7 +11,7 @@ ElDialog {
id: dialog
required property string txid
required property QtObject txfeebumper
required property QtObject rbffeebumper
signal txaccepted
@@ -55,7 +55,7 @@ ElDialog {
RowLayout {
Label {
id: oldfee
text: Config.formatSats(txfeebumper.oldfee)
text: Config.formatSats(rbffeebumper.oldfee)
}
Label {
@@ -72,7 +72,7 @@ ElDialog {
RowLayout {
Label {
id: oldfeeRate
text: txfeebumper.oldfeeRate
text: rbffeebumper.oldfeeRate
}
Label {
@@ -122,11 +122,11 @@ ElDialog {
RowLayout {
Label {
id: fee
text: txfeebumper.valid ? Config.formatSats(txfeebumper.fee) : ''
text: rbffeebumper.valid ? Config.formatSats(rbffeebumper.fee) : ''
}
Label {
visible: txfeebumper.valid
visible: rbffeebumper.valid
text: Config.baseUnit
color: Material.accentColor
}
@@ -140,11 +140,11 @@ ElDialog {
RowLayout {
Label {
id: feeRate
text: txfeebumper.valid ? txfeebumper.feeRate : ''
text: rbffeebumper.valid ? rbffeebumper.feeRate : ''
}
Label {
visible: txfeebumper.valid
visible: rbffeebumper.valid
text: 'sat/vB'
color: Material.accentColor
}
@@ -157,7 +157,7 @@ ElDialog {
Label {
id: targetdesc
text: txfeebumper.target
text: rbffeebumper.target
}
Slider {
@@ -166,35 +166,35 @@ ElDialog {
snapMode: Slider.SnapOnRelease
stepSize: 1
from: 0
to: txfeebumper.sliderSteps
to: rbffeebumper.sliderSteps
onValueChanged: {
if (activeFocus)
txfeebumper.sliderPos = value
rbffeebumper.sliderPos = value
}
Component.onCompleted: {
value = txfeebumper.sliderPos
value = rbffeebumper.sliderPos
}
Connections {
target: txfeebumper
target: rbffeebumper
function onSliderPosChanged() {
feeslider.value = txfeebumper.sliderPos
feeslider.value = rbffeebumper.sliderPos
}
}
}
FeeMethodComboBox {
id: target
feeslider: txfeebumper
feeslider: rbffeebumper
}
CheckBox {
id: final_cb
text: qsTr('Replace-by-Fee')
Layout.columnSpan: 2
checked: txfeebumper.rbf
checked: rbffeebumper.rbf
onCheckedChanged: {
if (activeFocus)
txfeebumper.rbf = checked
rbffeebumper.rbf = checked
}
}
@@ -202,20 +202,20 @@ ElDialog {
Layout.columnSpan: 2
Layout.preferredWidth: parent.width * 3/4
Layout.alignment: Qt.AlignHCenter
visible: txfeebumper.warning != ''
text: txfeebumper.warning
visible: rbffeebumper.warning != ''
text: rbffeebumper.warning
iconStyle: InfoTextArea.IconStyle.Warn
}
Label {
visible: txfeebumper.valid
visible: rbffeebumper.valid
text: qsTr('Outputs')
Layout.columnSpan: 2
color: Material.accentColor
}
Repeater {
model: txfeebumper.valid ? txfeebumper.outputs : []
model: rbffeebumper.valid ? rbffeebumper.outputs : []
delegate: TextHighlightPane {
Layout.columnSpan: 2
Layout.fillWidth: true
@@ -253,7 +253,7 @@ ElDialog {
Layout.fillWidth: true
text: qsTr('Ok')
icon.source: '../../icons/confirmed.png'
enabled: txfeebumper.valid
enabled: rbffeebumper.valid
onClicked: {
txaccepted()
dialog.close()

12
electrum/gui/qml/components/TxDetails.qml
View File

@@ -395,7 +395,7 @@ Pane {
text: qsTr('Bump fee')
visible: txdetails.canBump
onClicked: {
var dialog = bumpFeeDialog.createObject(root, { txid: root.txid })
var dialog = rbfBumpFeeDialog.createObject(root, { txid: root.txid })
dialog.open()
}
}
@@ -445,17 +445,17 @@ Pane {
}
Component {
id: bumpFeeDialog
BumpFeeDialog {
id: rbfBumpFeeDialog
RbfBumpFeeDialog {
id: dialog
txfeebumper: TxFeeBumper {
id: txfeebumper
rbffeebumper: TxRbfFeeBumper {
id: rbffeebumper
wallet: Daemon.currentWallet
txid: dialog.txid
}
onTxaccepted: {
root.rawtx = txfeebumper.getNewTx()
root.rawtx = rbffeebumper.getNewTx()
}
onClosed: destroy()
}

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

@@ -19,7 +19,7 @@ from .qeqr import QEQRParser, QEQRImageProvider, QEQRImageProviderHelper
from .qewalletdb import QEWalletDB
from .qebitcoin import QEBitcoin
from .qefx import QEFX
from .qetxfinalizer import QETxFinalizer, QETxFeeBumper, QETxCanceller
from .qetxfinalizer import QETxFinalizer, QETxRbfFeeBumper, QETxCanceller
from .qeinvoice import QEInvoice, QEInvoiceParser, QEUserEnteredPayment
from .qerequestdetails import QERequestDetails
from .qetypes import QEAmount
@@ -216,7 +216,7 @@ class ElectrumQmlApplication(QGuiApplication):
qmlRegisterType(QEChannelDetails, 'org.electrum', 1, 0, 'ChannelDetails')
qmlRegisterType(QESwapHelper, 'org.electrum', 1, 0, 'SwapHelper')
qmlRegisterType(QERequestDetails, 'org.electrum', 1, 0, 'RequestDetails')
qmlRegisterType(QETxFeeBumper, 'org.electrum', 1, 0, 'TxFeeBumper')
qmlRegisterType(QETxRbfFeeBumper, 'org.electrum', 1, 0, 'TxRbfFeeBumper')
qmlRegisterType(QETxCanceller, 'org.electrum', 1, 0, 'TxCanceller')
qmlRegisterUncreatableType(QEAmount, 'org.electrum', 1, 0, 'Amount', 'Amount can only be used as property')

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

@@ -369,7 +369,7 @@ class QETxFinalizer(TxFeeSlider):
return str(self._tx)
class QETxFeeBumper(TxFeeSlider):
class QETxRbfFeeBumper(TxFeeSlider):
_logger = get_logger(__name__)
_oldfee = QEAmount()