From 41babf681603e14e0722389a8d265223d5ade29f Mon Sep 17 00:00:00 2001 From: "aleksandr.martynov" <aleksandr.martynov@demlabs.net> Date: Fri, 6 Dec 2019 11:55:12 +0300 Subject: [PATCH] [*] add change color to button new payment when active --- .../LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml | 2 +- .../LastAction/DapUiQmlScreenDialogAddWalletHeader.qml | 9 +++++---- .../screen/StatusBar/DapUiQmlWidgetStatusBar.qml | 7 +++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml index b0d3e6083..2fdaefcdd 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml @@ -17,7 +17,7 @@ DapUiQmlScreen { Rectangle { id: nameWalletTextArea - height: 30 + height: 30 * pt color: "#757184" anchors.right: parent.right anchors.left: parent.left diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml index 8219bbc70..3bb7c7ba9 100644 --- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml +++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml @@ -13,17 +13,18 @@ DapUiQmlScreen { property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png" property string title : qsTr("New wallet") property alias mouseArea : mouseArea + property alias pressedCloseAddWallet: mouseArea.pressed RowLayout { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 8 - spacing: 12 + anchors.leftMargin: 8 * pt + spacing: 12 * pt Rectangle { - width: 16 - height: 16 + width: 16 * pt + height: 16 * pt color: "transparent" Image { diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml index f5ece439a..1bc728737 100644 --- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml +++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml @@ -78,7 +78,14 @@ Rectangle { onClicked: { rightPanel.header.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel}); rightPanel.content.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel}); + statusBarAddWalletButton.backgroundColor = "#D51F5D" + } + + Connections { + target: rightPanel.header.currentItem + onPressedCloseAddWalletChanged: statusBarAddWalletButton.backgroundColor = "#070023" } } + } } -- GitLab