From ef3210d35b54315495c25b24148cc98571286c96 Mon Sep 17 00:00:00 2001
From: alexandr <alexandrmruchok@gmail.com>
Date: Fri, 23 Oct 2020 00:04:57 +0300
Subject: [PATCH] [-] DapAbstractTabForm; [+] Wallet point to left menu; [+]
DapTokensListView, DapWalletTab, DapWalletTopPanel;
---
CellFrameDashboardGUI/qml.qrc | 4 ++-
.../screen/DapAbstractTab.qml | 9 ++++++-
.../screen/DapAbstractTabForm.ui.qml | 11 --------
.../screen/DapMainApplicationWindow.qml | 8 ++++++
.../screen/desktop/DapTokensListView.qml | 11 ++++++++
.../screen/desktop/Wallet/DapWalletTab.qml | 27 +++++++++++++++++++
.../desktop/Wallet/DapWalletTopPanel.qml | 10 +++++++
.../Dashboard/DapDashboardTabForm.ui.qml | 2 +-
.../mobile/Exchange/DapExchangeTabForm.ui.qml | 2 +-
.../mobile/History/DapHistoryTabForm.ui.qml | 2 +-
10 files changed, 70 insertions(+), 16 deletions(-)
delete mode 100644 CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
create mode 100644 CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
create mode 100644 CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
create mode 100644 CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 940d52a..7dea54a 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,5 +172,8 @@
<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>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/screen/DapAbstractTab.qml b/CellFrameDashboardGUI/screen/DapAbstractTab.qml
index e51b4ba..886f205 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 c4b98ed..0000000
--- 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 850bf02..7bd3c89 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.
@@ -162,6 +164,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/DapTokensListView.qml b/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
new file mode 100644
index 0000000..ff25aa1
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Rectangle
+{
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ border.color: "#E2E1E6"
+ border.width: 1 * pt
+ radius: 8 * pt
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
new file mode 100644
index 0000000..97e5cc2
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import "qrc:/"
+import "../../"
+import "../"
+
+
+
+Item
+{
+// // Install the top panel widget
+ id: tab
+// Column
+// {
+ anchors.fill: parent
+ DapWalletTopPanel
+ {
+ id: topPanel
+ }
+
+ DapTokensListView
+ {
+ anchors.top: topPanel.bottom
+ anchors.margins: 24*pt
+ }
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTopPanel.qml
new file mode 100644
index 0000000..9cf6d75
--- /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 3da72e0..233a196 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 1285c26..882b7ef 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 c9a741f..50490e1 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
--
GitLab