diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 317b1da0207045a3385756bc0c22704a7c0c9a41..7d7c9f6db66df357d10ca5d8468a0a6b843cfc2e 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -17,7 +17,6 @@
<file>resources/icons/cellframe-logo-dashboard.png</file>
<file>screen/DapMainApplicationWindow.qml</file>
<file>screen/DapAbstractTab.qml</file>
- <file>screen/DapAbstractTabForm.ui.qml</file>
<file>screen/DapAbstractScreen.qml</file>
<file>screen/DapAbstractScreenForm.ui.qml</file>
<file>screen/DapAbstractRightPanel.qml</file>
@@ -173,6 +172,9 @@
<file>screen/desktop/Certificates/CertificatesLogic.qml</file>
<file>screen/desktop/Certificates/parts/TitleTextView.qml</file>
<file>screen/desktop/Certificates/parts/Utils.qml</file>
+ <file>screen/desktop/Wallet/DapWalletTab.qml</file>
+ <file>screen/desktop/Wallet/DapWalletTopPanel.qml</file>
+ <file>screen/desktop/DapTokensListView.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksPanel.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworkPanelButton.qml</file>
<file>screen/desktop/NetworksPanel/DapNetworksList.qml</file>
@@ -187,5 +189,6 @@
<file>resources/icons/Icon_sync_net_hover.svg</file>
<file>resources/icons/next-page.svg</file>
<file>resources/icons/next-page_hover.svg</file>
+ <file>screen/desktop/DapRightPanel_New.qml</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/screen/DapAbstractTab.qml b/CellFrameDashboardGUI/screen/DapAbstractTab.qml
index e51b4ba7f0265b5a56a163443b180d3843858766..886f205877c5c3efe39efd506a96986bbf39b420 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractTab.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractTab.qml
@@ -1,7 +1,14 @@
import QtQuick 2.4
+import "qrc:/widgets"
-DapAbstractTabForm
+DapTab
{
+ ///@detalis Currently displayed right pane
+ property DapRightPanel currentRightPanel
+
+ dapSeparator.width: 1 * pt
+ dapSeparator.color: "#E3E2E6"
+
Connections
{
target: dapRightPanel
diff --git a/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
deleted file mode 100644
index c4b98ed4f8d0823209aae7824c56b85741a08885..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.4
-import "qrc:/widgets"
-
-DapTab
-{
- ///@detalis Currently displayed right pane
- property DapRightPanel currentRightPanel
-
- dapSeparator.width: 1 * pt
- dapSeparator.color: "#E3E2E6"
-}
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
index a8870d253fb2e2f2a8e2416d1dc0c3829a6b99cc..37a4206174d1f00d22ed5f3182b528d6160090d8 100644
--- a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
@@ -9,6 +9,8 @@ Item {
id: dapMainWindow
///@detalis Path to the dashboard tab.
readonly property string dashboardScreen: "qrc:/screen/" + device + "/Dashboard/DapDashboardTab.qml"
+ ///@detalis Path to the dashboard tab.
+ readonly property string walletScreen: "qrc:/screen/" + device + "/Wallet/DapWalletTab.qml"
///@detalis Path to the exchange tab.
readonly property string exchangeScreen: "qrc:/screen/" + device + "/Exchange/DapExchangeTab.qml"
///@detalis Path to the history tab.
@@ -180,6 +182,12 @@ Item {
normalIcon: "qrc:/resources/icons/icon_dashboard.png",
hoverIcon: "qrc:/resources/icons/icon_dashboard_hover.png"
})
+ append({
+ name: qsTr("Wallet"),
+ page: walletScreen,
+ normalIcon: "qrc:/resources/icons/icon_dashboard.png",
+ hoverIcon: "qrc:/resources/icons/icon_dashboard_hover.png"
+ })
//TODO: The tab is disabled until the functional part is implemented
// append ({
// name: qsTr("Exchange"),
diff --git a/CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml b/CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml
new file mode 100644
index 0000000000000000000000000000000000000000..ac9befcc3e13cc5e4923602b63064b94b47d8aea
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml
@@ -0,0 +1,78 @@
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import "qrc:/widgets"
+
+Rectangle
+{
+ id: root
+
+ property string caption: "New Wallet"
+ property alias stackView: stackView
+
+ anchors.top: parent.top
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.margins: visible ? 24*pt : 0
+ anchors.leftMargin: 0
+ width: visible ? 350 * pt : 0;
+ border.color: "#E2E1E6"
+ border.width: 1 * pt
+ radius: 8 * pt
+
+ Item {
+ id: title
+
+ width: parent.width
+ height: 40 * pt
+
+ DapButton_New
+ {
+ id: backButton
+
+ height: 20 * pt
+ width: height
+ x: 16 * pt
+ anchors.verticalCenter: parent.verticalCenter
+
+ iconSource: stackView.depth > 1 ? "qrc:/resources/icons/back_icon.png" : "qrc:/resources/icons/Certificates/close_icon.svg"
+ hoverIconSource: stackView.depth > 1 ? "qrc:/resources/icons/back_icon_hover.png" : "qrc:/resources/icons/Certificates/close_icon_hover.svg"
+
+ iconSubcontroll.sourceSize: Qt.size(20 * pt, 20 * pt)
+ onClicked:
+ {
+ if(stackView.pop() === null)
+ root.visible = false;
+ }
+ }
+
+ Text {
+ id: titleText
+ anchors
+ {
+ left: backButton.right
+ leftMargin: 13 * pt
+ verticalCenter: parent.verticalCenter
+ }
+ font: quicksandFonts.bold14
+ color: "#3E3853"
+ text: qsTr(root.caption)
+ }
+ }
+ StackView
+ {
+ id: stackView
+ anchors
+ {
+ top:title.bottom
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
+ }
+ delegate: StackViewDelegate
+ {
+ pushTransition: StackViewTransition { }
+ }
+ }
+
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml b/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
new file mode 100644
index 0000000000000000000000000000000000000000..ac2d3b0dcd4c07ce3dc30a9941a39bed83c7aad3
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+Rectangle
+{
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ anchors.top: parent.top
+ border.color: "#E2E1E6"
+ border.width: 1 * pt
+ radius: 8 * pt
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
index 5388e64bc4351eb0181d0d1a7f74008638c8938a..b98722dfb9b629636217aad18daee047e7c85d94 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
@@ -249,6 +249,6 @@ DapAbstractTab
{
if(state !== "WALLETSHOW")
state = "WALLETCREATE"
- currentRightPanel = dapDashboardRightPanel.push({item:Qt.resolvedUrl(inputNameWallet)});
+ currentRightPanel = stackViewRightPanel.push({item:Qt.resolvedUrl(inputNameWallet)});
}
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
new file mode 100644
index 0000000000000000000000000000000000000000..175f072eb2ade94a9ab012391db840f6a8a4c90a
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import "qrc:/"
+import "../../"
+import "../"
+
+
+
+Item
+{
+ id: tab
+ Column
+ {
+ anchors.fill: parent
+
+ DapWalletTopPanel
+ {
+ id: topPanel
+ }
+
+ Item {
+ height: parent.height - topPanel.height
+ width: parent.width
+
+ DapTokensListView
+ {
+ anchors.margins: 24*pt
+ anchors.right: rightPanel.left
+ }
+ DapRightPanel_New
+ {
+ id: rightPanel
+ stackView.initialItem: firstPage
+ Component.onCompleted: stackView.push(secondPage)
+ }
+ Component
+ {
+ id:firstPage
+ Rectangle{
+ color: "#ff0000"
+ }
+ }
+ Component
+ {
+ id:secondPage
+ Rectangle{
+ color: "#00ff62"
+ }
+ }
+ }
+ }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..9cf6d75f18f3a7a9b47a4fdf3313a8bfaffe6acd
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import Demlabs 1.0
+import "../../"
+import "qrc:/widgets"
+
+DapTopPanel
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/mobile/Dashboard/DapDashboardTabForm.ui.qml b/CellFrameDashboardGUI/screen/mobile/Dashboard/DapDashboardTabForm.ui.qml
index 3da72e041496aad063f60922c40a4c83dc0228aa..233a196c9b5b4d160bbe8116b960ad6cec8f693b 100644
--- a/CellFrameDashboardGUI/screen/mobile/Dashboard/DapDashboardTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/mobile/Dashboard/DapDashboardTabForm.ui.qml
@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
-DapTabForm {
+DapTab {
id: dapDashboardTab
anchors.fill: parent
diff --git a/CellFrameDashboardGUI/screen/mobile/Exchange/DapExchangeTabForm.ui.qml b/CellFrameDashboardGUI/screen/mobile/Exchange/DapExchangeTabForm.ui.qml
index 1285c26f231c379e5aeda5aabac836ce5d92c554..882b7efc1d4947cc91c95214e3f9c980720b302c 100644
--- a/CellFrameDashboardGUI/screen/mobile/Exchange/DapExchangeTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/mobile/Exchange/DapExchangeTabForm.ui.qml
@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
-DapTabForm {
+DapTab {
id: dapExchangeTab
anchors.fill: parent
diff --git a/CellFrameDashboardGUI/screen/mobile/History/DapHistoryTabForm.ui.qml b/CellFrameDashboardGUI/screen/mobile/History/DapHistoryTabForm.ui.qml
index c9a741fccf9a8bd87a940bdd85f22f84cff8fe04..50490e137ed55e3368bb0f7f8ddd4eb348d7d445 100644
--- a/CellFrameDashboardGUI/screen/mobile/History/DapHistoryTabForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/mobile/History/DapHistoryTabForm.ui.qml
@@ -2,7 +2,7 @@ import QtQuick 2.4
import "qrc:/"
import "../../"
-DapTabForm {
+DapTab {
id: dapHistoryTab
anchors.fill: parent
diff --git a/cellframe-ui-sdk b/cellframe-ui-sdk
index 3c2a665989ccc6a3ec3c86a48071f51d9a2c9e7b..d9c7a081eea35af0f4c3f373f3b4d51c1202d4ae 160000
--- a/cellframe-ui-sdk
+++ b/cellframe-ui-sdk
@@ -1 +1 @@
-Subproject commit 3c2a665989ccc6a3ec3c86a48071f51d9a2c9e7b
+Subproject commit d9c7a081eea35af0f4c3f373f3b4d51c1202d4ae
diff --git a/dap-ui-sdk b/dap-ui-sdk
index ab9d1c16382aefc65fde5db8d4ebe85c0e2023c0..b522735cb809ea1a99f8531ce1d73e9abe75a638 160000
--- a/dap-ui-sdk
+++ b/dap-ui-sdk
@@ -1 +1 @@
-Subproject commit ab9d1c16382aefc65fde5db8d4ebe85c0e2023c0
+Subproject commit b522735cb809ea1a99f8531ce1d73e9abe75a638