From f3fec51147fefffef22a3dccb3bafe51f05b73e2 Mon Sep 17 00:00:00 2001
From: Andrey Daragan <tl1989@gmail.com>
Date: Tue, 17 Dec 2019 16:55:34 +0300
Subject: [PATCH] [+] Added main window.
---
.../CellFrameDashboardGUI.pro | 2 +
CellFrameDashboardGUI/qml.qrc | 11 +++--
.../res/icons/cellframe-logo-dashboard.png | Bin 0 -> 7267 bytes
.../screen/DapMainApplicationWindow.qml | 5 ++
.../DapMainApplicationWindowForm.ui.qml | 44 ++++++++++++++++++
.../screen/Exchange/DapEchangeRightPanel.qml | 4 --
.../screen/Exchange/DapEchangeTabForm.ui.qml | 7 ---
.../screen/Exchange/DapExchangeRightPanel.qml | 4 ++
...i.qml => DapExchangeRightPanelForm.ui.qml} | 0
.../{DapEchangeTab.qml => DapExchangeTab.qml} | 2 +-
.../screen/Exchange/DapExchangeTabForm.ui.qml | 6 +++
CellFrameDashboardGUI/screen/main.qml | 6 ++-
libdap-qt-ui-qml | 2 +-
13 files changed, 74 insertions(+), 19 deletions(-)
create mode 100644 CellFrameDashboardGUI/res/icons/cellframe-logo-dashboard.png
create mode 100644 CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
create mode 100644 CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
delete mode 100644 CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanel.qml
delete mode 100644 CellFrameDashboardGUI/screen/Exchange/DapEchangeTabForm.ui.qml
create mode 100644 CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanel.qml
rename CellFrameDashboardGUI/screen/Exchange/{DapEchangeRightPanelForm.ui.qml => DapExchangeRightPanelForm.ui.qml} (100%)
rename CellFrameDashboardGUI/screen/Exchange/{DapEchangeTab.qml => DapExchangeTab.qml} (51%)
create mode 100644 CellFrameDashboardGUI/screen/Exchange/DapExchangeTabForm.ui.qml
diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index be1d35cb2..0fc9cfa58 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -60,6 +60,8 @@ CONFIG(debug, debug|release) {
INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ \
$$_PRO_FILE_PWD_/../DapRPCProtocol/
+OTHER_FILES += libdap-qt-ui-qml
+
SOURCES += \
$$PWD/DapChainNodeNetworkExplorer.cpp \
$$PWD/DapChainNodeNetworkModel.cpp \
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 29e28d2e6..23a276030 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -95,10 +95,6 @@
<file>screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file>
<file>screen/Exchange/DapExchangeScreen.qml</file>
<file>screen/Exchange/DapExchangeScreenForm.ui.qml</file>
- <file>screen/Exchange/DapEchangeTab.qml</file>
- <file>screen/Exchange/DapEchangeTabForm.ui.qml</file>
- <file>screen/Exchange/DapEchangeRightPanel.qml</file>
- <file>screen/Exchange/DapEchangeRightPanelForm.ui.qml</file>
<file>screen/Exchange/DapExchangeTopPanel.qml</file>
<file>screen/Exchange/DapExchangeTopPanelForm.ui.qml</file>
<file>screen/Dashboard/DapDashboardRightPanel.qml</file>
@@ -117,5 +113,12 @@
<file>screen/History/DapHistoryTabForm.ui.qml</file>
<file>screen/History/DapHistoryScreen.qml</file>
<file>screen/History/DapHistoryScreenForm.ui.qml</file>
+ <file>res/icons/cellframe-logo-dashboard.png</file>
+ <file>screen/DapMainApplicationWindow.qml</file>
+ <file>screen/DapMainApplicationWindowForm.ui.qml</file>
+ <file>screen/Exchange/DapExchangeRightPanel.qml</file>
+ <file>screen/Exchange/DapExchangeRightPanelForm.ui.qml</file>
+ <file>screen/Exchange/DapExchangeTab.qml</file>
+ <file>screen/Exchange/DapExchangeTabForm.ui.qml</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/res/icons/cellframe-logo-dashboard.png b/CellFrameDashboardGUI/res/icons/cellframe-logo-dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5750a3d5e9f1584186ea680a7ae502ccf149995
GIT binary patch
literal 7267
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
literal 0
HcmV?d00001
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
new file mode 100644
index 000000000..ba489a089
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.4
+
+DapMainApplicationWindowForm {
+
+}
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
new file mode 100644
index 000000000..743274161
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml
@@ -0,0 +1,44 @@
+import QtQuick 2.4
+import "qrc:/"
+
+DapMainWindowForm
+{
+ anchors.fill: parent
+ iconLogotype.source: "qrc:/res/icons/cellframe-logo-dashboard.png"
+ menuTabWidget.viewMenuTab.model: modelMenuTab
+
+ ListModel
+ {
+ id: modelMenuTab
+
+ ListElement
+ {
+ name: qsTr("Dashboard")
+ page: "qrc:/screen/Dashboard/DapDashboardTab.qml"
+ normalIcon: "qrc:/res/icons/icon_dashboard.png"
+ hoverIcon: "qrc:/res/icons/icon_dashboard_hover.png"
+ }
+
+ ListElement
+ {
+ name: qsTr("Exchange")
+ page: "qrc:/screen/Exchange/DapExchangeTab.qml"
+ normalIcon: "qrc:/res/icons/icon_exchange.png"
+ hoverIcon: "qrc:/res/icons/icon_exchange_hover.png"
+ }
+
+ ListElement
+ {
+ name: qsTr("History")
+ page: "qrc:/screen/History/DapHistoryTab.qml"
+ normalIcon: "qrc:/res/icons/icon_history.png"
+ hoverIcon: "qrc:/res/icons/icon_history_hover.png"
+ }
+ }
+
+}
+
+/*##^## Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+ ##^##*/
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanel.qml b/CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanel.qml
deleted file mode 100644
index eac859a6d..000000000
--- a/CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanel.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.4
-
-DapEchangeRightPanelForm {
-}
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapEchangeTabForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapEchangeTabForm.ui.qml
deleted file mode 100644
index 397bd3b19..000000000
--- a/CellFrameDashboardGUI/screen/Exchange/DapEchangeTabForm.ui.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.4
-import "qrc:/"
-
-DapTabForm {
- anchors.fill: parent
-
-}
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanel.qml b/CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanel.qml
new file mode 100644
index 000000000..84f151f48
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanel.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.4
+
+DapExchangeRightPanelForm {
+}
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanelForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/screen/Exchange/DapEchangeRightPanelForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapExchangeRightPanelForm.ui.qml
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapEchangeTab.qml b/CellFrameDashboardGUI/screen/Exchange/DapExchangeTab.qml
similarity index 51%
rename from CellFrameDashboardGUI/screen/Exchange/DapEchangeTab.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapExchangeTab.qml
index 432a703b1..c1fbda5a3 100644
--- a/CellFrameDashboardGUI/screen/Exchange/DapEchangeTab.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapExchangeTab.qml
@@ -1,4 +1,4 @@
import QtQuick 2.4
-DapEchangeTabForm {
+DapExchangeTabForm {
}
diff --git a/CellFrameDashboardGUI/screen/Exchange/DapExchangeTabForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapExchangeTabForm.ui.qml
new file mode 100644
index 000000000..96a8ae4f5
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/Exchange/DapExchangeTabForm.ui.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+Item {
+ width: 400
+ height: 400
+}
diff --git a/CellFrameDashboardGUI/screen/main.qml b/CellFrameDashboardGUI/screen/main.qml
index fb71b1e26..f5c439b2b 100755
--- a/CellFrameDashboardGUI/screen/main.qml
+++ b/CellFrameDashboardGUI/screen/main.qml
@@ -25,8 +25,10 @@ ApplicationWindow {
}
}
}
-
- DapUiQmlScreenMainWindow {
+
+ DapMainApplicationWindowForm
+ {
anchors.fill: parent
}
+
}
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index ce0c52777..5a65493a8 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit ce0c527779f9c9ea843c3808ee8ffd19ef196af4
+Subproject commit 5a65493a845f1514785f1d90ab9a298229332912
--
GitLab