Browse Source

UI fixes

patch-4
Sander van Grieken 3 years ago
parent
commit
fad2d879ef
  1. 2
      electrum/gui/qml/components/Addresses.qml
  2. 2
      electrum/gui/qml/components/QRScan.qml
  3. 2
      electrum/gui/qml/components/Receive.qml
  4. 16
      electrum/gui/qml/components/RequestDialog.qml

2
electrum/gui/qml/components/Addresses.qml

@ -8,6 +8,7 @@ import org.electrum 1.0
Pane { Pane {
id: rootItem id: rootItem
padding: 0 padding: 0
width: parent.width
property string title: Daemon.currentWallet.name + ' - ' + qsTr('Addresses') property string title: Daemon.currentWallet.name + ' - ' + qsTr('Addresses')
ColumnLayout { ColumnLayout {
@ -73,6 +74,7 @@ Pane {
Label { Label {
font.family: FixedFont font.family: FixedFont
text: model.address text: model.address
elide: Text.ElideMiddle
Layout.fillWidth: true Layout.fillWidth: true
} }

2
electrum/gui/qml/components/QRScan.qml

@ -24,12 +24,14 @@ Item {
Rectangle { Rectangle {
width: parent.width width: parent.width
height: (parent.height - parent.width) / 2 height: (parent.height - parent.width) / 2
visible: camera.cameraStatus == Camera.ActiveStatus
anchors.top: parent.top anchors.top: parent.top
color: Qt.rgba(0,0,0,0.5) color: Qt.rgba(0,0,0,0.5)
} }
Rectangle { Rectangle {
width: parent.width width: parent.width
height: (parent.height - parent.width) / 2 height: (parent.height - parent.width) / 2
visible: camera.cameraStatus == Camera.ActiveStatus
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: Qt.rgba(0,0,0,0.5) color: Qt.rgba(0,0,0,0.5)
} }

2
electrum/gui/qml/components/Receive.qml

@ -85,7 +85,7 @@ Pane {
color: Material.accentColor color: Material.accentColor
} }
Item { width: 1; height: 1; Layout.fillWidth: true } Item { visible: Daemon.fx.enabled; width: 1; height: 1; Layout.fillWidth: true }
Label { Label {
text: qsTr('Expires after') text: qsTr('Expires after')

16
electrum/gui/qml/components/RequestDialog.qml

@ -46,18 +46,18 @@ Dialog {
id: rootLayout id: rootLayout
width: parent.width width: parent.width
rowSpacing: constants.paddingMedium rowSpacing: constants.paddingMedium
columns: 3 columns: 4
Rectangle { Rectangle {
height: 1 height: 1
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 3 Layout.columnSpan: 4
color: Material.accentColor color: Material.accentColor
} }
Image { Image {
id: qr id: qr
Layout.columnSpan: 3 Layout.columnSpan: 4
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.topMargin: constants.paddingSmall Layout.topMargin: constants.paddingSmall
Layout.bottomMargin: constants.paddingSmall Layout.bottomMargin: constants.paddingSmall
@ -84,12 +84,12 @@ Dialog {
Rectangle { Rectangle {
height: 1 height: 1
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 3 Layout.columnSpan: 4
color: Material.accentColor color: Material.accentColor
} }
RowLayout { RowLayout {
Layout.columnSpan: 3 Layout.columnSpan: 4
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Button { Button {
icon.source: '../../icons/delete.png' icon.source: '../../icons/delete.png'
@ -117,7 +117,7 @@ Dialog {
} }
Label { Label {
visible: modelItem.message != '' visible: modelItem.message != ''
Layout.columnSpan: 2 Layout.columnSpan: 3
Layout.fillWidth: true Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: modelItem.message text: modelItem.message
@ -137,6 +137,7 @@ Dialog {
Label { Label {
visible: modelItem.amount > 0 visible: modelItem.amount > 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 2
text: Config.baseUnit text: Config.baseUnit
color: Material.accentColor color: Material.accentColor
font.pixelSize: constants.fontSizeLarge font.pixelSize: constants.fontSizeLarge
@ -147,6 +148,7 @@ Dialog {
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 2
font.family: FixedFont font.family: FixedFont
font.pixelSize: constants.fontSizeLarge font.pixelSize: constants.fontSizeLarge
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
@ -163,7 +165,7 @@ Dialog {
text: qsTr('Status') text: qsTr('Status')
} }
Label { Label {
Layout.columnSpan: 2 Layout.columnSpan: 3
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: constants.fontSizeLarge font.pixelSize: constants.fontSizeLarge
text: modelItem.status text: modelItem.status

Loading…
Cancel
Save