AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: background flatbuttons within pages

Browse Source
This commit is contained in:
Sander van Grieken
2023-03-03 15:50:13 +01:00
parent b16fb5088b
commit ba888fc9fa
3 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/gui/qml/components/ChannelDetails.qml
View File

@@ -108,12 +108,14 @@ Pane {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 Layout.preferredHeight: 1
} }
FlatButton { Pane {
Layout.minimumWidth: implicitWidth background: Rectangle { color: Material.dialogColor }
// icon.source: '../../icons/warning.png' padding: 0
// icon.color: 'transparent' FlatButton {
text: channeldetails.frozenForSending ? qsTr('Unfreeze') : qsTr('Freeze') Layout.minimumWidth: implicitWidth
onClicked: channeldetails.freezeForSending() text: channeldetails.frozenForSending ? qsTr('Unfreeze') : qsTr('Freeze')
onClicked: channeldetails.freezeForSending()
}
} }
} }
@@ -143,12 +145,14 @@ Pane {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 Layout.preferredHeight: 1
} }
FlatButton { Pane {
Layout.minimumWidth: implicitWidth background: Rectangle { color: Material.dialogColor }
// icon.source: '../../icons/warning.png' padding: 0
// icon.color: 'transparent' FlatButton {
text: channeldetails.frozenForReceiving ? qsTr('Unfreeze') : qsTr('Freeze') Layout.minimumWidth: implicitWidth
onClicked: channeldetails.freezeForReceiving() text: channeldetails.frozenForReceiving ? qsTr('Unfreeze') : qsTr('Freeze')
onClicked: channeldetails.freezeForReceiving()
}
} }
} }

25
electrum/gui/qml/components/Preferences.qml
View File

@@ -217,16 +217,23 @@ Pane {
} }
} }
Button { Pane {
text: qsTr('Modify') background: Rectangle { color: Material.dialogColor }
padding: 0
visible: Config.pinCode != '' visible: Config.pinCode != ''
onClicked: { FlatButton {
var dialog = pinSetup.createObject(preferences, {mode: 'change', pincode: Config.pinCode}) text: qsTr('Modify')
dialog.accepted.connect(function() { onClicked: {
Config.pinCode = dialog.pincode var dialog = pinSetup.createObject(preferences, {
dialog.close() mode: 'change',
}) pincode: Config.pinCode
dialog.open() })
dialog.accepted.connect(function() {
Config.pinCode = dialog.pincode
dialog.close()
})
dialog.open()
}
} }
} }

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

@@ -136,30 +136,38 @@ Pane {
} }
ColumnLayout { ColumnLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
FlatButton { Pane {
id: feebumpButton background: Rectangle { color: Material.dialogColor }
padding: 0
visible: txdetails.canBump || txdetails.canCpfp visible: txdetails.canBump || txdetails.canCpfp
textUnderIcon: false FlatButton {
icon.source: '../../icons/add.png' id: feebumpButton
text: qsTr('Bump fee') textUnderIcon: false
onClicked: { icon.source: '../../icons/add.png'
if (txdetails.canBump) { text: qsTr('Bump fee')
var dialog = rbfBumpFeeDialog.createObject(root, { txid: root.txid }) onClicked: {
} else { if (txdetails.canBump) {
var dialog = cpfpBumpFeeDialog.createObject(root, { txid: root.txid }) var dialog = rbfBumpFeeDialog.createObject(root, { txid: root.txid })
} else {
var dialog = cpfpBumpFeeDialog.createObject(root, { txid: root.txid })
}
dialog.open()
} }
dialog.open()
} }
} }
FlatButton { Pane {
id: cancelButton background: Rectangle { color: Material.dialogColor }
padding: 0
visible: txdetails.canCancel visible: txdetails.canCancel
textUnderIcon: false FlatButton {
icon.source: '../../icons/closebutton.png' id: cancelButton
text: qsTr('Cancel Tx') textUnderIcon: false
onClicked: { icon.source: '../../icons/closebutton.png'
var dialog = rbfCancelDialog.createObject(root, { txid: root.txid }) text: qsTr('Cancel Tx')
dialog.open() onClicked: {
var dialog = rbfCancelDialog.createObject(root, { txid: root.txid })
dialog.open()
}
} }
} }
} }