diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index 3428643e00b704d025617089d8234734af9ae270..57225d3208d22cbe2566a8080f2ab7dce64b6973 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -93,7 +93,7 @@ HEADERS += \
DapUiQmlWidgetChainBallance.h \
DapUiQmlWidgetChainBlockExplorer.h \
DapUiQmlWidgetChainNodeLogs.h \
- DapUiQmlScreenDashboard.h \
+# DapUiQmlScreenDashboard.h \
DapUiQmlWidgetChainOperations.h \
DapUiQmlWidgetChainTransactions.h \
DapUiQmlWidgetModel.h \
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.cpp b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.cpp
deleted file mode 100644
index ea06dd6231bea21f54cd8fcab6330af89513af25..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlScreenDashboard.h"
-
-DapUiQmlScreenDashboard::DapUiQmlScreenDashboard()
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.h b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.h
deleted file mode 100644
index 1417dcb673466a1f62c6d5663d79f3bfdec3c939..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef DAPUIQMLSCREENDASHBOARD_H
-#define DAPUIQMLSCREENDASHBOARD_H
-
-
-class DapUiQmlScreenDashboard
-{
-public:
- DapUiQmlScreenDashboard();
-};
-
-#endif // DAPUIQMLSCREENDASHBOARD_H
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
old mode 100755
new mode 100644
index 9b79c70f1f71f66a496fa103bc1ae92758dcf7c9..6d704c2b330fb84a050e93dc6ef06a16c60d15ff
--- a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
@@ -1,189 +1,266 @@
import QtQuick 2.9
-import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.4
-
-Page {
- id: dapUiQmlScreenDashboard
- title: qsTr("General")
-
- Rectangle
- {
- id: rectangleTabsBorder
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- color: "#B5B5B5"
- width: 150
+import CellFrameDashboard 1.0
+import QtQml 2.12
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.12
+
+
+DapUiQmlScreen {
+ // TODO: Don't delete it
+// sproperty alias rightPanelLoaderSource: rightPanelLoader.source
+
+ id: dapUiQmlScreenDialog
+ title: qsTr("Dashboard")
+ anchors.fill: parent
+
+ ColumnLayout {
+ anchors.fill: parent
+ anchors.topMargin: 20 * pt
+ anchors.leftMargin: 24 * pt
+ anchors.rightMargin: 24 * pt
+ spacing: 20 * pt
+
Rectangle {
- id: rectangleTabs
- anchors.fill: parent
- anchors.leftMargin: 1
- anchors.rightMargin: 1
-
- color: "#E1E4E6"
- ListView {
- id: listViewTabs
- anchors.fill: parent
- model: listModelTabs
- spacing: 3
-
- ListModel {
- id: listModelTabs
-
- ListElement {
- name: qsTr("Home")
- page: "DapUiQmlScreenDialog.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
- ListElement {
- name: qsTr("Settings")
- page: "DapQmlScreenAbout.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
- ListElement {
- name: qsTr("Logs")
- page: "DapUiQmlWidgetChainNodeLogs.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
- ListElement {
- name: qsTr("History")
- page: "DapUiQmlScreenHistory.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
+ Layout.fillWidth: true
+ height: 36 * pt
- ListElement {
- name: qsTr("Console")
- page: "DapUiQmlScreenConsoleForm.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
+ Text {
+ anchors.left: parent.left
+ font.pixelSize: 20 * pt
+ font.family: fontRobotoRegular.name
+ verticalAlignment: Qt.AlignVCenter
+ text: "My first wallet"
+ }
- ListElement {
- name: qsTr("About")
- page: "DapQmlScreenAbout.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
+ Button {
+ anchors.top: parent.top
+ width: 132 * pt
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ text: "New payment"
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ highlighted: true
+
+ background: Rectangle {
+ color: "#3E3853"
}
+ icon.width: 20 * pt
+ icon.height: 20 * pt
+ icon.source: "qrc:/Resources/Icons/new-payment_icon.png"
+ icon.color: "#FFFFFF"
+ }
+ }
- delegate:
- Column {
- id: componentTab
- height: 148
- Rectangle {
- id: componentItem
- property bool isPushed: listViewTabs.currentIndex === index
+ ListView {
+ id: listViewToken
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ model: dapWalletFilterModel
+ section.property: "networkDisplayRole"
+ section.criteria: ViewSection.FullString
+ section.delegate: Rectangle {
+ width: parent.width
+ height: 30 * pt
+ color: "#908D9D"
- width: listViewTabs.width
- height: 150
- color: "transparent"
- Rectangle
- {
- id: spacerItem1
- height: 25
- anchors.top: parent.top
- }
- Image
- {
- id: imageItem
- anchors.top: spacerItem1.bottom
- source: model.source
- height: 60
- width: 60
- anchors.horizontalCenter: parent.horizontalCenter
- }
- Rectangle
- {
- id: spacerItem2
- anchors.top: imageItem.bottom
- height: 16
- }
- Text
- {
- id: textItemMenu
- anchors.top: spacerItem2.bottom
- text: qsTr(name)
- color: "#505559"
- anchors.horizontalCenter: parent.horizontalCenter
- font.family: "Roboto"
- font.weight: componentItem.isPushed ? Font.Normal : Font.Light
- font.pointSize: 16
- }
- Rectangle
- {
- id: spacerItem3
- anchors.top: textItemMenu.bottom
- height: 30
- }
- MouseArea {
- anchors.fill: parent
- hoverEnabled: true
- onEntered:
- {
- textItemMenu.font.weight = Font.Normal
- if(!componentItem.isPushed) componentItem.color ="#B0B0B5"
- }
- onExited:
- {
- textItemMenu.font.weight = Font.Light
- if(!componentItem.isPushed) componentItem.color = "transparent"
- }
+ Text {
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#FFFFFF"
+ verticalAlignment: Qt.AlignVCenter
+ text: section
+ }
+ }
- onClicked:
- {
- listViewTabs.currentIndex = index
- stackViewScreenDashboard.setSource(Qt.resolvedUrl(page))
- }
- }
- onIsPushedChanged: {
- componentItem.color = (isPushed ? "#D0D3D6" : "transparent");
+ clip: true
+
+ delegate: Component {
+
+ ListView
+ {
+ width: listViewToken.width
+ height: contentItem.height
+ leftMargin: 16 * pt
+ interactive: false
+
+ model: walletTokenListDisplayRole
+ section.property: "modelData.wallet"
+ section.delegate: Component{
+ Rectangle {
+ width: parent.width
+ height: 36 * pt
+
+ Row {
+ anchors.fill: parent
+
+ Text {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ verticalAlignment: Qt.AlignVCenter
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#908D9D"
+
+ text: "Wallet address:"
+ }
+
+ Item {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ width: 36 * pt
+ }
+
+ Text {
+ id: titleWalletAddress
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ width: 180 * pt
+ verticalAlignment: Qt.AlignVCenter
+ elide: Text.ElideRight
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 10 * pt
+ color: "#757184"
+ text: section
+ }
+
+ Item {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ width: 4 * pt
+ }
+
+ Rectangle {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ width: 16 * pt
+
+ Image {
+ id: imageButton
+ anchors.centerIn: parent
+ width: 16 * pt
+ height: 16 * pt
+ source: "qrc:/Resources/Icons/ic_copy.png"
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ hoverEnabled: true
+
+ onEntered: imageButton.source = "qrc:/Resources/Icons/ic_copy_hover.png"
+ onExited: imageButton.source = "qrc:/Resources/Icons/ic_copy.png"
+ onClicked: clipboard.setText(titleWalletAddress.text);
+ }
+ }
+ }
}
}
- Rectangle
+
+ delegate: Component
{
- id: borderItem
- height: 1
- color: "#B5B5B5"
- width: parent.width
+
+ Rectangle {
+ width: parent.width - 16 * pt
+ height: 62 * pt
+ color: "#E3E2E6"
+
+ Rectangle {
+ anchors.fill: parent
+ anchors.topMargin: 1
+
+ Label {
+ anchors.left: parent.left
+ verticalAlignment: Qt.AlignVCenter
+ height: parent.height
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 18 * pt
+ color: "#070023"
+ text: model.modelData.name
+ }
+
+ Label {
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: 1
+ height: parent.height
+ verticalAlignment: Qt.AlignVCenter
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#070023"
+ text: model.modelData.balance + " " + model.modelData.name
+ }
+
+ Label {
+ anchors.right: parent.right
+ height: parent.height
+ verticalAlignment: Qt.AlignVCenter
+ horizontalAlignment: Qt.AlignRight
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#757184"
+ text: "$ " + model.modelData.balance + " USD"
+ }
+
+ }
+ }
}
+
+
+
}
+
}
- focus: true
}
}
- Rectangle
- {
- id: rectangleStatusBar
- anchors.left: rectangleTabsBorder.right
- anchors.top: parent.top
- anchors.right: parent.right
- color: "#B5B5B5"
- height: 60
- Rectangle
- {
- anchors.fill: parent
- anchors.bottomMargin: 1
- color: "#F2F2F4"
- }
- }
+ // TODO: Don't delete it too
+// RoundButton {
+// text: qsTr("+")
+// highlighted: true
+// anchors.margins: 10
+// anchors.right: parent.right
+// anchors.bottom: parent.bottom
+// onClicked: {
+// listViewDapWidgets.addWidget()
+// }
+// }
- Rectangle {
- id: mainDashboard
- anchors.left: rectangleTabsBorder.right
- anchors.top: rectangleStatusBar.bottom
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- border.color: "whitesmoke"
+// Rectangle {
+// id: rightPanel
+// anchors.bottom: parent.bottom
+// anchors.top: parent.top
+// anchors.right: parent.right
+// width: 400 * pt
- Loader {
- id: stackViewScreenDashboard
- clip: true
- anchors.fill: parent
- source: "DapUiQmlScreenDialog.qml"
- }
- }
-}
+// Loader {
+// id: rightPanelLoader
+// clip: true
+// anchors.fill: parent
+// source: "DapUiQmlWidgetLastActions.qml"
+// }
+
+// Connections {
+// target: rectangleStatusBar
+// onAddWalletPressedChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml"
+// }
+// Connections {
+// target: rightPanelLoader.item
+// onPressedCloseAddWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml"
+// onPressedDoneCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml"
+// onPressedNextButtonChanged: {
+// if(rightPanelLoader.item.isWordsRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryNotesForm.ui.qml";
+// else if(rightPanelLoader.item.isQRCodeRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryQrForm.ui.qml";
+// else if(rightPanelLoader.item.isExportToFileRecoveryMethodChecked) console.debug("Export to file"); /*TODO: create dialog select file to export */
+// else rightPanelLoader.source = "DapUiQmlWalletCreatedForm.ui.qml"
+// }
+// onPressedBackButtonChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml"
+// onPressedNextButtonForCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWalletCreatedForm.ui.qml"
+// }
+// }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
deleted file mode 100644
index 6ae50c09862a71cadd7793c59e05fc8112c9423f..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
+++ /dev/null
@@ -1,288 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
-import QtQml 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.12
-
-
-Page {
- // TODO: Don't delete it
-// sproperty alias rightPanelLoaderSource: rightPanelLoader.source
-
- id: dapUiQmlScreenDialog
- title: qsTr("Dashboard")
- anchors.fill: parent
-
- ColumnLayout {
- anchors.fill: parent
- anchors.topMargin: 20 * pt
- anchors.leftMargin: 24 * pt
- anchors.rightMargin: 24 * pt
- spacing: 20 * pt
-
- Rectangle {
- Layout.fillWidth: true
- height: 36 * pt
-
- Text {
- anchors.left: parent.left
- font.pixelSize: 20 * pt
- font.family: fontRobotoRegular.name
- verticalAlignment: Qt.AlignVCenter
- text: "My first wallet"
- }
-
- Button {
- anchors.top: parent.top
- width: 132 * pt
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- text: "New payment"
- font.family: fontRobotoRegular.name
- font.pixelSize: 12 * pt
- highlighted: true
-
- background: Rectangle {
- color: "#3E3853"
- }
-
- icon.width: 20 * pt
- icon.height: 20 * pt
- icon.source: "qrc:/Resources/Icons/new-payment_icon.png"
- icon.color: "#FFFFFF"
- }
- }
-
-
- ListView {
- id: listViewToken
- Layout.fillWidth: true
- Layout.fillHeight: true
- model: dapWalletFilterModel
- section.property: "networkDisplayRole"
- section.criteria: ViewSection.FullString
- section.delegate: Rectangle {
- width: parent.width
- height: 30 * pt
- color: "#908D9D"
-
- Text {
- anchors.fill: parent
- anchors.leftMargin: 16 * pt
- font.family: fontRobotoRegular.name
- font.pixelSize: 12 * pt
- color: "#FFFFFF"
- verticalAlignment: Qt.AlignVCenter
- text: section
- }
- }
-
-
- clip: true
-
- delegate: Component {
-
- ListView
- {
- width: listViewToken.width
- height: contentItem.height
- leftMargin: 16 * pt
- interactive: false
-
- model: walletTokenListDisplayRole
- section.property: "modelData.wallet"
- section.delegate: Component{
- Rectangle {
- width: parent.width
- height: 36 * pt
-
- Row {
- anchors.fill: parent
-
- Text {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- verticalAlignment: Qt.AlignVCenter
- font.family: fontRobotoRegular.name
- font.pixelSize: 12 * pt
- color: "#908D9D"
-
- text: "Wallet address:"
- }
-
- Item {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 36 * pt
- }
-
- Text {
- id: titleWalletAddress
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 180 * pt
- verticalAlignment: Qt.AlignVCenter
- elide: Text.ElideRight
- font.family: fontRobotoRegular.name
- font.pixelSize: 10 * pt
- color: "#757184"
- text: section
- }
-
- Item {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 4 * pt
- }
-
- Rectangle {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: 16 * pt
-
- Image {
- id: imageButton
- anchors.centerIn: parent
- width: 16 * pt
- height: 16 * pt
- source: "qrc:/Resources/Icons/ic_copy.png"
- }
-
- MouseArea {
- anchors.fill: parent
- hoverEnabled: true
-
- onEntered: imageButton.source = "qrc:/Resources/Icons/ic_copy_hover.png"
- onExited: imageButton.source = "qrc:/Resources/Icons/ic_copy.png"
- onClicked: clipboard.setText(titleWalletAddress.text);
- }
- }
- }
- }
- }
-
- delegate: Component
- {
-
- Rectangle {
- width: parent.width - 16 * pt
- height: 62 * pt
- color: "#E3E2E6"
-
- Rectangle {
- anchors.fill: parent
- anchors.topMargin: 1
-
- Label {
- anchors.left: parent.left
- verticalAlignment: Qt.AlignVCenter
- height: parent.height
- font.family: fontRobotoRegular.name
- font.pixelSize: 18 * pt
- color: "#070023"
- text: model.modelData.name
- }
-
- Label {
- anchors.horizontalCenter: parent.horizontalCenter
- width: 1
- height: parent.height
- verticalAlignment: Qt.AlignVCenter
- font.family: fontRobotoRegular.name
- font.pixelSize: 12 * pt
- color: "#070023"
- text: model.modelData.balance + " " + model.modelData.name
- }
-
- Label {
- anchors.right: parent.right
- height: parent.height
- verticalAlignment: Qt.AlignVCenter
- horizontalAlignment: Qt.AlignRight
- font.family: fontRobotoRegular.name
- font.pixelSize: 12 * pt
- color: "#757184"
- text: "$ " + model.modelData.balance + " USD"
- }
-
- }
- }
- }
-
-
-
- }
-
- }
- }
- }
-
- // TODO: Don't delete it
-// RoundButton {
-// text: qsTr("+")
-// highlighted: true
-// anchors.margins: 10
-// anchors.right: parent.right
-// anchors.bottom: parent.bottom
-// onClicked: {
-// listViewDapWidgets.addWidget()
-// }
-// }
-
-// DapUiQmlWidgetLastActions {
-// id: lastActionsHistory
-// viewModel: dapHistoryModel
-// viewDelegate: DapUiQmlWidgetLastActionsDelegateForm {}
-// viewSection.property: "date"
-// viewSection.criteria: ViewSection.FullString
-// viewSection.delegate: DapUiQmlWidgetLastActionsSectionForm {
-// width: parent.width
-// height: 30 * pt
-// }
-// }
-
-// Rectangle {
-// id: rightPanel
-// anchors.bottom: parent.bottom
-// anchors.top: parent.top
-// anchors.right: parent.right
-// width: 400 * pt
-
-// Loader {
-// id: rightPanelLoader
-// clip: true
-// anchors.fill: parent
-// source: "DapUiQmlWidgetLastActions.qml"
-// }
-
-// Connections {
-// target: rectangleStatusBar
-// onAddWalletPressedChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml"
-// }
-
-// Connections {
-// target: rightPanelLoader.item
-// onPressedCloseAddWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml"
-// onPressedDoneCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWidgetLastActions.qml"
-// onPressedNextButtonChanged: {
-// if(rightPanelLoader.item.isWordsRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryNotesForm.ui.qml";
-// else if(rightPanelLoader.item.isQRCodeRecoveryMethodChecked) rightPanelLoader.source = "DapUiQmlRecoveryQrForm.ui.qml";
-// else if(rightPanelLoader.item.isExportToFileRecoveryMethodChecked) console.debug("Export to file"); /*TODO: create dialog select file to export */
-// else rightPanelLoader.source = "DapUiQmlWalletCreatedForm.ui.qml"
-// }
-// onPressedBackButtonChanged: rightPanelLoader.source = "DapUiQmlScreenDialogAddWalletForm.ui.qml"
-// onPressedNextButtonForCreateWalletChanged: rightPanelLoader.source = "DapUiQmlWalletCreatedForm.ui.qml"
-// }
-// }
-}
-
-
-
-
-
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
-##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
index 2fd35cb48adc5d570387ed689a33bbe005624d79..5df08dc4b659e8a566d9d5fa4c2fd84b89e27b33 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts 1.12
import DapTransactionHistory 1.0
-Page {
+DapUiQmlScreen {
ListView {
id: dapListView
anchors.fill: parent
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
index bf24086f17a147910d89acfbf98439cafda88261..86cc5e6821193518a0fd87901ce8b06d6a90a40b 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
@@ -55,7 +55,7 @@ Page {
ListElement {
name: qsTr("Dashboard")
- page: "DapUiQmlScreenDialog.qml"
+ page: "DapUiQmlScreenDashboard.qml"
normal: "qrc:/Resources/Icons/icon_dashboard.png"
hover: "qrc:/Resources/Icons/icon_dashboard_hover.png"
panelHeader: "DapUiQmlWidgetLastActionsHeaderForm.qml"
@@ -146,7 +146,7 @@ Page {
anchors.right: rightPanel.left
anchors.top: parent.top
anchors.bottom: parent.bottom
- source: "DapUiQmlScreenDialog.qml"
+ source: "DapUiQmlScreenDashboard.qml"
}
DapUiQmlWidgetRightPanel {
diff --git a/CellFrameDashboardGUI/DapWalletFilterModel.h b/CellFrameDashboardGUI/DapWalletFilterModel.h
index 39b9b1e56c9325f2a5dbd112b49e9a99de320bad..fe8927d30761f9bae1776779f1030f1ed8ef0c42 100644
--- a/CellFrameDashboardGUI/DapWalletFilterModel.h
+++ b/CellFrameDashboardGUI/DapWalletFilterModel.h
@@ -21,7 +21,6 @@ public:
public slots:
Q_INVOKABLE void setWalletFilter(const QString& aName);
-
};
#endif // DAPWALLETFILTERMODEL_H
diff --git a/CellFrameDashboardGUI/main.qml b/CellFrameDashboardGUI/main.qml
index 20ce225e664fb63e2267f2df59917d9c373f8b0d..c1bdcaf1cb555ef1af96cb33f60b2cda6076dc11 100755
--- a/CellFrameDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/main.qml
@@ -31,6 +31,8 @@ ApplicationWindow {
}
}
+
+
// onErrorConnect: {
// imageNetwork.visible = false
// if(imageErrorNetwork.visible)
@@ -46,158 +48,7 @@ ApplicationWindow {
// }
}
-
-// header:
-// Column
-// {
-// ToolBar
-// {
-// width: parent.width
-// height: buttomMenu.implicitHeight
-// contentItem: Item {
-// anchors.fill: parent
-// Rectangle
-// {
-// anchors.fill: parent
-// color: "#353841"
-// }
-
-// }
-
-// ToolButton {
-// id: buttomMenu
-
-// contentItem: Item {
-// anchors.fill: parent
-// Rectangle
-// {
-// anchors.fill: parent
-// color: "#353841"
-
-// Text {
-// text: stackView.depth > 1 ? "\u25C0" : "\u2630"
-// font.pixelSize: Qt.application.font.pixelSize * 2
-// anchors.centerIn: parent
-// color: "#A5A7AA"
-// }
-// }
-
-// }
-
-// onClicked: {
-// if (stackView.depth > 1) {
-// stackView.pop()
-// } else {
-// drawerMenu.open()
-// }
-// }
-// }
-
-// Label {
-// id: labelTitleWidget
-// text: stackView.currentItem.title
-// anchors.centerIn: parent
-// color: "white"
-// }
-
-// Image {
-// id: imageNetwork
-// source: "qrc:/Resources/Icons/iconNetwork.png"
-// scale: 0.7
-// visible: false
-// anchors.verticalCenter: parent.verticalCenter
-// anchors.right: parent.left
-// }
-
-// Image {
-// id: imageErrorNetwork
-// source: "qrc:/Resources/Icons/iconErrorNetwork.png"
-// scale: 0.7
-// visible: true
-// anchors.verticalCenter: parent.verticalCenter
-// anchors.right: parent.right
-// }
-// }
-// Rectangle
-// {
-// height: 1
-// width: parent.width
-// color: "green"
-// }
-// }
-
- Drawer {
- id: drawerMenu
- width: window.width * 0.3
- height: window.height
- Rectangle
- {
- anchors.fill: parent
- color: "#353841"
-
- ListView {
- id: listViewMenu
- anchors.fill: parent
- model: dapUiQmlWidgetModel
-
- delegate:
- Component {
- id: listViewItemMenu
- Item {
- id: itemMenu
-
- width: listViewMenu.width
- height: textItemMenu.height + 10
-
- Row {
- anchors.margins: 5
- anchors.fill: parent
-
- Text
- {
- id: textItemMenu
- text: qsTr(name)
- color: "#BBBEBF"
- font.pointSize: 12
- font.weight: Font.Light
- font.family: "Roboto"
- }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked:
- {
- listViewMenu.currentIndex = index
- stackView.push(Qt.resolvedUrl(URLpage), StackView.Immediate)
- drawerMenu.close()
- }
- }
- }
- }
-
- highlight:
- Component
- {
- Rectangle {
- id: rectangleMenu
- color: "#121B28"
- Rectangle
- {
- height: rectangleMenu.height
- width: 4
- color: "green"
- }
- }
- }
- focus: true
- }
- }
- }
-
- StackView {
- id: stackView
- initialItem: "DapUiQmlScreenMainWindow.qml"
+ DapUiQmlScreenMainWindow {
anchors.fill: parent
}
}
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index b98da3a75060de09e96e8e83015138c2c5e231cd..418e5d4324bcbddab86c92dcfa1f63dc46adf6c8 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -7,7 +7,7 @@
<file>DapUiQmlWidgetChainServicesClient.ui.qml</file>
<file>DapUiQmlWidgetChainServicesShareControl.ui.qml</file>
<file>DapUiQmlWidgetChainSettings.ui.qml</file>
- <file>DapUiQmlScreenDialog.qml</file>
+ <file>DapUiQmlScreenDashboard.qml</file>
<file>Resources/Icons/icon.png</file>
<file>DapUiQmlScreenAbout.ui.qml</file>
<file>DapQmlScreenAbout.qml</file>