From 94c8cd18faacffcebd33fd21d6b551247152d488 Mon Sep 17 00:00:00 2001
From: "aleksandr.martynov" <aleksandr.martynov@demlabs.net>
Date: Fri, 6 Dec 2019 12:28:45 +0300
Subject: [PATCH] [*] add factor pt to sizes
---
.../screen/LastAction/DapRadioButton.qml | 3 +-
.../DapUiQmlRecoveryNotesForm.ui.qml | 7 ++-
.../DapUiQmlScreenDialogAddWalletForm.ui.qml | 48 +++++++++----------
.../DapUiQmlWidgetSignatureTypeComboBox.qml | 2 +-
4 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml b/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
index 1c526cf70..d55329d95 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
@@ -7,6 +7,7 @@ RadioButton {
id: button
text: qsTr("template")
+
contentItem: Text {
id: nameButton
anchors.left: parent.left
@@ -20,7 +21,7 @@ RadioButton {
horizontalAlignment: Text.AlignLeft
}
- spacing: 16
+ spacing: 16 * pt
checked: false
display: AbstractButton.TextBesideIcon
autoExclusive: true
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
index e053ef073..55eb629fb 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
@@ -12,7 +12,7 @@ DapUiQmlScreen {
Rectangle {
id: wordTextArea
- height: 30
+ height: 30 * pt
color: "#757184"
anchors.rightMargin: 1
anchors.leftMargin: 1
@@ -252,3 +252,8 @@ DapUiQmlScreen {
}
}
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 2fdaefcdd..7951d8c21 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -40,10 +40,10 @@ DapUiQmlScreen {
Rectangle {
id: inputNameWalletArea
- height: 68
+ height: 68 * pt
color: "#F8F7FA"
anchors.left: parent.left
- anchors.leftMargin: 1
+ anchors.leftMargin: 1 * pt
anchors.right: parent.right
anchors.top: nameWalletTextArea.bottom
@@ -52,7 +52,7 @@ DapUiQmlScreen {
text: qsTr("Pocket of happiness")
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 20
+ anchors.leftMargin: 20 * pt
font.pixelSize: 16 * pt
color: "#070023"
font.family: "Roboto"
@@ -64,12 +64,12 @@ DapUiQmlScreen {
Rectangle {
id: chooseSignatureTypeTextArea
- height: 30
+ height: 30 * pt
color: "#757184"
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
- anchors.leftMargin: 1
+ anchors.leftMargin: 1 * pt
anchors.top: inputNameWalletArea.bottom
Text {
@@ -77,7 +77,7 @@ DapUiQmlScreen {
color: "#ffffff"
text: qsTr("Choose signature type")
font.pixelSize: 12 * pt
- anchors.leftMargin: 16
+ anchors.leftMargin: 16 * pt
horizontalAlignment: Text.AlignLeft
font.styleName: "Normal"
font.family: "Roboto"
@@ -89,33 +89,33 @@ DapUiQmlScreen {
Rectangle {
id: chooseSignatureTypeArea
- height: 68
+ height: 68 * pt
color: "#F8F7FA"
- anchors.leftMargin: 1
+ anchors.leftMargin: 1 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.top: chooseSignatureTypeTextArea.bottom
DapUiQmlWidgetSignatureTypeComboBox {
id: comboBoxChooseSignatureType
- width: 368
- height: 20
+ width: 368 * pt
+ height: 20 * pt
anchors {
verticalCenter: chooseSignatureTypeArea.verticalCenter
fill: parent
- topMargin: 24
- bottomMargin: 24
- leftMargin: 8
- rightMargin: 32
+ topMargin: 24 * pt
+ bottomMargin: 24 * pt
+ leftMargin: 8 * pt
+ rightMargin: 32 * pt
}
}
}
Rectangle {
id: recoveryMethodTextArea
- height: 30
+ height: 30 * pt
color: "#757184"
- anchors.leftMargin: 1
+ anchors.leftMargin: 1 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.top: chooseSignatureTypeArea.bottom
@@ -130,19 +130,19 @@ DapUiQmlScreen {
anchors.left: parent.left
font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft
- anchors.leftMargin: 16
+ anchors.leftMargin: 16 * pt
anchors.verticalCenter: parent.verticalCenter
}
}
ColumnLayout {
id: chooseRecoveryMethod
- height: 272
- spacing: 32
+ height: 272 * pt
+ spacing: 32 * pt
anchors.top: recoveryMethodTextArea.bottom
- anchors.topMargin: 32
+ anchors.topMargin: 32 * pt
anchors.left: parent.left
- anchors.leftMargin: 16
+ anchors.leftMargin: 16 * pt
anchors.right: parent.right
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
@@ -170,11 +170,11 @@ DapUiQmlScreen {
Button {
id: nextButton
- height: 44
- width: 130
+ height: 44 * pt
+ width: 130 * pt
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: chooseRecoveryMethod.bottom
- anchors.topMargin: 32
+ anchors.topMargin: 32 * pt
hoverEnabled: true
contentItem: Text {
diff --git a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
index 20daf4073..9c6fa5dcc 100644
--- a/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml
@@ -26,7 +26,7 @@ DapUiQmlWidgetStatusBarComboBox {
heightArrow: 20 * pt
font {
- pointSize: 16
+ pointSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
--
GitLab