Skip to content
Snippets Groups Projects
Commit 0a489113 authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

[*] Made design changes.

parent 8e4456b1
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
CellFrameDashboardGUI/qml.qrc
+ 1
− 0
View file @ 0a489113
...@@ -143,5 +143,6 @@ ...@@ -143,5 +143,6 @@
<file>screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml</file> <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml</file> <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml</file> <file>screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml</file>
<file>res/icons/ic_cellframe.png</file>
</qresource> </qresource>
</RCC> </RCC>
CellFrameDashboardGUI/res/icons/ic_cellframe.png 0 → 100644
+ 0
− 0
View file @ 0a489113
CellFrameDashboardGUI/res/icons/ic_cellframe.png

3.77 KiB

CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
+ 74
− 77
View file @ 0a489113
...@@ -34,41 +34,34 @@ DapDashboardScreenForm ...@@ -34,41 +34,34 @@ DapDashboardScreenForm
} }
} }
Row Rectangle
{ {
id: networkAddressBlock id: networkAddressBlock
height: 40 * pt height: 40 * pt
width: parent.width width: parent.width
Item
{
width: 16 * pt
height: parent.height
}
Text Text
{ {
id: networkAddressLabel id: networkAddressLabel
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 16 * pt
font.pixelSize: 12 * pt font.pixelSize: 12 * pt
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
color: "#908D9D" color: "#908D9D"
text: qsTr("Network address") text: qsTr("Network address")
} width: 92 * pt
Item
{
width: 36 * pt
height: parent.height
} }
DapText DapText
{ {
id: textMetworkAddress id: textMetworkAddress
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 400 * pt anchors.left: networkAddressLabel.right
anchors.leftMargin: 36 * pt
width: 172 * pt
font.pixelSize: 10 * pt font.pixelSize: 10 * pt
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
...@@ -84,8 +77,10 @@ DapDashboardScreenForm ...@@ -84,8 +77,10 @@ DapDashboardScreenForm
{ {
id: networkAddressCopyButton id: networkAddressCopyButton
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 20 * pt anchors.left: textMetworkAddress.right
height: 20 * pt anchors.leftMargin: 4 * pt
width: 16 * pt
height: 16 * pt
hoverEnabled: true hoverEnabled: true
onClicked: textMetworkAddress.copy() onClicked: textMetworkAddress.copy()
...@@ -96,8 +91,8 @@ DapDashboardScreenForm ...@@ -96,8 +91,8 @@ DapDashboardScreenForm
id: networkAddressCopyButtonImage id: networkAddressCopyButtonImage
anchors.fill: parent anchors.fill: parent
source: parent.containsMouse ? "qrc:/res/icons/ic_copy_hover.png" : "qrc:/res/icons/ic_copy.png" source: parent.containsMouse ? "qrc:/res/icons/ic_copy_hover.png" : "qrc:/res/icons/ic_copy.png"
sourceSize.width: width sourceSize.width: parent.width
sourceSize.height: height sourceSize.height: parent.height
} }
} }
...@@ -114,107 +109,109 @@ DapDashboardScreenForm ...@@ -114,107 +109,109 @@ DapDashboardScreenForm
anchors.leftMargin: 16 * pt anchors.leftMargin: 16 * pt
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 16 * pt anchors.rightMargin: 16 * pt
height: 56 * pt height: 67 * pt
Rectangle Rectangle
{ {
id: lineBalance
anchors.top: parent.top anchors.top: parent.top
width: parent.width width: parent.width
height: 1 * pt height: 1 * pt
color: "#908D9D" color: "#908D9D"
} }
RowLayout Rectangle
{ {
anchors.fill: parent anchors.top: lineBalance.bottom
anchors.topMargin: 24 * pt
anchors.bottom: parent.bottom
anchors.bottomMargin: 12 * pt
color: "transparent"
Image Image
{ {
id: currencyIcon id: currencyIcon
height: 40 * pt anchors.left: parent.left
width: 40 * pt height: 30 * pt
Layout.alignment: Qt.AlignLeft width: 30 * pt
// source: (type === "bitCoin") ? bitCoinImagePath : (type === "ether") ? ethereumImagePath : newGoldImagePath // Don't know how to deal with it yet source: "qrc:/res/icons/ic_cellframe.png"
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
} anchors.verticalCenter: parent.verticalCenter
Item
{
height: parent.height
width: 10 * pt
Layout.alignment: Qt.AlignLeft
} }
Text Text
{ {
id: currencyName id: currencyName
Layout.alignment: Qt.AlignLeft anchors.verticalCenter: parent.verticalCenter
anchors.left: currencyIcon.right
anchors.leftMargin: 10 * pt
font.pixelSize: 18 * pt font.pixelSize: 18 * pt
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
color: "#070023" color: "#070023"
text: name text: name
} width: 172 * pt
// Delimiters - see design horizontalAlignment: Text.AlignLeft
Item
{
height: parent.height
width: 16 * pt
}
Item
{
Layout.fillWidth: true
}
Item
{
height: parent.height
width: 16 * pt
}
Text
{
id: currencySum
Layout.alignment: Qt.AlignLeft
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: balance
}
Text
{
id: currencyCode
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: name
} }
Item Rectangle
{ {
Layout.fillWidth: true id: frameBalance
anchors.verticalCenter: parent.verticalCenter
color: "transparent"
width: 188 * pt
anchors.left: currencyName.right
anchors.leftMargin: 16 * pt
Text
{
id: currencySum
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: balance + " "
horizontalAlignment: Text.AlignLeft
}
Text
{
id: currencyCode
anchors.verticalCenter: parent.verticalCenter
anchors.left: currencySum.right
anchors.right: parent.right
font.pixelSize: 12 * pt
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
color: "#070023"
text: name
horizontalAlignment: Text.AlignLeft
}
} }
Text Text
{ {
id: currencyDollarEqv id: currencyDollarEqv
Layout.alignment: Qt.AlignRight anchors.verticalCenter: parent.verticalCenter
anchors.left: frameBalance.right
anchors.leftMargin: 16 * pt
anchors.right: parent.right
anchors.rightMargin: 16 * pt
font.pixelSize: 12 * pt font.pixelSize: 12 * pt
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
color: "#070023" color: "#070023"
text: "$" + emission + " USD" text: "$" + emission + " USD"
width: 188 * pt
horizontalAlignment: Text.AlignLeft
} }
} }
} }
......
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+ 5
− 1
View file @ 0a489113
...@@ -38,11 +38,13 @@ DapAbstractScreen ...@@ -38,11 +38,13 @@ DapAbstractScreen
Text Text
{ {
id: titleText
font.pixelSize: 20 * pt font.pixelSize: 20 * pt
font.family: "Roboto" font.family: "Roboto"
font.styleName: "Normal" font.styleName: "Normal"
font.weight: Font.Normal font.weight: Font.Normal
text: "My first wallet" text: "My first crypto wallet"
width: 185 * pt
} }
MouseArea MouseArea
...@@ -51,6 +53,8 @@ DapAbstractScreen ...@@ -51,6 +53,8 @@ DapAbstractScreen
width: 20 * pt width: 20 * pt
height: 20 * pt height: 20 * pt
hoverEnabled: true hoverEnabled: true
anchors.left: titleText.right
anchors.leftMargin: 12 * pt
Image Image
{ {
......
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