diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 4c146773938f73aaeea929fe758dda70630efa6b..d00e6d187cd143f10a398e6d8cd5dec47719d85a 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -130,5 +130,14 @@
<file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
<file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
<file>res/icons/sell_icon.png</file>
+ <file>res/icons/ic_copy.png</file>
+ <file>res/icons/ic_copy_hover.png</file>
+ <file>res/icons/ic_edit.png</file>
+ <file>res/icons/ic_edit_hover.png</file>
+ <file>res/icons/ic_klvn.png</file>
+ <file>res/icons/new-payment_icon.png</file>
+ <file>res/icons/tkn2_icon.png</file>
+ <file>res/icons/tkn1_icon_light.png</file>
+ <file>res/icons/ng_icon.png</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/res/icons/ic_copy.png b/CellFrameDashboardGUI/res/icons/ic_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea9ce9fcdc6f3e706825b35dd57bf4dd32049a55
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_copy.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_copy_hover.png b/CellFrameDashboardGUI/res/icons/ic_copy_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8b8604961aab018cdb9245da982c47f716d0f27
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_copy_hover.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_edit.png b/CellFrameDashboardGUI/res/icons/ic_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8d771ef0093022daec04006464e07d6102aa6b
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_edit.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_edit_hover.png b/CellFrameDashboardGUI/res/icons/ic_edit_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dadc6b016f3168346a55aac225ce0ac68596ae0
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_edit_hover.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_klvn.png b/CellFrameDashboardGUI/res/icons/ic_klvn.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a4d92ddb1bff522d1541b955d9f8efafe26e106
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_klvn.png differ
diff --git a/CellFrameDashboardGUI/res/icons/new-payment_icon.png b/CellFrameDashboardGUI/res/icons/new-payment_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4403c21304fe8d7fc5b71c8288071332dd3da515
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/new-payment_icon.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ng_icon.png b/CellFrameDashboardGUI/res/icons/ng_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc253b21cd5772500f8855be1e4abeef4d0fe1c1
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ng_icon.png differ
diff --git a/CellFrameDashboardGUI/res/icons/tkn1_icon_light.png b/CellFrameDashboardGUI/res/icons/tkn1_icon_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bfeabc20d244beed4993eacd1c908491d6a0194
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/tkn1_icon_light.png differ
diff --git a/CellFrameDashboardGUI/res/icons/tkn2_icon.png b/CellFrameDashboardGUI/res/icons/tkn2_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b00fcd386c8703f00fc367dea5bf4cfc1e6a066
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/tkn2_icon.png differ
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
index 18984264ace1dd8310d95a7925dbccba51ad2a0e..522ea2bf833277b100aad6cdbb3092d2406d5063 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
@@ -1,32 +1,367 @@
import QtQuick 2.4
import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.2
+import "qrc:/widgets"
import "../../"
DapAbstractScreen
{
id: dapdashboard
- dapFrame.color: "green"
- textTest.text: "Here text"
-
- Item{
- id: dapButtonTest
- data: buttonTest
- width: 100
- height: 100
- anchors.centerIn: parent
- }
+ dapFrame.color: "#FFFFFF"
+ anchors.fill: parent
+ anchors.leftMargin: 24 * pt
+ anchors.rightMargin: 24 * pt
+
+ // Paths to currency emblems
+ property string bitCoinImagePath: "qrc:/res/icons/tkn1_icon_light.png"
+ property string ethereumImagePath: "qrc:/res/icons/tkn2_icon.png"
+ property string newGoldImagePath: "qrc:/res/icons/ng_icon.png"
+ property string kelvinImagePath: "qrc:/res/icons/ic_klvn.png"
+
+ Rectangle
+ {
+ id: titleBlock
+ anchors.top: parent.top
+ anchors.topMargin: 20 * pt
+ anchors.bottomMargin: 20 * pt
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 36 * pt
+
+ RowLayout
+ {
+ anchors.fill: parent
+
+ Text
+ {
+ font.pixelSize: 20 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ text: "My first wallet"
+ }
- Item {
- id: dapTextTest
- data: textTest
+ MouseArea
+ {
+ id: walletNameEditButton
+ width: 20 * pt
+ height: 20 * pt
+ hoverEnabled: true
- anchors.top: dapButtonTest.bottom
- anchors.horizontalCenter: parent.horizontalCenter
+ Image
+ {
+ id: walletNameEditButtonImage
+ anchors.fill: parent
+ source: parent.containsMouse ? "qrc:/res/icons/ic_edit_hover.png" : "qrc:/res/icons/ic_edit.png"
+ sourceSize.width: width
+ sourceSize.height: height
+
+ }
+ }
+
+ Item
+ {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ }
+
+ DapButton
+ {
+ widthButton: 132 * pt
+ heightButton: 36 * pt
+ textButton: "New payment"
+ colorBackgroundButton: "#3E3853"
+ colorBackgroundHover: "red"
+ colorButtonTextNormal: "#FFFFFF"
+ colorButtonTextHover: "#FFFFFF"
+ normalImageButton: "qrc:/res/icons/new-payment_icon.png"
+ hoverImageButton: "qrc:/res/icons/new-payment_icon.png"
+ widthImageButton: 20 * pt
+ heightImageButton: 20 * pt
+ indentImageLeftButton: 20 * pt
+ indentTextRight: 20 * pt
+ }
+ }
}
-}
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:480;width:640}
+ ListView
+ {
+ anchors.top: titleBlock.bottom
+ anchors.topMargin: 20 * pt
+ anchors.bottom: parent.bottom
+ width: parent.width
+ spacing: 5 * pt
+ clip: true
+ model:
+ ListModel
+ {
+ ListElement
+ {
+ name: "Kelvin Testnet"
+ address: "KLJHuhlkjshfausdh7865lksfahHKLUIHKJFHKLUESAHFILKUHEWKUAFHjkhfdkslusfkhgs"
+ money: [
+ ListElement
+ {
+ type: "bitCoin"
+ sum: 3487256
+ eq: "$ 3498750"
+ },
+ ListElement
+ {
+ type: "ether"
+ sum: 67896
+ eq: "$ 78687"
+ },
+ ListElement
+ {
+ type: "newGold"
+ sum: 675573
+ eq: "$ 987978"
+ }
+ ]
+ }
+
+ ListElement
+ {
+ name: "Marketnet"
+ address: "lkajdsfeislsaIJEUfesIJEFHJISEFIsdfLIJFEISHFUSKEIEWEQLIJSlijfsfjlijeIEJJE"
+ money: [
+ ListElement
+ {
+ type: "bitCoin"
+ sum: 3487256
+ eq: "$ 3498750"
+ },
+ ListElement
+ {
+ type: "ether"
+ sum: 67896
+ eq: "$ 78687"
+ },
+ ListElement
+ {
+ type: "newGold"
+ sum: 675573
+ eq: "$ 987978"
+ },
+ ListElement
+ {
+ type: "ether"
+ sum: 6743896
+ eq: "$ 7843687"
+ }
+ ]
+ }
+ }
+
+ delegate:
+ Column
+ {
+ width: parent.width
+
+ Rectangle
+ {
+ id: stockNameBlock
+ height: 30 * pt
+ width: parent.width
+ color: "#908D9D"
+
+ Text
+ {
+ id: stockNameText
+ anchors.left: parent.left
+ anchors.leftMargin: 16 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: 12 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#FFFFFF"
+ verticalAlignment: Qt.AlignVCenter
+ text: name
+ }
+ }
+
+ Row
+ {
+ id: networkAddressBlock
+ height: 40 * pt
+ width: parent.width
+
+ Item
+ {
+ width: 16 * pt
+ height: parent.height
+ }
+
+ Text
+ {
+ id: networkAddressLabel
+ anchors.verticalCenter: parent.verticalCenter
+ font.pixelSize: 12 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#908D9D"
+ text: qsTr("Network address")
+ }
+
+ Item
+ {
+ width: 36 * pt
+ height: parent.height
+ }
+
+ Text
+ {
+ id: networkAddressValue
+ anchors.verticalCenter: parent.verticalCenter
+ width: 200 * pt
+ font.pixelSize: 12 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#908D9D"
+ text: address
+ elide: Text.ElideRight
+ }
+
+ MouseArea
+ {
+ id: networkAddressCopyButton
+ anchors.verticalCenter: parent.verticalCenter
+ width: 20 * pt
+ height: 20 * pt
+ hoverEnabled: true
+
+ Image
+ {
+ id: networkAddressCopyButtonImage
+ anchors.fill: parent
+ source: parent.containsMouse ? "qrc:/res/icons/ic_copy_hover.png" : "qrc:/res/icons/ic_copy.png"
+ sourceSize.width: width
+ sourceSize.height: height
+
+ }
+ }
+ }
+
+ Repeater
+ {
+ width: parent.width
+ model: money
+
+ Rectangle
+ {
+ anchors.left: parent.left
+ anchors.leftMargin: 16 * pt
+ anchors.right: parent.right
+ anchors.rightMargin: 16 * pt
+ height: 56 * pt
+
+ Rectangle
+ {
+ anchors.top: parent.top
+ width: parent.width
+ height: 1 * pt
+ color: "#908D9D"
+ }
+
+ RowLayout
+ {
+ anchors.fill: parent
+
+ Image
+ {
+ id: currencyIcon
+ height: 40 * pt
+ width: 40 * pt
+ Layout.alignment: Qt.AlignLeft
+ source: (type === "bitCoin") ? bitCoinImagePath : (type === "ether") ? ethereumImagePath : newGoldImagePath // Don't know how to deal with it yet
+ sourceSize.width: width
+ sourceSize.height: height
+ }
+
+ Item
+ {
+ height: parent.height
+ width: 10 * pt
+ Layout.alignment: Qt.AlignLeft
+ }
+
+ Text
+ {
+ id: currencyName
+ Layout.alignment: Qt.AlignLeft
+ font.pixelSize: 18 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#070023"
+ text: type
+ }
+ // Delimiters - see design
+ Item
+ {
+ height: parent.height
+ width: 16 * pt
+ }
+
+
+ Item
+ {
+ Layout.fillWidth: true
+ }
+
+
+ Item
+ {
+ height: parent.height
+ width: 16 * pt
+ }
+
+ Text
+ {
+ id: currencySum
+ Layout.alignment: Qt.AlignHCenter
+ font.pixelSize: 18 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#070023"
+ text: sum
+ }
+
+ Text
+ {
+ id: currencyCode
+ font.pixelSize: 18 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#070023"
+ text: (type === "bitCoin") ? "BTC" : (type === "ether") ? "ETH" : (type === "newGold") ? "NGD" : "KLVN"
+ }
+
+ Item
+ {
+ Layout.fillWidth: true
+ }
+
+ Text
+ {
+ id: currencyDollarEqv
+ Layout.alignment: Qt.AlignRight
+ font.pixelSize: 18 * pt
+ font.family: "Roboto"
+ font.styleName: "Normal"
+ font.weight: Font.Normal
+ color: "#070023"
+ text: eq
+ }
+ }
+ }
+ }
+ }
+ }
}
-##^##*/