Skip to content
Snippets Groups Projects
Commit 1998bc20 authored by Andrey Daragan's avatar Andrey Daragan
Browse files

[+] Moved the design of the right panel to restore access to the wallet with... 

[+] Moved the design of the right panel to restore access to the wallet with the introduction of design changes.
parent 8e97b5e0
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
Showing
with 327 additions and 11 deletions
CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+ 9
− 1
View file @ 1998bc20
......@@ -21,7 +21,7 @@ DapRightPanel
hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
}
dapHeader.height: 30 * pt
dapHeader.height: 36 * pt
dapFrame.width: 400 * pt
dapFrame.height: parent.height
color: "#F8F7FA"
......@@ -35,6 +35,14 @@ DapRightPanel
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
......
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+ 1
− 1
View file @ 1998bc20
......@@ -11,5 +11,5 @@ DapDashboardTabForm
///@detalis Path to the right pane of transaction history.
readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml"
dapDashboardRightPanel.source: Qt.resolvedUrl(inputNameWallet)
dapDashboardRightPanel.source: Qt.resolvedUrl(recoveryWallet)
}
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
+ 1
− 8
View file @ 1998bc20
......@@ -4,13 +4,6 @@ import "../../../"
DapAbstractRightPanel
{
dapButtonClose.height: 16 * pt
dapButtonClose.width: 16 * pt
dapButtonClose.heightImageButton: 16 * pt
dapButtonClose.widthImageButton: 16 * pt
dapButtonClose.normalImageButton: "qrc:/res/icons/close_icon.png"
dapButtonClose.hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
dapHeaderData:
Row
{
......@@ -83,7 +76,7 @@ DapAbstractRightPanel
existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontSizeButton: 18 * pt
fontButton.pixelSize: 18 * pt
colorTextButton: buttonDone.checked ? "#3E3853" : "#FFFFFF"
colorBackgroundButton: "#3E3853"
}
......
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
+ 315
− 0
View file @ 1998bc20
import QtQuick 2.4
import QtQuick.Layouts 1.3
import "qrc:/widgets"
import "../../../"
DapAbstractRightPanel
{
dapButtonClose.normalImageButton: "qrc:/res/icons/back_icon.png"
dapButtonClose.hoverImageButton: "qrc:/res/icons/back_icon_hover.png"
dapHeaderData:
Rectangle
{
id: frameHeaderItem
anchors.fill: parent
height: parent.height
color: "transparent"
Rectangle
{
anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
color: "transparent"
Item
{
id: itemButtonBack
data: dapButtonClose
height: dapButtonClose.height
width: dapButtonClose.width
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
}
Text
{
id: textHeader
text: qsTr("New wallet")
font.pixelSize: 14 * pt
color: "#3E3853"
anchors.left: itemButtonBack.right
anchors.leftMargin: 12 * pt
anchors.verticalCenter: parent.verticalCenter
}
}
Rectangle
{
id: bottomBorder
height: 1 * pt
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
color: "#757184"
}
}
dapContentItemData:
Rectangle
{
anchors.fill: parent
color: "transparent"
Rectangle
{
id: frameMethod
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.bottomMargin: 8 * pt
color: "#757184"
height: 30 * pt
Text
{
id: textMethod
color: "#ffffff"
text: qsTr("24 words")
font.pixelSize: 12 * pt
horizontalAlignment: Text.AlignLeft
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 16 * pt
}
}
Text
{
id: textTopMessage
anchors.left: parent.left
anchors.right: parent.right
anchors.top: frameMethod.bottom
anchors.topMargin: 24 * pt
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
anchors.bottomMargin: 24 * pt
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")
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
color: "#FF0300"
font
{
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
pixelSize: 14 * pt
}
}
Rectangle
{
id: frameRecoveryWords
anchors.top: textTopMessage.bottom
anchors.topMargin: 24 * pt
anchors.right: parent.right
anchors.left: parent.left
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
color: "transparent"
height: 250 * pt
ListModel
{
id: modelRecoveryWords
ListElement
{
word: "Word1"
}
ListElement
{
word: "Word2"
}
ListElement
{
word: "Word3"
}
ListElement
{
word: "Word4"
}
ListElement
{
word: "Word5"
}
ListElement
{
word: "Word6"
}
ListElement
{
word: "Word7"
}
ListElement
{
word: "Word8"
}
ListElement
{
word: "Word9"
}
ListElement
{
word: "Word10"
}
ListElement
{
word: "Word11"
}
ListElement
{
word: "Word12"
}
}
RowLayout
{
id: rowListView
spacing: 60 * pt
anchors.fill: parent
height: frameRecoveryWords.height
ListView
{
id: firstListViewRecoveryWords
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
height: frameRecoveryWords.height
width: 50 * pt
model: modelRecoveryWords
delegate:
Text
{
text: word
color: "#070023"
anchors.horizontalCenter: parent.horizontalCenter
font
{
pixelSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
}
}
}
ListView
{
id: lastListViewRecoveryWords
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
height: frameRecoveryWords.height
width: 50 * pt
model: modelRecoveryWords
delegate:
Text
{
text: word
color: "#070023"
anchors.horizontalCenter: parent.horizontalCenter
font
{
pixelSize: 16 * pt
family: "Roboto"
styleName: "Normal"
weight: Font.Normal
}
}
}
}
}
Text
{
id: textBottomMessage
anchors.top: frameRecoveryWords.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 24 * pt
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
color: "#6F9F00"
font.pixelSize: 14 * pt
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
RowLayout
{
id: rowButtons
height: 44 * pt
anchors.top: textBottomMessage.bottom
anchors.topMargin: 24 * pt
anchors.left: parent.left
anchors.right: parent.right
Layout.columnSpan: 2
DapButton
{
id: nextButton
heightButton: 44 * pt
widthButton: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
textButton: qsTr("Next")
existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontButton.pixelSize: 18 * pt
colorBackgroundButton: "#3E3853"
}
DapButton
{
id: copyButton
heightButton: 44 * pt
widthButton: 130 * pt
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
checkable: true
textButton: qsTr("Copy")
existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontButton.pixelSize: 18 * pt
colorBackgroundButton: copyButton.checked ? "#EDEFF2" : "#3E3853"
colorTextButton: copyButton.checked ? "#3E3853" : "#FFFFFF"
onClicked: textBottomMessage.text = qsTr("Recovery words copied to clipboard. Keep them in a\nsafe place before proceeding to the next step.")
}
}
Rectangle
{
id: frameMethodData
height: 124 * pt
color: "transparent"
anchors.top: rowButtons.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
}
}
}
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
libdap-qt-ui-qml @ dd57503b
Compare d63a06e0...dd57503b
Subproject commit d63a06e0ff7e75f85703a79116e54261ec4b5ea6
Subproject commit dd57503b135663dd66df1376a265a40f058d7e2c
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