Skip to content
Snippets Groups Projects
Commit 4a6123f9 authored by Evgenii Tagiltsev's avatar Evgenii Tagiltsev
Browse files

Merge branch 'master' into bugs-2797

parents 6b106b95 ce53ecbd
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
Showing
with 174 additions and 144 deletions
CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml
+ 2
− 1
View file @ 4a6123f9
......@@ -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
......
CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
+ 44
− 38
View file @ 4a6123f9
......@@ -12,10 +12,10 @@ DapUiQmlScreen {
Rectangle {
id: wordTextArea
height: 30
height: 30 * pt
color: "#757184"
anchors.rightMargin: 1
anchors.leftMargin: 1
anchors.rightMargin: 1 * pt
anchors.leftMargin: 1 * pt
anchors.right: parent.right
anchors.left: parent.left
anchors.top: parent.top
......@@ -25,12 +25,12 @@ DapUiQmlScreen {
color: "#ffffff"
text: qsTr("24 words")
anchors.bottom: parent.bottom
anchors.bottomMargin: 8
anchors.bottomMargin: 8 * pt
anchors.top: parent.top
anchors.topMargin: 8
anchors.topMargin: 8 * pt
anchors.left: parent.left
anchors.leftMargin: 16
font.pointSize: 12
anchors.leftMargin: 16 * pt
font.pointSize: 12 * pt
horizontalAlignment: Text.AlignLeft
font.family: "Roboto"
font.styleName: "Normal"
......@@ -41,22 +41,22 @@ DapUiQmlScreen {
Rectangle {
id: saveNotesDescription
color: "#edeff2"
height: 42
height: 42 * pt
anchors.top: wordTextArea.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: wordTextArea.left
anchors.right: wordTextArea.right
Text {
anchors.fill: parent
text: qsTr("Keep these words in a safe place. They will be\nrequired to restore your wallet in case of loss of\naccess to it")
anchors.leftMargin: 1
anchors.leftMargin: 1 * pt
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
color: "#FF0300"
font {
pointSize: 16
pointSize: 14 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
......@@ -66,9 +66,9 @@ DapUiQmlScreen {
Rectangle {
id: recoveryWords
height: 270
height: 270 * pt
anchors.top: saveNotesDescription.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.right: parent.right
anchors.left: parent.left
anchors.leftMargin: 1 * pt
......@@ -116,23 +116,23 @@ DapUiQmlScreen {
}
RowLayout {
height: 270
spacing: 60
height: 270 * pt
spacing: 60 * pt
anchors.right: parent.right
anchors.rightMargin: 1
anchors.rightMargin: 1 * pt
anchors.left: parent.left
anchors.leftMargin: 1
anchors.leftMargin: 1 * pt
ListView {
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
width: 50
height: 300
width: 50 * pt
height: 300 * pt
model: listRecoveryWords
delegate: Text {
text: word
color: "#070023"
font {
pointSize: 16
pointSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
......@@ -142,14 +142,14 @@ DapUiQmlScreen {
ListView {
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
width: 50
height: 300
width: 50 * pt
height: 300 * pt
model: listRecoveryWords
delegate: Text {
text: word
color: "#070023"
font {
pointSize: 16
pointSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
......@@ -161,20 +161,20 @@ DapUiQmlScreen {
Rectangle {
id: notifyNotesSavedArea
height: 70
height: 70 * pt
anchors.top: recoveryWords.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: parent.left
anchors.right: parent.right
color: "#EDEFF2"
anchors.leftMargin: 1
anchors.leftMargin: 1 * pt
Text {
id: notifyText
anchors.centerIn: parent
text: qsTr("")
color: "#6F9F00"
font.pointSize: 14
font.pointSize: 14 * pt
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
......@@ -182,20 +182,20 @@ DapUiQmlScreen {
RowLayout {
id: actionButtons
height: 44
anchors.leftMargin: 1
spacing: 30
height: 44 * pt
anchors.leftMargin: 1 * pt
spacing: 30 * pt
anchors.top: notifyNotesSavedArea.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: parent.left
anchors.right: parent.right
Layout.leftMargin: 26
Layout.leftMargin: 26 * pt
Layout.columnSpan: 2
Button {
id: nextButton
height: 44
width: 130
height: 44 * pt
width: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
Text {
......@@ -207,7 +207,7 @@ DapUiQmlScreen {
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 18
font.pointSize: 18 * pt
horizontalAlignment: Text.AlignLeft
}
......@@ -220,9 +220,9 @@ DapUiQmlScreen {
Button {
id: copyNotesButton
height: 44
height: 44 * pt
width: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
width: 130
checkable: true
Text {
......@@ -234,7 +234,7 @@ DapUiQmlScreen {
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 18
font.pointSize: 18 * pt
horizontalAlignment: Text.AlignLeft
}
......@@ -252,3 +252,9 @@ DapUiQmlScreen {
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
+ 36
− 30
View file @ 4a6123f9
......@@ -11,7 +11,7 @@ Rectangle {
Rectangle {
id: qrCodeTextArea
height: 30
height: 30 * pt
color: "#757184"
anchors.right: parent.right
anchors.left: parent.left
......@@ -22,12 +22,12 @@ Rectangle {
color: "#ffffff"
text: qsTr("QR Code")
anchors.bottom: parent.bottom
anchors.bottomMargin: 8
anchors.bottomMargin: 8 * pt
anchors.top: parent.top
anchors.topMargin: 8
anchors.topMargin: 8 * pt
anchors.left: parent.left
anchors.leftMargin: 16
font.pointSize: 12
anchors.leftMargin: 16 * pt
font.pointSize: 12 * pt
horizontalAlignment: Text.AlignLeft
font.family: "Roboto"
font.styleName: "Normal"
......@@ -38,9 +38,9 @@ Rectangle {
Rectangle {
id: saveQrCodeDescription
color: "#edeff2"
height: 42
height: 42 * pt
anchors.top: qrCodeTextArea.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: qrCodeTextArea.left
anchors.right: qrCodeTextArea.right
anchors.leftMargin: 1 * pt
......@@ -49,7 +49,7 @@ Rectangle {
Text {
anchors.fill: parent
text: qsTr("Keep these QR-code in a safe place. They will be\nrequired to restore your wallet in case of loss of\naccess to it")
font.pointSize: 14
font.pointSize: 14 * pt
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
color: "#FF0300"
......@@ -64,13 +64,13 @@ Rectangle {
Rectangle {
id: qrCodeImageArea
height: 200
width: 200
height: 200 * pt
width: 200 * pt
anchors.top: saveQrCodeDescription.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.horizontalCenter: parent.horizontalCenter
color: "#EDEFF2"
border.width: 1
border.width: 1 * pt
border.color: "#C7C6CE"
Image {
......@@ -84,20 +84,20 @@ Rectangle {
Rectangle {
id: notifyQrCodeSavedArea
height: 100
height: 100 * pt
color: "#EDEFF2"
anchors.top: qrCodeImageArea.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: parent.left
anchors.right: parent.right
color: "#EDEFF2"
anchors.leftMargin: 1
anchors.leftMargin: 1 * pt
Text {
id: notifyText
anchors.centerIn: parent
text: qsTr("")
color: "#6F9F00"
font.pointSize: 14
font.pointSize: 14 * pt
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
......@@ -105,32 +105,32 @@ Rectangle {
RowLayout {
id: actionButtons
height: 44
anchors.leftMargin: 1
spacing: 60
height: 44 * pt
anchors.leftMargin: 1 * pt
spacing: 60 * pt
anchors.top: notifyQrCodeSavedArea.bottom
anchors.topMargin: 24
anchors.topMargin: 24 * pt
anchors.left: parent.left
anchors.right: parent.right
Layout.leftMargin: 26
Layout.leftMargin: 26 * pt
Layout.columnSpan: 2
Button {
id: nextButton
height: 44
height: 44 * pt
width: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
width: 130
Text {
id: nextButtonText
text: qsTr("Next")
text: qsTr("Create")
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
color: "#ffffff"
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 16
font.pointSize: 18 * pt
horizontalAlignment: Text.AlignLeft
}
......@@ -143,10 +143,9 @@ Rectangle {
Button {
id: saveQrCodeButton
height: 44
width: 130
height: 44 * pt
width: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
checkable: true
Text {
id: saveQrCodeButtonText
......@@ -157,7 +156,7 @@ Rectangle {
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 16
font.pointSize: 18 * pt
horizontalAlignment: Text.AlignLeft
}
......@@ -174,3 +173,10 @@ Rectangle {
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
+ 0
− 2
View file @ 4a6123f9
......@@ -4,8 +4,6 @@ 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: {
......
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
+ 69
− 57
View file @ 4a6123f9
......@@ -6,7 +6,6 @@ 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
......@@ -18,7 +17,7 @@ DapUiQmlScreen {
Rectangle {
id: nameWalletTextArea
height: 30
height: 30 * pt
color: "#757184"
anchors.right: parent.right
anchors.left: parent.left
......@@ -41,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
......@@ -53,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"
......@@ -65,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 {
......@@ -78,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,51 +88,58 @@ DapUiQmlScreen {
}
Rectangle {
id: chooseSignatureTypeArea
height: 68 * pt
color: "#EDEFF2"
anchors.leftMargin: 1 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.top: chooseSignatureTypeTextArea.bottom
///ComboBox right panel
Rectangle{
id:areaDapComboBoxRightPanel
anchors.fill: parent
anchors.leftMargin: 16*pt
anchors.rightMargin: 16*pt
anchors.topMargin:12*pt
anchors.bottomMargin: 12*pt
color: parent.color
DapComboBox{
property Label fieldBalance: Label {}
model: ListModel {
id: signatureType
ListElement {signatureName: "Dilithium"}
ListElement {signatureName: "Bliss"}
ListElement {signatureName: "Picnic"}
ListElement {signatureName: "Tesla"}
}
normalColorText: "#070023"
hilightColorText: "#FFFFFF"
fontSizeComboBox: 16 * pt
hilightColor: "#330F54"
sidePaddingNormal: 20 * pt
indicatorWidth: 20 * pt
}
}
}
id: chooseSignatureTypeArea
height: 68 * pt
color: "#EDEFF2"
anchors.leftMargin: 1 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.top: chooseSignatureTypeTextArea.bottom
///ComboBox right panel
Rectangle {
id: areaDapComboBoxRightPanel
anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
color: parent.color
DapComboBox {
property Label fieldBalance: Label {}
model: ListModel {
id: signatureType
ListElement {
signatureName: "Dilithium"
}
ListElement {
signatureName: "Bliss"
}
ListElement {
signatureName: "Picnic"
}
ListElement {
signatureName: "Tesla"
}
}
normalColorText: "#070023"
hilightColorText: "#FFFFFF"
fontSizeComboBox: 16 * pt
hilightColor: "#330F54"
sidePaddingNormal: 20 * pt
indicatorWidth: 20 * 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
......@@ -148,19 +154,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
......@@ -188,11 +194,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 {
......@@ -215,3 +221,9 @@ DapUiQmlScreen {
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
+ 5
− 4
View file @ 4a6123f9
......@@ -12,17 +12,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 {
......
CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
+ 9
− 8
View file @ 4a6123f9
......@@ -6,15 +6,15 @@ DapUiQmlScreen {
property alias buttonDone: doneCreateWalletButton
id: walletCreatedMenu
color: "#edeff2"
color: "#F8F7FA"
Button {
id: doneCreateWalletButton
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: 189 + 24
height: 44
width: 130
anchors.bottomMargin: 213 * pt
height: 44 * pt
width: 130 * pt
Text {
id: doneCreateWalletButtonText
......@@ -25,7 +25,7 @@ DapUiQmlScreen {
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 16
font.pointSize: 18 * pt
horizontalAlignment: Text.AlignLeft
}
......@@ -39,9 +39,9 @@ DapUiQmlScreen {
Rectangle {
id: createWalletDescription
color: "#edeff2"
height: 50
height: 50 * pt
anchors.bottom: doneCreateWalletButton.top
anchors.bottomMargin: 24 + 118 + 24
anchors.bottomMargin: 166 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 1 * pt
......@@ -55,7 +55,7 @@ DapUiQmlScreen {
color: "#070023"
font {
pointSize: 18
pointSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
......@@ -69,3 +69,4 @@ Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
+ 8
− 3
View file @ 4a6123f9
......@@ -27,7 +27,6 @@ Rectangle {
font.pixelSize: 12 * pt
color: "#A7A7A7"
}
DapComboBox {
id: comboboxWallet
width: 190*pt
......@@ -45,7 +44,6 @@ Rectangle {
hilightColor: "#332F49"
fontSizeComboBox: 14*px
}
Label {
id: titleWalletBalance
anchors.top: parent.top
......@@ -76,7 +74,7 @@ Rectangle {
height: 36 * pt
name: qsTr("New wallet")
fontHeight: 14 * pt
backgroundColor: "#070023"
backgroundColor: hovered ? "#D51F5D" : "#070023"
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: 10 * pt
......@@ -87,7 +85,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"
}
}
}
}
CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
+ 1
− 1
View file @ 4a6123f9
......@@ -25,7 +25,7 @@ Button {
anchors.fill: parent
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignRight
anchors.rightMargin: 20
anchors.rightMargin: 20 * pt
font.family: "Roboto"
font.weight: Font.Normal
color: "#FFFFFF"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment