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

[+] Partially implemented design.

parent d4a4b261
No related branches found
No related tags found
2 merge requests!83Bugs 2893,!75Bugs 2893
Pipeline #1614 passed with stage
in 15 minutes and 6 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 166 additions and 14 deletions
CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+ 20
− 0
View file @ cecadd45
...@@ -7,6 +7,20 @@ DapRightPanel ...@@ -7,6 +7,20 @@ DapRightPanel
{ {
id: rightPanel id: rightPanel
property DapButton dapButtonClose:
DapButton
{
id: buttonClose
height: 16 * pt
width: 16 * pt
heightImageButton: 16 * pt
widthImageButton: 16 * pt
colorBackgroundNormal: "#F8F7FA"
colorBackgroundHover: "#F8F7FA"
normalImageButton: "qrc:/res/icons/close_icon.png"
hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
}
dapHeader.height: 30 * pt dapHeader.height: 30 * pt
dapFrame.width: 400 * pt dapFrame.width: 400 * pt
dapFrame.height: parent.height dapFrame.height: parent.height
...@@ -15,6 +29,12 @@ DapRightPanel ...@@ -15,6 +29,12 @@ DapRightPanel
/*##^## Designer { /*##^## Designer {
D{i:0;autoSize:true;height:480;width:640} D{i:0;autoSize:true;height:480;width:640}
} }
......
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+ 1
− 1
View file @ cecadd45
...@@ -11,5 +11,5 @@ DapDashboardTabForm ...@@ -11,5 +11,5 @@ DapDashboardTabForm
///@detalis Path to the right pane of transaction history. ///@detalis Path to the right pane of transaction history.
readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml" readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml"
dapDashboardRightPanel.source: Qt.resolvedUrl(doneWallet) dapDashboardRightPanel.source: Qt.resolvedUrl(inputNameWallet)
} }
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
+ 30
− 10
View file @ cecadd45
...@@ -4,6 +4,13 @@ import "../../../" ...@@ -4,6 +4,13 @@ import "../../../"
DapAbstractRightPanel 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: dapHeaderData:
Row Row
{ {
...@@ -12,17 +19,11 @@ DapAbstractRightPanel ...@@ -12,17 +19,11 @@ DapAbstractRightPanel
anchors.rightMargin: 16 * pt anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt anchors.bottomMargin: 12 * pt
DapButton
Item
{ {
id: buttonClose id: itemButtonClose
height: 16 * pt data: dapButtonClose
width: 16 * pt
heightImageButton: height
widthImageButton: width
colorBackgroundNormal: "#F8F7FA"
colorBackgroundHover: "#F8F7FA"
normalImageButton: "qrc:/res/icons/close_icon.png"
hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
} }
} }
...@@ -99,3 +100,22 @@ DapAbstractRightPanel ...@@ -99,3 +100,22 @@ DapAbstractRightPanel
} }
} }
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
+ 114
− 2
View file @ cecadd45
...@@ -5,8 +5,120 @@ import "../../../" ...@@ -5,8 +5,120 @@ import "../../../"
DapAbstractRightPanel DapAbstractRightPanel
{ {
dapHeaderData: dapHeaderData:
DapButton Row
{ {
textButton: qsTr("New wallet") anchors.fill: parent
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
spacing: 12 * pt
Item
{
id: itemButtonClose
data: dapButtonClose
height: dapButtonClose.height
width: dapButtonClose.width
}
Text
{
id: textHeader
text: qsTr("New wallet")
font.pixelSize: 14 * pt
color: "#3E3853"
}
} }
dapContentItemData:
Rectangle
{
anchors.fill: parent
color: "transparent"
Rectangle
{
id: frameNameWallet
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 8 * pt
anchors.bottomMargin: 8 * pt
color: "#757184"
height: 16 * pt
Text
{
id: textNameWallet
color: "#ffffff"
text: qsTr("Name of wallet")
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
}
}
Rectangle
{
id: frameInputNameWallet
height: 68 * pt
color: "#F8F7FA"
anchors.top: frameNameWallet.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 16 * pt
anchors.rightMargin: 16 * pt
Text
{
id: textInputNameWallet
text: qsTr("Pocket of happiness")
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 16 * pt
color: "#070023"
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
horizontalAlignment: Text.AlignLeft
anchors.left: parent.left
anchors.leftMargin: 20 * pt
}
}
Rectangle
{
id: frameChooseSignatureType
anchors.top: frameInputNameWallet.bottom
anchors.right: parent.right
anchors.left: parent.left
anchors.topMargin: 8 * pt
anchors.bottomMargin: 8 * pt
color: "#757184"
height: 16 * pt
Text
{
id: textChooseSignatureType
color: "#ffffff"
text: qsTr("Choose signature type")
font.pixelSize: 12 * pt
anchors.leftMargin: 16 * pt
anchors.left: parent.left
horizontalAlignment: Text.AlignLeft
font.styleName: "Normal"
font.family: "Roboto"
font.weight: Font.Normal
anchors.verticalCenter: parent.verticalCenter
}
}
}
}
/*##^## Designer {
D{i:0;autoSize:true;height:480;width:640}
} }
##^##*/
libdap-qt-ui-qml @ 1f0a5e1d
Compare 5773f522...1f0a5e1d
Subproject commit 5773f5227d652791bb70d7e162db971ae5ad5777 Subproject commit 1f0a5e1d2e71ef054963bdde7e641ee5c146b2e4
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