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

qml: use highlight pane for QR codes, refactor ReceiveDialog invoice select UI.

master
Sander van Grieken 2 years ago
parent
86a45c668c
commit
3793a6b6b6
5 changed files with 147 additions and 116 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. 21
      electrum/gui/qml/components/ExportTxDialog.qml
  2. 46
      electrum/gui/qml/components/GenericShareDialog.qml
  3. 190
      electrum/gui/qml/components/ReceiveDialog.qml
  4. 4
      electrum/gui/qml/components/controls/ButtonContainer.qml
  5. 2
      electrum/gui/qml/components/controls/FlatButton.qml

21
electrum/gui/qml/components/ExportTxDialog.qml
Unescape View File

@ -38,15 +38,20 @@ ElDialog {
width: parent.width width: parent.width
spacing: constants.paddingMedium spacing: constants.paddingMedium
Item { TextHighlightPane {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: qr.height Layout.leftMargin: constants.paddingMedium
Layout.topMargin: constants.paddingSmall Layout.rightMargin: constants.paddingMedium
Layout.bottomMargin: constants.paddingSmall padding: constants.paddingMedium
QRImage { ColumnLayout {
id: qr width: parent.width
qrdata: dialog.text_qr QRImage {
anchors.centerIn: parent id: qr
qrdata: dialog.text_qr
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingMedium
Layout.bottomMargin: constants.paddingMedium
}
} }
} }

46
electrum/gui/qml/components/GenericShareDialog.qml
Unescape View File

@ -42,28 +42,38 @@ ElDialog {
width: parent.width width: parent.width
spacing: constants.paddingMedium spacing: constants.paddingMedium
QRImage {
id: qr
render: dialog.enter ? false : true
qrdata: dialog.text_qr ? dialog.text_qr : dialog.text
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingSmall
Layout.bottomMargin: constants.paddingSmall
}
TextHighlightPane { TextHighlightPane {
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.leftMargin: constants.paddingMedium Layout.leftMargin: constants.paddingMedium
Layout.rightMargin: constants.paddingMedium Layout.rightMargin: constants.paddingMedium
Layout.fillWidth: true
visible: dialog.text ColumnLayout {
Label {
width: parent.width width: parent.width
text: dialog.text
wrapMode: Text.Wrap QRImage {
font.pixelSize: constants.fontSizeLarge id: qr
font.family: FixedFont render: dialog.enter ? false : true
maximumLineCount: 4 qrdata: dialog.text_qr ? dialog.text_qr : dialog.text
elide: Text.ElideRight Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingMedium
Layout.bottomMargin: constants.paddingMedium
}
TextHighlightPane {
Layout.fillWidth: true
visible: dialog.text
Label {
width: parent.width
text: dialog.text
wrapMode: Text.Wrap
font.pixelSize: constants.fontSizeLarge
font.family: FixedFont
maximumLineCount: 4
elide: Text.ElideRight
}
}
} }
} }

190
electrum/gui/qml/components/ReceiveDialog.qml
Unescape View File

@ -52,112 +52,124 @@ ElDialog {
State { State {
name: 'bolt11' name: 'bolt11'
PropertyChanges { target: qrloader; sourceComponent: qri_bolt11 } PropertyChanges { target: qrloader; sourceComponent: qri_bolt11 }
PropertyChanges { target: bolt11label; color: Material.accentColor; font.underline: true } // PropertyChanges { target: bolt11label; color: Material.accentColor; font.underline: true }
// PropertyChanges { target: bolt11Button; checked: true }
}, },
State { State {
name: 'bip21uri' name: 'bip21uri'
PropertyChanges { target: qrloader; sourceComponent: qri_bip21uri } PropertyChanges { target: qrloader; sourceComponent: qri_bip21uri }
PropertyChanges { target: bip21label; color: Material.accentColor; font.underline: true } // PropertyChanges { target: bip21label; color: Material.accentColor; font.underline: true }
// PropertyChanges { target: bip21Button; checked: true }
}, },
State { State {
name: 'address' name: 'address'
PropertyChanges { target: qrloader; sourceComponent: qri_address } PropertyChanges { target: qrloader; sourceComponent: qri_address }
PropertyChanges { target: addresslabel; color: Material.accentColor; font.underline: true } // PropertyChanges { target: addresslabel; color: Material.accentColor; font.underline: true }
// PropertyChanges { target: addressButton; checked: true }
} }
] ]
Rectangle { TextHighlightPane {
id: qrbg
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingSmall Layout.fillWidth: true
Layout.bottomMargin: constants.paddingSmall
ColumnLayout {
Layout.preferredWidth: dialog.width * 7/8 width: parent.width
Layout.preferredHeight: dialog.width * 7/8 Rectangle {
id: qrbg
color: 'white' Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingSmall
Loader { Layout.bottomMargin: constants.paddingSmall
id: qrloader
anchors.centerIn: parent Layout.preferredWidth: dialog.width * 7/8
Component { Layout.preferredHeight: dialog.width * 7/8
id: qri_bolt11
QRImage { color: 'white'
qrdata: _bolt11
render: _render_qr Loader {
enableToggleText: true id: qrloader
} anchors.centerIn: parent
} Component {
Component { id: qri_bolt11
id: qri_bip21uri QRImage {
QRImage { qrdata: _bolt11
qrdata: _bip21uri render: _render_qr
render: _render_qr enableToggleText: true
enableToggleText: true }
} }
} Component {
Component { id: qri_bip21uri
id: qri_address QRImage {
QRImage { qrdata: _bip21uri
qrdata: _address render: _render_qr
render: _render_qr enableToggleText: true
enableToggleText: true }
}
Component {
id: qri_address
QRImage {
qrdata: _address
render: _render_qr
enableToggleText: true
}
}
} }
} }
}
}
RowLayout { ButtonContainer {
Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true
spacing: constants.paddingLarge showSeparator: false
Label { Component {
id: bolt11label id: _ind
text: qsTr('Lightning') Rectangle {
color: _bolt11 ? Material.foreground : constants.mutedForeground color: Material.dialogColor
MouseArea { opacity: parent.checked ? 1 : 0
anchors.fill: parent radius: 5
enabled: _bolt11 width: parent.width
onClicked: { height: parent.height
rootLayout.state = 'bolt11'
Config.preferredRequestType = 'bolt11' Behavior on opacity {
NumberAnimation { duration: 200 }
}
}
} }
} TabButton {
} id: bolt11Button
Rectangle { Layout.fillWidth: true
Layout.preferredWidth: constants.paddingXXSmall Layout.preferredWidth: 1
Layout.preferredHeight: constants.paddingXXSmall text: qsTr('Lightning')
radius: constants.paddingXXSmall / 2 enabled: _bolt11
color: Material.accentColor checked: rootLayout.state == 'bolt11'
} indicator: _ind.createObject()
Label { onClicked: {
id: bip21label rootLayout.state = 'bolt11'
text: qsTr('URI') Config.preferredRequestType = 'bolt11'
color: _bip21uri ? Material.foreground : constants.mutedForeground }
MouseArea {
anchors.fill: parent
enabled: _bip21uri
onClicked: {
rootLayout.state = 'bip21uri'
Config.preferredRequestType = 'bip21uri'
} }
} TabButton {
} id: bip21Button
Rectangle { Layout.fillWidth: true
Layout.preferredWidth: constants.paddingXXSmall Layout.preferredWidth: 1
Layout.preferredHeight: constants.paddingXXSmall text: qsTr('URI')
radius: constants.paddingXXSmall / 2 enabled: _bip21uri
color: Material.accentColor checked: rootLayout.state == 'bip21uri'
} indicator: _ind.createObject()
Label { onClicked: {
id: addresslabel rootLayout.state = 'bip21uri'
text: qsTr('Address') Config.preferredRequestType = 'bip21uri'
color: _address ? Material.foreground : constants.mutedForeground }
MouseArea { }
anchors.fill: parent TabButton {
enabled: _address id: addressButton
onClicked: { Layout.fillWidth: true
rootLayout.state = 'address' Layout.preferredWidth: 1
Config.preferredRequestType = 'address' text: qsTr('Address')
checked: rootLayout.state == 'address'
indicator: _ind.createObject()
onClicked: {
rootLayout.state = 'address'
Config.preferredRequestType = 'address'
}
} }
} }
} }

4
electrum/gui/qml/components/controls/ButtonContainer.qml
Unescape View File

@ -6,6 +6,8 @@ import QtQuick.Controls.Material
Container { Container {
id: root id: root
property bool showSeparator: true
property Item _layout property Item _layout
function fillContentItem() { function fillContentItem() {
@ -48,7 +50,7 @@ Container {
required property int pheight required property int pheight
required property int master_idx required property int master_idx
Layout.fillWidth: false Layout.fillWidth: false
Layout.preferredWidth: 2 Layout.preferredWidth: showSeparator ? 2 : 0
Layout.preferredHeight: pheight Layout.preferredHeight: pheight
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
color: constants.darkerBackground color: constants.darkerBackground

2
electrum/gui/qml/components/controls/FlatButton.qml
Unescape View File

@ -11,6 +11,8 @@ TabButton {
property bool textUnderIcon: true property bool textUnderIcon: true
font.pixelSize: constants.fontSizeSmall font.pixelSize: constants.fontSizeSmall
icon.width: constants.iconSizeMedium
icon.height: constants.iconSizeMedium
display: textUnderIcon ? IconLabel.TextUnderIcon : IconLabel.TextBesideIcon display: textUnderIcon ? IconLabel.TextUnderIcon : IconLabel.TextBesideIcon
contentItem: IconLabel { contentItem: IconLabel {

Write Preview
Loading…
Cancel
Save