From 9b4298e33d4d4b219166e88263a09484fd351759 Mon Sep 17 00:00:00 2001
From: alexandr <alexandrmruchok@gmail.com>
Date: Tue, 27 Oct 2020 10:21:01 +0200
Subject: [PATCH] [+] DapRightPanel_New
---
CellFrameDashboardGUI/qml.qrc | 1 +
.../screen/desktop/DapRightPanel_New.qml | 78 +++++++++++++++++++
.../screen/desktop/DapTokensListView.qml | 1 +
.../desktop/Dashboard/DapDashboardTab.qml | 2 +-
.../screen/desktop/Wallet/DapWalletTab.qml | 41 ++++++++--
dap-ui-sdk | 2 +-
6 files changed, 115 insertions(+), 10 deletions(-)
create mode 100644 CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 3381096..7d7c9f6 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -189,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/desktop/DapRightPanel_New.qml b/CellFrameDashboardGUI/screen/desktop/DapRightPanel_New.qml
new file mode 100644
index 0000000..ac9befc
--- /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
index ff25aa1..ac2d3b0 100644
--- a/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
+++ b/CellFrameDashboardGUI/screen/desktop/DapTokensListView.qml
@@ -5,6 +5,7 @@ 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 5388e64..b98722d 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
index 97e5cc2..175f072 100644
--- a/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Wallet/DapWalletTab.qml
@@ -8,20 +8,45 @@ import "../"
Item
{
-// // Install the top panel widget
id: tab
-// Column
-// {
+ Column
+ {
anchors.fill: parent
+
DapWalletTopPanel
{
id: topPanel
}
- DapTokensListView
- {
- anchors.top: topPanel.bottom
- anchors.margins: 24*pt
- }
+ 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/dap-ui-sdk b/dap-ui-sdk
index ac371d6..b522735 160000
--- a/dap-ui-sdk
+++ b/dap-ui-sdk
@@ -1 +1 @@
-Subproject commit ac371d6c6a4b019f5306faaa2c39ab09450bc845
+Subproject commit b522735cb809ea1a99f8531ce1d73e9abe75a638
--
GitLab