zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

qml: highlight selected invoice, styling Invoices buttons

master
Sander van Grieken 3 years ago
parent
24cc80b724
commit
a45d2ce831
2 changed files with 69 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 117
      electrum/gui/qml/components/Invoices.qml
  2. 9
      electrum/gui/qml/components/controls/InvoiceDelegate.qml

117
electrum/gui/qml/components/Invoices.qml
Unescape View File

@ -9,74 +9,81 @@ import "controls"
Pane { Pane {
id: root id: root
property string selected_key
padding: 0
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0
InfoTextArea { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.bottomMargin: constants.paddingLarge Layout.margins: constants.paddingLarge
visible: !Config.userKnowsPressAndHold
text: qsTr('To access this list from the main screen, press and hold the Send button')
}
Heading { InfoTextArea {
text: qsTr('Saved Invoices') Layout.fillWidth: true
} Layout.bottomMargin: constants.paddingLarge
visible: !Config.userKnowsPressAndHold
text: qsTr('To access this list from the main screen, press and hold the Send button')
}
Frame { Heading {
background: PaneInsetBackground {} text: qsTr('Saved Invoices')
}
verticalPadding: 0 Frame {
horizontalPadding: 0 background: PaneInsetBackground {}
Layout.fillHeight: true
Layout.fillWidth: true
ListView { verticalPadding: 0
id: listview horizontalPadding: 0
anchors.fill: parent Layout.fillHeight: true
clip: true Layout.fillWidth: true
model: DelegateModel { ListView {
id: delegateModel id: listview
model: Daemon.currentWallet.invoiceModel anchors.fill: parent
delegate: InvoiceDelegate { clip: true
onClicked: { currentIndex: -1
var dialog = app.stack.getRoot().openInvoice(model.key) model: DelegateModel {
dialog.invoiceAmountChanged.connect(function () { id: delegateModel
Daemon.currentWallet.invoiceModel.init_model() model: Daemon.currentWallet.invoiceModel
}) delegate: InvoiceDelegate {
selected_key = '' onClicked: {
var dialog = app.stack.getRoot().openInvoice(model.key)
dialog.invoiceAmountChanged.connect(function () {
Daemon.currentWallet.invoiceModel.init_model()
})
listview.currentIndex = -1
}
onPressAndHold: listview.currentIndex = index
} }
onPressAndHold: {
selected_key = model.key
}
} }
}
add: Transition { add: Transition {
NumberAnimation { properties: 'scale'; from: 0.75; to: 1; duration: 500 } NumberAnimation { properties: 'scale'; from: 0.75; to: 1; duration: 500 }
NumberAnimation { properties: 'opacity'; from: 0; to: 1; duration: 500 } NumberAnimation { properties: 'opacity'; from: 0; to: 1; duration: 500 }
} }
addDisplaced: Transition { addDisplaced: Transition {
SpringAnimation { properties: 'y'; duration: 200; spring: 5; damping: 0.5; mass: 2 } SpringAnimation { properties: 'y'; duration: 200; spring: 5; damping: 0.5; mass: 2 }
} }
remove: Transition { remove: Transition {
NumberAnimation { properties: 'scale'; to: 0.75; duration: 300 } NumberAnimation { properties: 'scale'; to: 0.75; duration: 300 }
NumberAnimation { properties: 'opacity'; to: 0; duration: 300 } NumberAnimation { properties: 'opacity'; to: 0; duration: 300 }
} }
removeDisplaced: Transition { removeDisplaced: Transition {
SequentialAnimation { SequentialAnimation {
PauseAnimation { duration: 200 } PauseAnimation { duration: 200 }
SpringAnimation { properties: 'y'; duration: 100; spring: 5; damping: 0.5; mass: 2 } SpringAnimation { properties: 'y'; duration: 100; spring: 5; damping: 0.5; mass: 2 }
}
} }
}
ScrollIndicator.vertical: ScrollIndicator { } ScrollIndicator.vertical: ScrollIndicator { }
}
} }
} }
ButtonContainer { ButtonContainer {
Layout.fillWidth: true Layout.fillWidth: true
FlatButton { FlatButton {
@ -84,10 +91,9 @@ Pane {
Layout.preferredWidth: 1 Layout.preferredWidth: 1
text: qsTr('Delete') text: qsTr('Delete')
icon.source: '../../icons/delete.png' icon.source: '../../icons/delete.png'
visible: selected_key != '' visible: listview.currentIndex >= 0
onClicked: { onClicked: {
Daemon.currentWallet.delete_invoice(selected_key) Daemon.currentWallet.delete_invoice(listview.currentItem.getKey())
selected_key = ''
} }
} }
FlatButton { FlatButton {
@ -95,13 +101,12 @@ Pane {
Layout.preferredWidth: 1 Layout.preferredWidth: 1
text: qsTr('View') text: qsTr('View')
icon.source: '../../icons/tab_receive.png' icon.source: '../../icons/tab_receive.png'
visible: selected_key != '' visible: listview.currentIndex >= 0
onClicked: { onClicked: {
var dialog = app.stack.getRoot().openInvoice(selected_key) var dialog = app.stack.getRoot().openInvoice(listview.currentItem.getKey())
dialog.invoiceAmountChanged.connect(function () { dialog.invoiceAmountChanged.connect(function () {
Daemon.currentWallet.invoiceModel.init_model() Daemon.currentWallet.invoiceModel.init_model()
}) })
selected_key = ''
} }
} }
} }

9
electrum/gui/qml/components/controls/InvoiceDelegate.qml
Unescape View File

@ -5,11 +5,17 @@ import QtQuick.Controls.Material 2.0
ItemDelegate { ItemDelegate {
id: root id: root
height: item.height height: item.height
width: ListView.view.width width: ListView.view.width
font.pixelSize: constants.fontSizeSmall // set default font size for child controls font.pixelSize: constants.fontSizeSmall // set default font size for child controls
highlighted: ListView.isCurrentItem
function getKey() {
return model.key
}
GridLayout { GridLayout {
id: item id: item
@ -130,6 +136,7 @@ ItemDelegate {
Layout.preferredHeight: constants.paddingTiny Layout.preferredHeight: constants.paddingTiny
color: 'transparent' color: 'transparent'
} }
} }
Connections { Connections {

Write Preview
Loading…
Cancel
Save