AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: move max ln receive to ReceiveDetailsDialog, always show invoice fields on ReceiveDialog

Browse Source
This commit is contained in:
Sander van Grieken
2023-02-24 22:09:44 +01:00
parent adf23f602d
commit d85ee1b639
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
electrum/gui/qml/components/ReceiveDetailsDialog.qml
View File

@@ -41,6 +41,32 @@ ElDialog {
columnSpacing: constants.paddingSmall
columns: 4
TextHighlightPane {
Layout.columnSpan: 4
Layout.fillWidth: true
visible: Daemon.currentWallet.lightningCanReceive
RowLayout {
width: parent.width
spacing: constants.paddingXSmall
Label {
text: qsTr('Max amount over Lightning')
font.pixelSize: constants.fontSizeSmall
color: Material.accentColor
wrapMode: Text.Wrap
}
Image {
Layout.preferredWidth: constants.iconSizeSmall
Layout.preferredHeight: constants.iconSizeSmall
source: '../../icons/lightning.png'
}
FormattedAmount {
amount: Daemon.currentWallet.lightningCanReceive
}
}
}
Label {
text: qsTr('Message')
}

24
electrum/gui/qml/components/ReceiveDialog.qml
View File

@@ -182,25 +182,6 @@ ElDialog {
}
}
RowLayout {
Layout.alignment: Qt.AlignHCenter
visible: Daemon.currentWallet.isLightning
spacing: constants.paddingXSmall
Image {
Layout.preferredWidth: constants.iconSizeSmall
Layout.preferredHeight: constants.iconSizeSmall
source: '../../icons/lightning.png'
}
Label {
text: qsTr('can receive:')
font.pixelSize: constants.fontSizeSmall
color: Material.accentColor
}
FormattedAmount {
amount: Daemon.currentWallet.lightningCanReceive
}
}
Rectangle {
height: 1
Layout.alignment: Qt.AlignHCenter
@@ -221,23 +202,20 @@ ElDialog {
text: request.status_str
}
Label {
visible: request.message
text: qsTr('Message')
color: Material.accentColor
}
Label {
visible: request.message
Layout.fillWidth: true
text: request.message
wrapMode: Text.Wrap
}
Label {
visible: !request.amount.isEmpty
text: qsTr('Amount')
color: Material.accentColor
}
FormattedAmount {
visible: !request.amount.isEmpty
valid: !request.amount.isEmpty
amount: request.amount
}
}