diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 0941a74e89beacfaf05a415bf8ab9a6f6167c41f..42c0f717954ffbe4049dc05fce75b6e08837b46d 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -78,5 +78,9 @@
<file>screen/mobile/History/DapHistoryTopPanelForm.ui.qml</file>
<file>screen/DapAbstractMenuTabWidget.qml</file>
<file>screen/DapAbstractMenuTabWidgetForm.ui.qml</file>
+ <file>res/icons/new-wallet_icon_dark_hover.png</file>
+ <file>res/icons/new-wallet_icon_dark.png</file>
+ <file>res/icons/ic_arrow_drop_down.png</file>
+ <file>res/icons/ic_arrow_drop_up.png</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cb31697a102f46e469caadcea519bad37cdb1fe
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png differ
diff --git a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea610723fdab5c0c86cfd53d7eed203c83e35cc4
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png differ
diff --git a/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark.png b/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f77b306db21a7c6b369f053a3238326bb5ee2cd6
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark.png differ
diff --git a/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark_hover.png b/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5eefb36de77731b84c7e1519880c1582b6c1b0
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/new-wallet_icon_dark_hover.png differ
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
index b9e20ee3fc2d58471b4d649c52598a7586bd8260..18984264ace1dd8310d95a7925dbccba51ad2a0e 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
@@ -2,7 +2,8 @@ import QtQuick 2.4
import QtQuick.Controls 2.0
import "../../"
-DapAbstractScreen {
+DapAbstractScreen
+{
id: dapdashboard
dapFrame.color: "green"
textTest.text: "Here text"
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
index d5d43c843182caac5e6eebc1db37be79d0c9ae8c..2a368e021ddbbc9ba11b352774de6e56ad1cbf42 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
@@ -1,5 +1,4 @@
import QtQuick 2.4
DapDashboardTopPanelForm {
- testButton.onClicked: dapServiceController.requestToService("ADD", 5)
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index b58555259e7bc024f2f444000d92b2f0484c5839..1b689c1d6207418c18e1a9ad5ae9a8dd9f5d9c49 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -1,26 +1,120 @@
import QtQuick 2.4
import QtQuick.Controls 2.0
+import "qrc:/widgets"
import "../../"
+
DapAbstractTopPanel
{
- property alias testButton: button
- Button
+ anchors.fill: parent
+
+ // Static text "Wallet"
+ Label
{
- id: button
- anchors.fill: parent
- text: "Press"
+ id:textHeaderWallet
+ text: qsTr("Wallet")
+ anchors.left: parent.left
+ anchors.leftMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
}
-}
+ // Wallet selection combo box
+ Rectangle
+ {
+ id: frameComboBox
+ anchors.left: textHeaderWallet.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 30 * pt
+ width: 148 * pt
+ color: "transparent"
+ DapComboBox
+ {
+ id: comboboxWallet
+ model: ListModel{
+ id:ÑonversionList
+ ListElement{text:"all wallets"}
+ ListElement{text:"Money for children"}
+ ListElement{text:"Money for education"}
+ ListElement{text:"Money for medicine"}
+ }
+ indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
+ indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
+ sidePaddingNormal:0 * pt
+ sidePaddingActive:16 * pt
+ topIndentActive:10 * pt
+ normalColorText:"#070023"
+ hilightColorText:"#FFFFFF"
+ normalColorTopText:"#FFFFFF"
+ hilightColorTopText:"#070023"
+ hilightColor: "#330F54"
+ normalTopColor: "#070023"
+ fontSizeComboBox: 14*px
+ widthPopupComboBoxNormal:148 * pt
+ widthPopupComboBoxActive:180 * pt
+ heightComboBoxNormal:24 * pt
+ heightComboBoxActive:44 * pt
+ bottomIntervalListElement:8 * pt
+ topEffect:false
+ x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
+ }
+ }
+ // Static wallet balance text "Wallet balance"
+ Label
+ {
+ id: headerWalletBalance
+ text: qsTr("Wallet balance")
+ anchors.left: frameComboBox.right
+ anchors.leftMargin: 70 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#ACAAB5"
+ }
+ // Dynamic wallet balance text
+ Label
+ {
+ id: textWalletBalance
+ text: "$ 3 050 745.3453289 USD"
+ anchors.left: headerWalletBalance.right
+ anchors.leftMargin: 18 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ font.family: DapMainApplicationWindow.dapFontRobotoRegular.name
+ font.pixelSize: 16 * pt
+ color: "#FFFFFF"
+ }
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
+ // Wallet create button
+ DapButton
+ {
+ id: addWalletButton
+ textButton: "New wallet"
+ anchors.right: parent.right
+ anchors.rightMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ normalImageButton: "qrc:/res/icons/new-wallet_icon_dark.png"
+ hoverImageButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+ heightButton: 24 * pt
+ widthButton: 120 * pt
+ widthImageButton: 28 * pt
+ heightImageButton: 28 * pt
+ indentImageLeftButton: 10 * pt
+ colorBackgroundNormal:"#070023"
+ colorBackgroundHover: "#D51F5D"
+ colorButtonTextNormal: "#FFFFFF"
+ colorButtonTextHover: "#FFFFFF"
+ indentTextRight: 20 * pt
+ fontSizeButton: 14 * pt
+ existenceImage:true
+ borderColorButton: "#000000"
+ borderWidthButton: 0
+ }
}
- ##^##*/
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index 2f385c188c017e7e5b08542e10508ff6b1bff0ba..1f0a5e1d2e71ef054963bdde7e641ee5c146b2e4 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit 2f385c188c017e7e5b08542e10508ff6b1bff0ba
+Subproject commit 1f0a5e1d2e71ef054963bdde7e641ee5c146b2e4