diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml index e6909d573c90276af8780a51c2524a5470ed419f..ecee0b113a12a77d776f558c26f83d3bf0f0b6c1 100755 --- a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml +++ b/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml @@ -127,9 +127,9 @@ Page { Image { id: imageMenu - source: "qrc:/Resources/Icons/home.png" - height: 36 - width: 36 + source: "qrc:/Resources/Icons/exit.png" + height: 32 + width: 32 anchors.horizontalCenter: parent.horizontalCenter } Text @@ -139,12 +139,19 @@ Page { anchors.horizontalCenter: parent.horizontalCenter } } + MouseArea { anchors.fill: parent - onClicked: + onHoveredChanged: { rectangleBorder.color = "#EE5321" } + + onClicked: + { + + Qt.quit() + } } } } diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.ui.qml b/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.ui.qml index 465499b497235b5b058c80b1d46e28a589f29662..4128f6ee58d97070b497bdee1bdc70569cec66fd 100644 --- a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.ui.qml +++ b/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.ui.qml @@ -5,10 +5,110 @@ Page { id: dapUiQmlWidgetChainWallet title: qsTr("Wallet") - - Text { - id: name - anchors.centerIn: parent - text: qsTr("Wallet") + + ListView { + id: listViewWallet + anchors.fill: parent + anchors.margins: 10 + spacing: 10 + + delegate: Item { + width: parent.width + height: 150 + + Rectangle { + id: rectangleWallet + anchors.fill: parent + color: "lightgray" + opacity: 0.5 + radius: 5 + border.color: "gray" + clip: true + + Rectangle + { + id: iconWallet + height: 140 + width: 140 + border.color: "gray" + anchors.left: parent.left + anchors.leftMargin: 5 + anchors.verticalCenter: parent.verticalCenter + radius: 3.5 + + Image + { + anchors.fill: parent + source: "qrc:/Resources/Icons/add.png" + } + } + + Column + { + anchors.verticalCenter: parent.verticalCenter + anchors.left: iconWallet.right + anchors.leftMargin: 10 + anchors.right: parent.right + anchors.rightMargin: 10 + spacing: 5 + + Text { + id: nameWallet + text: name + bottomPadding: 15 + font.bold: true + font.pixelSize: 20 + } + + Text { + id: lableAddress + text: "Address:" + font.pixelSize: 18 + color: "gray" + } + + TextEdit { + id: addressWallet + text: address + width: parent.width + font.pixelSize: 16 + wrapMode: Text.Wrap + selectByMouse: true + // clip: true + // elide: Text.ElideRight + } + } + } + } + + model: ListModel { + ListElement { + name: "mywallet" + address: "RpiDC8c1SxrTNbxwSTVP6mAHhXvUAgCthoCfpVmUSm889M3zt5JfBxo6iRoAPmJkCPihSWNxhRtdTxnd7LXwcj1nbVd5NQyW1kCgXyM6" + } + + ListElement { + name: "mywallet" + address: "RpiDC8c1SxrTNbxwSTVP6mAHhXvUAgCthoCfpVmUSm889M3zt5JfBxo6iRoAPmJkCPihSWNxhRtdTxnd7LXwcj1nbVd5NQyW1kCgXyM6" + } + + ListElement { + name: "mywallet" + address: "RpiDC8c1SxrTNbxwSTVP6mAHhXvUAgCthoCfpVmUSm889M3zt5JfBxo6iRoAPmJkCPihSWNxhRtdTxnd7LXwcj1nbVd5NQyW1kCgXyM6" + } + + ListElement { + name: "mywallet" + address: "RpiDC8c1SxrTNbxwSTVP6mAHhXvUAgCthoCfpVmUSm889M3zt5JfBxo6iRoAPmJkCPihSWNxhRtdTxnd7LXwcj1nbVd5NQyW1kCgXyM6" + } + } + } + + RoundButton { + text: qsTr("+") + highlighted: true + anchors.margins: 10 + anchors.right: parent.right + anchors.bottom: parent.bottom } } diff --git a/KelvinDashboardGUI/Resources/Icons/exit.png b/KelvinDashboardGUI/Resources/Icons/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..04e3ded47f074d892077759f5697546cef36ae98 Binary files /dev/null and b/KelvinDashboardGUI/Resources/Icons/exit.png differ diff --git a/KelvinDashboardGUI/main.qml b/KelvinDashboardGUI/main.qml index f5786572477962fff2e9ce3b3c17727fb8eba97d..ae64980d6fc3b1ef5cf2362b3395a6ea98345d88 100755 --- a/KelvinDashboardGUI/main.qml +++ b/KelvinDashboardGUI/main.qml @@ -106,7 +106,7 @@ ApplicationWindow { scale: 0.7 visible: false anchors.verticalCenter: parent.verticalCenter - anchors.right: imageDollars.left + anchors.right: parent.left } Image { @@ -115,27 +115,7 @@ ApplicationWindow { scale: 0.7 visible: true anchors.verticalCenter: parent.verticalCenter - anchors.right: imageDollars.left - } - - Image { - id: imageDollars - source: "qrc:/Resources/Icons/dollar.png" - scale: 0.7 - visible: true - anchors.verticalCenter: parent.verticalCenter - anchors.right: labelBalance.right - anchors.leftMargin: 5 - anchors.rightMargin: 5 - } - - Text { - id: labelBalance - text: "0" - font.pointSize: 16 - anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 10 } } Rectangle diff --git a/KelvinDashboardGUI/qml.qrc b/KelvinDashboardGUI/qml.qrc index abfd1123f0a4d78c65066cbfa59c68cddd01a158..f4f9481febc4d04d7d668b1f807bf08458cf156f 100755 --- a/KelvinDashboardGUI/qml.qrc +++ b/KelvinDashboardGUI/qml.qrc @@ -26,5 +26,6 @@ <file>Resources/Icons/home.png</file> <file>Resources/Icons/settings.png</file> <file>Resources/Icons/dialog.png</file> + <file>Resources/Icons/exit.png</file> </qresource> </RCC>