From 55eb0be02d0b57363f96126788d83b9ce9c3f32b Mon Sep 17 00:00:00 2001
From: "aleksandr.martynov" <aleksandr.martynov@demlabs.net>
Date: Thu, 5 Dec 2019 13:24:20 +0300
Subject: [PATCH] [*] fix remarks by andrey daragan
- add factor pt
- change some elements color in accroding to design-guide
- add borders to headers
- small fixes
---
.../screen/LastAction/DapRadioButton.qml | 2 +-
.../DapUiQmlScreenDialogAddWallet.qml | 2 ++
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 24 ++++++++++---------
.../DapUiQmlScreenDialogAddWalletHeader.qml | 6 +++--
.../DapUiQmlWidgetStatusBarButtonForm.ui.qml | 2 +-
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml b/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
index db360767b..1c526cf70 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
@@ -14,7 +14,7 @@ RadioButton {
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
color: "#3E3853"
- font.pointSize: 14
+ font.pointSize: 14 * pt
font.wordSpacing: 0
font.family: "Roboto"
horizontalAlignment: Text.AlignLeft
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
index 2b86a29f2..3f4e866e6 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
@@ -5,6 +5,8 @@ DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
focus: true
+ sourceCustomArrow: popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/icon_arrow_down.png"
+
Connections {
target: nextButton
onClicked: {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 9880edcd1..b0d3e6083 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -5,12 +5,15 @@ import "../"
DapUiQmlScreen {
property alias nextButton: nextButton
+ property alias sourceCustomArrow: comboBoxChooseSignatureType.sourceArrow
property bool isWordsRecoveryMethodChecked: selectionWords.checked
property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
id: addWalletMenu
- color: "#EDEFF2"
+ color: "#F8F7FA"
+ border.width: 1 * pt
+ border.color: "#E3E2E6"
Rectangle {
id: nameWalletTextArea
@@ -25,9 +28,9 @@ DapUiQmlScreen {
color: "#ffffff"
text: qsTr("Name of wallet")
anchors.left: parent.left
- anchors.leftMargin: 16
+ anchors.leftMargin: 16 * pt
anchors.verticalCenter: parent.verticalCenter
- font.pointSize: 12
+ font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft
font.family: "Roboto"
font.styleName: "Normal"
@@ -38,7 +41,7 @@ DapUiQmlScreen {
Rectangle {
id: inputNameWalletArea
height: 68
- color: "#EDEFF2"
+ color: "#F8F7FA"
anchors.left: parent.left
anchors.leftMargin: 1
anchors.right: parent.right
@@ -50,7 +53,7 @@ DapUiQmlScreen {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 20
- font.pointSize: 16
+ font.pixelSize: 16 * pt
color: "#070023"
font.family: "Roboto"
font.styleName: "Normal"
@@ -73,7 +76,7 @@ DapUiQmlScreen {
id: chooseSignatureTypeText
color: "#ffffff"
text: qsTr("Choose signature type")
- font.pointSize: 12
+ font.pixelSize: 12 * pt
anchors.leftMargin: 16
horizontalAlignment: Text.AlignLeft
font.styleName: "Normal"
@@ -87,7 +90,7 @@ DapUiQmlScreen {
Rectangle {
id: chooseSignatureTypeArea
height: 68
- color: "#EDEFF2"
+ color: "#F8F7FA"
anchors.leftMargin: 1
anchors.left: parent.left
anchors.right: parent.right
@@ -95,6 +98,7 @@ DapUiQmlScreen {
DapUiQmlWidgetSignatureTypeComboBox {
id: comboBoxChooseSignatureType
+ width: 368
height: 20
anchors {
verticalCenter: chooseSignatureTypeArea.verticalCenter
@@ -104,8 +108,6 @@ DapUiQmlScreen {
leftMargin: 8
rightMargin: 32
}
-
- sourceArrow: popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up.png" : "qrc:/Resources/Icons/icon_arrow_down.png"
}
}
@@ -126,7 +128,7 @@ DapUiQmlScreen {
font.styleName: "Normal"
font.weight: Font.Normal
anchors.left: parent.left
- font.pointSize: 12
+ font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft
anchors.leftMargin: 16
anchors.verticalCenter: parent.verticalCenter
@@ -183,7 +185,7 @@ DapUiQmlScreen {
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
- font.pointSize: 18
+ font.pixelSize: 18 * pt
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
index 09aec6e6c..8219bbc70 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -5,7 +5,9 @@ import "../"
DapUiQmlScreen {
height: 36 * pt
- color: "#edeff2"
+ color: "#F8F7FA"
+ border.width: 1 * pt
+ border.color: "#E3E2E6"
property string backButtonNormal : "qrc:/res/icons/close_icon.png"
property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png"
@@ -48,7 +50,7 @@ DapUiQmlScreen {
Text {
text: title
horizontalAlignment: Qt.AlignLeft
- font.pointSize: 14
+ font.pointSize: 14 * pt
font.family: "Roboto"
font.weight: Font.Normal
font.styleName: "Normal"
diff --git a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
index 2cfc85111..2824c5cef 100644
--- a/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
@@ -18,7 +18,7 @@ Button {
contentItem: Rectangle {
id: background
anchors.fill: parent
- color: "transparent"
+ color: "#070023"
Text {
id: templateText
--
GitLab