diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index b792f14399906e88905e80b3802ba3c170f5cd7d..7c2c1bf0a9fe6fc988e52d41c649ea14d7956ef9 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -100,7 +100,6 @@ HEADERS += \
DapUiQmlWidgetChainBallance.h \
DapUiQmlWidgetChainBlockExplorer.h \
DapUiQmlWidgetChainNodeLogs.h \
- DapUiQmlScreenDashboard.h \
DapUiQmlWidgetChainOperations.h \
DapUiQmlWidgetChainTransactions.h \
DapUiQmlWidgetModel.h \
@@ -133,7 +132,3 @@ unix: !mac : !android {
gui_target.path = /opt/cellframe-dashboard/bin/
INSTALLS += gui_target
}
-
-#DISTFILES += \
-# DapUiQmlScreenSettings.qml \
-# DapUiQmlScreenSettingsForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
index 8ed1b631b173aaa028354bc49908bee4ce3c4b0c..cbf77711c0732ecc2d205992c2a384cad687c01f 100644
--- a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
@@ -2,68 +2,10 @@ import QtQuick 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedBackButton: mouseAreaBackButton.pressed
- property alias pressedNextButtonForCreateWallet: nextButton.pressed
-
+DapUiQmlScreen {
id: recoveryNoteMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- height: 36
- color: "#edeff2"
- border.width: 0
- anchors.right: parent.right
- anchors.rightMargin: 1
- anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: parent.top
- anchors.topMargin: 0
-
- Text {
- id: newWalletText
- text: qsTr("New wallet")
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: backButton.right
- anchors.leftMargin: 12
- font.pointSize: 12
- }
-
- Button {
- id: backButton
- width: 20
- height: 20
- anchors.leftMargin: 16
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaBackButton
- anchors.leftMargin: 0
- anchors.fill: parent
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaBackButton.containsMouse ? "qrc:/Resources/Icons/back_icon_hover.png" : "qrc:/Resources/Icons/back_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Rectangle {
id: wordTextArea
height: 30
@@ -72,7 +14,7 @@ Rectangle {
anchors.leftMargin: 1
anchors.right: parent.right
anchors.left: parent.left
- anchors.top: newWalletArea.bottom
+ anchors.top: parent.top
Text {
id: wordText
@@ -306,9 +248,3 @@ Rectangle {
}
}
-/*##^##
-Designer {
- D{i:24;anchors_width:400}
-}
-##^##*/
-
diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
index a21fe3d86a651b7089c9d1696974d3135031ab06..6d1c94a8669c87f6e090a887fda62b3c4b3c9e00 100644
--- a/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
@@ -3,71 +3,16 @@ import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
Rectangle {
- property alias pressedBackButton: mouseAreaBackButton.pressed
- property alias pressedNextButtonForCreateWallet: nextButton.pressed
-
id: recoveryQrMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- height: 36
- color: "#edeff2"
- anchors.right: parent.right
- anchors.rightMargin: 1
- anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: parent.top
- anchors.topMargin: 0
-
- Text {
- id: newWalletText
- text: qsTr("New wallet")
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: backButton.right
- anchors.leftMargin: 12
- font.pointSize: 12
- }
-
- Button {
- id: backButton
- width: 20
- height: 20
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: newNameArea.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaBackButton
- anchors.fill: parent
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaBackButton.containsMouse ? "qrc:/Resources/Icons/back_icon_hover.png" : "qrc:/Resources/Icons/back_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Rectangle {
id: qrCodeTextArea
height: 30
color: "#757184"
anchors.right: parent.right
anchors.left: parent.left
- anchors.top: newWalletArea.bottom
+ anchors.top: parent.top
Text {
id: qrCodeText
diff --git a/CellFrameDashboardGUI/DapUiQmlScreen.qml b/CellFrameDashboardGUI/DapUiQmlScreen.qml
new file mode 100644
index 0000000000000000000000000000000000000000..3596945747322680dd44ebd38db5141e2241a461
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreen.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.4
+
+Rectangle {
+ property DapUiQmlWidgetRightPanel rightPanel
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
index 2d1b09696ed430027c88db2a12335fb0170dd87b..50d2151500c7cf8ca0f8e6c1a41e5d268af2fe74 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
import QtQuick.Controls 1.4
-Page {
+DapUiQmlScreen {
SplitView {
anchors.fill: parent
orientation: Qt.Horizontal
@@ -18,11 +18,5 @@ Page {
Layout.topMargin: 30 * pt
Layout.rightMargin: 30 * pt
}
-
- DapUiQmlWidgetConsoleLastActionsForm {
- id: lastActionsPanel
- consoleData: dapConsoleForm.textAreaCmdHistory
-// border.color: "transparent"
- }
}
}
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..fa42a42c0f7371ab88bafc09f2cfbbb91e57f95c
--- a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
@@ -1,189 +1,212 @@
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
- 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"
- }
+import CellFrameDashboard 1.0
+import QtQml 2.12
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.12
- ListElement {
- name: qsTr("Console")
- page: "DapUiQmlScreenConsoleForm.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
- ListElement {
- name: qsTr("About")
- page: "DapQmlScreenAbout.qml"
- source: "qrc:/Resources/Icons/defaul_icon.png"
- }
+DapUiQmlScreen {
+ id: dapUiQmlScreenDialog
+ 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"
+ }
+ }
- 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"
+
+ Text {
+ anchors.fill: parent
+ anchors.leftMargin: 16 * pt
+ font.family: fontRobotoRegular.name
+ font.pixelSize: 12 * pt
+ color: "#FFFFFF"
+ verticalAlignment: Qt.AlignVCenter
+ text: section
+ }
+ }
- 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"
- }
- onClicked:
- {
- listViewTabs.currentIndex = index
- stackViewScreenDashboard.setSource(Qt.resolvedUrl(page))
- }
- }
+ clip: true
- onIsPushedChanged: {
- componentItem.color = (isPushed ? "#D0D3D6" : "transparent");
+ 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"
- }
- }
-
- Rectangle {
- id: mainDashboard
- anchors.left: rectangleTabsBorder.right
- anchors.top: rectangleStatusBar.bottom
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- border.color: "whitesmoke"
-
- Loader {
- id: stackViewScreenDashboard
- clip: true
- anchors.fill: parent
- source: "DapUiQmlScreenDialog.qml"
}
}
}
-
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
deleted file mode 100644
index eaa5453eca1eda7510da4759301517ff94418cb2..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.ource
-
- 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
- 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/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
index 3d9d8efb6fc86bd2937664f50ddbf93805113876..0415ef0f13432f027eb2c7e4097fd704438a390b 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
@@ -5,10 +5,32 @@ import CellFrameDashboard 1.0
DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
focus: true
-}
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:0;width:0}
+ Connections {
+ target: nextButton
+ onClicked: {
+ if(isWordsRecoveryMethodChecked) {
+
+ rightPanel.content.push("DapUiQmlRecoveryNotesForm.ui.qml", {"rightPanel": rightPanel});
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {
+ "backButtonNormal": "qrc:/Resources/Icons/back_icon.png",
+ "backButtonHovered": "qrc:/Resources/Icons/back_icon_hover.png",
+ "rightPanel": rightPanel
+ });
+ }
+ else if(isQRCodeRecoveryMethodChecked) {
+ rightPanel.content.push("DapUiQmlRecoveryQrForm.ui.qml", {"rightPanel": rightPanel});
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {
+ "backButtonNormal": "qrc:/Resources/Icons/back_icon.png",
+ "backButtonHovered": "qrc:/Resources/Icons/back_icon_hover.png",
+ "rightPanel": rightPanel
+ });
+ }
+ else if(isExportToFileRecoveryMethodChecked) console.debug("Export to file"); /*TODO: create dialog select file to export */
+ else {
+ rightPanel.header.push("DapUiQmlWalletCreatedHeader.qml", {"rightPanel": rightPanel });
+ rightPanel.content.push("DapUiQmlWalletCreated.qml", {"rightPanel": rightPanel} )
+ }
+ }
+ }
}
-##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 57feb1d440214611b4a115bc4eabcaf525ae47bf..37886d14076116ef96a439d17bb07d627ee4e3ae 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -1,79 +1,23 @@
import QtQuick 2.4
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
- property alias pressedNextButton: mouseAreaNextButton.pressed
+DapUiQmlScreen {
+ property alias nextButton: nextButton
property bool isWordsRecoveryMethodChecked: selectionWords.checked
property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
id: addWalletMenu
- width: 640
- height: 800
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#EDEFF2"
- visible: true
-
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newNameArea
- height: 36
- color: "#edeff2"
- anchors.right: parent.right
- anchors.rightMargin: 1
- anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: parent.top
- anchors.topMargin: 0
-
- Text {
- id: newNameAreaText
- text: qsTr("New wallet")
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: buttonCloseAddWallet.right
- anchors.leftMargin: 12
- font.pointSize: 14
- }
-
- Button {
- id: buttonCloseAddWallet
- width: 20
- height: 20
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 8
- anchors.left: newNameArea.left
- anchors.horizontalCenter: newNameArea.Center
- background: Image {
- source: mouseAreaCloseAddWallet.containsMouse ? "qrc:/Resources/Icons/close_icon_hover.png" : "qrc:/Resources/Icons/close_icon.png"
- fillMode: Image.PreserveAspectFit
- }
-
- MouseArea {
- id: mouseAreaCloseAddWallet
- anchors.fill: parent
- hoverEnabled: true
- }
- }
- }
Rectangle {
id: nameWalletTextArea
height: 30
color: "#757184"
anchors.right: parent.right
- anchors.rightMargin: 0
anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: newNameArea.bottom
- anchors.topMargin: 0
+ anchors.top: parent.top
Text {
id: nameWalletText
@@ -254,30 +198,26 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: chooseRecoveryMethod.bottom
anchors.topMargin: 32
+ hoverEnabled: true
- MouseArea {
- id: mouseAreaNextButton
- anchors.fill: parent
- hoverEnabled: true
- }
-
- Text {
+ contentItem: Text {
id: nextButtonText
text: qsTr("Next")
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
+ anchors.fill: parent
color: "#ffffff"
font.family: "Roboto"
font.styleName: "Normal"
font.weight: Font.Normal
font.pointSize: 18
- horizontalAlignment: Text.AlignLeft
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
}
+
background: Rectangle {
implicitWidth: parent.width
implicitHeight: parent.height
- color: mouseAreaNextButton.containsMouse ? "#D51F5D" : "#070023"
+ color: parent.hovered ? "#D51F5D" : "#070023"
}
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e05b8e9b7552645a235f4417ae4e6a51174cf51b
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+DapUiQmlScreen {
+ height: 36 * pt
+ color: "#edeff2"
+
+ property string backButtonNormal : "qrc:/Resources/Icons/close_icon.png"
+ property string backButtonHovered : "qrc:/Resources/Icons/close_icon_hover.png"
+ property string title : qsTr("New wallet")
+ property alias mouseArea : mouseArea
+
+ RowLayout
+ {
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: 8
+ spacing: 12
+
+ Rectangle {
+ width: 20
+ height: 20
+ color: "transparent"
+
+ Image {
+ id: buttonCloseAddWallet
+ anchors.fill: parent
+ source: backButtonNormal
+ }
+
+ MouseArea {
+ id: mouseArea
+ anchors.fill: parent
+ hoverEnabled: true
+
+ onEntered: buttonCloseAddWallet.source = backButtonHovered
+ onExited: buttonCloseAddWallet.source = backButtonNormal
+
+ onClicked: {
+ rightPanel.header.pop();
+ rightPanel.content.pop();
+ }
+ }
+ }
+
+ Text {
+ text: title
+ font.pointSize: 14
+ }
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
index b59e3dda394bde76af0f691528a5421273a4ed6d..e593f92f8c0ddd7e397f91b4b2cb56f966610373 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
@@ -9,28 +9,28 @@ Dialog {
header:
Rectangle
- {
- height: 30
- color: "#353841"
+ {
+ height: 30
+ color: "#353841"
- Text
- {
- id: textTitle
- leftPadding: 10
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Remove wallet...")
- font.family: "Roboto"
- font.pixelSize: 16
- color: "white"
- }
- Rectangle
- {
- anchors.bottom: parent.bottom
- height: 2
- width: parent.width
- color: "green"
- }
+ Text
+ {
+ id: textTitle
+ leftPadding: 10
+ anchors.verticalCenter: parent.verticalCenter
+ text: qsTr("Remove wallet...")
+ font.family: "Roboto"
+ font.pixelSize: 16
+ color: "white"
+ }
+ Rectangle
+ {
+ anchors.bottom: parent.bottom
+ height: 2
+ width: parent.width
+ color: "green"
}
+ }
width: parent.width/1.5
height: 150
@@ -39,104 +39,101 @@ Dialog {
y: parent.height / 2 - height / 2
function show() {
- dialogRemoveWallet.open();
- }
+ dialogRemoveWallet.open();
+ }
contentItem:
Rectangle
+ {
+ anchors.fill: parent
+
+ TextEdit {
+
+
+ id: textQuery
+ wrapMode: TextEdit.Wrap
+ text: qsTr("Are you sure you want to delete\n\"" + dapQmlWidgetChainWallet.nameWallet + " \"?")
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+
+ height: 55
+ anchors.bottom: buttonOk.top
+ anchors.bottomMargin: 20
+ anchors.right: parent.right
+ anchors.rightMargin: 10
+ anchors.left: parent.left
+ anchors.leftMargin: 10
+ font.pixelSize: 20
+ clip: true
+ }
+
+ Button
{
- anchors.fill: parent
-
- TextEdit {
-
-
- id: textQuery
- wrapMode: TextEdit.Wrap
- text: qsTr("Are you sure you want to delete\n\"" + dapQmlWidgetChainWallet.nameWallet + " \"?")
- verticalAlignment: Text.AlignVCenter
+ id: buttonCancel
+ text: qsTr("Cancel")
+ anchors.right: buttonOk.left
+ anchors.rightMargin: 10
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 10
+
+ contentItem: Text {
+ text: buttonCancel.text
+ font: buttonCancel.font
+ opacity: enabled ? 1.0 : 0.3
+ color: buttonCancel.down ? "#353841" : "white"
horizontalAlignment: Text.AlignHCenter
-
- height: 55
- anchors.bottom: buttonOk.top
- anchors.bottomMargin: 20
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.left: parent.left
- anchors.leftMargin: 10
- font.pixelSize: 20
- clip: true
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
}
-
- Button
- {
- id: buttonCancel
- text: qsTr("Cancel")
- anchors.right: buttonOk.left
- anchors.rightMargin: 10
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
-
- contentItem: Text {
- text: buttonCancel.text
- font: buttonCancel.font
- opacity: enabled ? 1.0 : 0.3
- color: buttonCancel.down ? "#353841" : "white"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- implicitWidth: 100
- implicitHeight: 30
- opacity: enabled ? 1 : 0.3
- color: buttonCancel.down ? "white" : "#353841"
- radius: 4
- }
-
- onClicked:
- {
- close()
- }
+
+ background: Rectangle {
+ implicitWidth: 100
+ implicitHeight: 30
+ opacity: enabled ? 1 : 0.3
+ color: buttonCancel.down ? "white" : "#353841"
+ radius: 4
}
- Button
+ onClicked:
{
- id: buttonOk
- text: "OK"
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
- contentItem: Text {
- text: buttonOk.text
- font: buttonOk.font
- opacity: enabled ? 1.0 : 0.3
- color: buttonOk.down ? "#353841" : "white"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- implicitWidth: 100
- implicitHeight: 30
- opacity: enabled ? 1 : 0.3
- color: buttonOk.down ? "white" : "#353841"
- radius: 4
- }
-
- onClicked:
- {
- dapServiceController.removeWallet(dapQmlWidgetChainWallet.indexWallet, dapQmlWidgetChainWallet.nameWallet)
- close()
- }
+ close()
}
-
-
}
+ Button
+ {
+ id: buttonOk
+ text: "OK"
+ anchors.right: parent.right
+ anchors.rightMargin: 10
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 10
+ contentItem: Text {
+ text: buttonOk.text
+ font: buttonOk.font
+ opacity: enabled ? 1.0 : 0.3
+ color: buttonOk.down ? "#353841" : "white"
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
+ }
+
+ background: Rectangle {
+ implicitWidth: 100
+ implicitHeight: 30
+ opacity: enabled ? 1 : 0.3
+ color: buttonOk.down ? "white" : "#353841"
+ radius: 4
+ }
+
+ onClicked:
+ {
+ dapServiceController.removeWallet(dapQmlWidgetChainWallet.indexWallet, dapQmlWidgetChainWallet.nameWallet)
+ close()
+ }
+ }
+ }
}
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/DapUiQmlScreenMainWindow.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
index e304c2aa6372706344f09062940563c6b9d4b885..33f62f756b3ddca073e60df14ddb35453318eaf7 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
@@ -58,14 +58,27 @@ DapUiQmlScreenMainWindowForm {
onClicked: {
listViewTabs.currentIndex = index;
- stackViewScreenDashboard.setSource(Qt.resolvedUrl(page));
+ rightPanel.header.clear(StackView.Immediate);
+ rightPanel.content.clear(StackView.Immediate);
+ var headerData = panelHeader;
+ var contentData = panelContent;
+ if(panelHeader !== "" || panelContent !== "")
+ {
+ rightPanel.visible = true;
+ if(headerData !== "") rightPanel.header.push(Qt.resolvedUrl(headerData));
+ if(contentData !== "") rightPanel.content.push(Qt.resolvedUrl(contentData));
+ }
+ else rightPanel.visible = false;
+
+
+ stackViewScreenDashboard.setSource(Qt.resolvedUrl(page), {"rightPanel": rightPanel});
}
}
onIsPushedChanged: {
componentItem.color = (isPushed ? "#D51F5D" : "transparent");
- imageItem.source = model.hover;
+ imageItem.source = isPushed ? model.hover : model.normal;
textItemMenu.font.family = (isPushed ? fontRobotoRegular.name : fontRobotoLight.name);
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
index dffcb240ff117d725db3286b2edd34412532c661..86cc5e6821193518a0fd87901ce8b06d6a90a40b 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
@@ -18,9 +18,13 @@ Page {
source: "qrc:/Resources/Fonts/roboto_regular.ttf"
}
+ readonly property FontLoader fontRobotoMedium: FontLoader {
+ source: "qrc:/Resources/Fonts/roboto_medium.ttf"
+ }
/// -----------
property alias listViewTabs: listViewTabs
property alias stackViewScreenDashboard: stackViewScreenDashboard
+ property alias rightPanel : rightPanel
DapUiQmlWidgetStatusBar {
id: rectangleStatusBar
@@ -51,9 +55,11 @@ 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"
+ panelContent: "DapUiQmlWidgetHistoryLastActions.qml"
}
ListElement {
@@ -61,6 +67,8 @@ Page {
page: "DapUiQmlScreenExchangeForm.ui.qml"
normal: "qrc:/Resources/Icons/icon_exchange.png"
hover: "qrc:/Resources/Icons/icon_exchange_hover.png"
+ panelHeader: ""
+ panelContent: ""
}
ListElement {
@@ -68,6 +76,8 @@ Page {
page: "DapUiQmlScreenHistory.qml"
normal: "qrc:/Resources/Icons/icon_history.png"
hover: "qrc:/Resources/Icons/icon_history_hover.png"
+ panelHeader: ""
+ panelContent: ""
}
ListElement {
@@ -75,6 +85,8 @@ Page {
page: "DapUiQmlScreenConsoleForm.ui.qml"
normal: "qrc:/Resources/Icons/icon_console.png"
hover: "qrc:/Resources/Icons/icon_console_hover.png"
+ panelHeader: "DapUiQmlWidgetLastActionsHeaderForm.qml"
+ panelContent: "DapUiQmlWidgetConsoleLastActionsForm.qml"
}
ListElement {
@@ -82,6 +94,8 @@ Page {
page: "DapUiQmlWidgetChainNodeLogs.qml"
normal: "qrc:/Resources/Icons/icon_logs.png"
hover: "qrc:/Resources/Icons/icon_logs_hover.png"
+ panelHeader: ""
+ panelContent: ""
}
ListElement {
@@ -89,6 +103,8 @@ Page {
page: "DapUiQmlScreenSettings.qml"
normal: "qrc:/Resources/Icons/icon_settings.png"
hover: "qrc:/Resources/Icons/icon_settings_hover.png"
+ panelHeader: ""
+ panelContent: ""
}
ListElement {
@@ -96,6 +112,8 @@ Page {
page: "DapUiQmlScreenVpn.qml"
normal: "qrc:/Resources/Icons/defaul_icon.png"
hover: "qrc:/Resources/Icons/defaul_icon.png"
+ panelHeader: ""
+ panelContent: ""
}
/// TODO: It wasn't in the task. I will not delete it, maybe later
@@ -107,90 +125,38 @@ Page {
// }
}
delegate: componentItemMainMenuTab
+ clip: true
+ interactive: false
+ currentIndex: 0
}
focus: true
- // DapUiQmlWidgetStatusBar {
- // id: rectangleStatusBar
- // anchors.left: rectangleTabsBorder.right
- // anchors.top: parent.top
- // anchors.right: parent.right
- // color: "#B5B5B5"
- // height: 60 * pt
}
-
- property alias rightPanelLoaderSource: rightPanelLoader.source
-
Rectangle {
id: mainDashboard
anchors.left: rectangleTabsBorder.right
anchors.top: rectangleStatusBar.bottom
anchors.bottom: parent.bottom
anchors.right: parent.right
- border.color: "whitesmoke"
Loader {
id: stackViewScreenDashboard
clip: true
-// anchors.fill: parent
anchors.left: parent.left
anchors.right: rightPanel.left
anchors.top: parent.top
anchors.bottom: parent.bottom
- source: "DapUiQmlScreenDialog.qml"
+ source: "DapUiQmlScreenDashboard.qml"
}
-// 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"
- }
- }
+ DapUiQmlWidgetRightPanel {
+ id: rightPanel
+ anchors.bottom: parent.bottom
+ anchors.top: parent.top
+ anchors.right: parent.right
+ header.initialItem: "DapUiQmlWidgetLastActionsHeaderForm.qml"
+ content.initialItem: "DapUiQmlWidgetHistoryLastActions.qml"
+ }
}
}
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
-##^##*/
-
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e336476f69312a539cf308f26bdaedecdd33d1a5
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+DapUiQmlWalletCreatedForm {
+ buttonDone.onClicked: {
+ rightPanel.header.pop(null);
+ rightPanel.content.pop(null);
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
index 4b86a0525575b5d3df46eeffaf8f21195a7e034b..dff7c07884c7fb65a700e56705184c4991422d36 100644
--- a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
@@ -2,61 +2,12 @@ import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
-Rectangle {
- property alias pressedCloseAddWallet: mouseAreaCloseAddWallet.pressed
- property alias pressedDoneCreateWallet: doneCreateWalletButton.pressed
+DapUiQmlScreen {
+ property alias buttonDone: doneCreateWalletButton
id: walletCreatedMenu
- width: 400
- height: 640
- border.color: "#B5B5B5"
- border.width: 1 * pt
color: "#edeff2"
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- Rectangle {
- id: newWalletArea
- height: 36
- color: "#edeff2"
- anchors.right: parent.right
- anchors.rightMargin: 1
- anchors.left: parent.left
- anchors.leftMargin: 1
- anchors.top: parent.top
- anchors.topMargin: 0
-
- Button {
- id: closeButton
- width: 20
- height: 20
- anchors.leftMargin: 16
- anchors.verticalCenterOffset: 0
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.horizontalCenter: newNameArea.Center
-
- MouseArea {
- id: mouseAreaCloseAddWallet
- width: parent.width
- height: parent.height
- anchors.left: parent.left
- anchors.leftMargin: 0
- hoverEnabled: true
- }
-
- background: Image {
- id: imageButton
- source: mouseAreaCloseAddWallet.containsMouse ? "Resources/Icons/close_icon_hover.png" : "Resources/Icons/close_icon.png"
- fillMode: Image.PreserveAspectFit
- }
- }
- }
-
Button {
id: doneCreateWalletButton
anchors.horizontalCenter: parent.horizontalCenter
@@ -83,6 +34,8 @@ Rectangle {
implicitHeight: parent.height
color: "#3E3853"
}
+
+
}
Rectangle {
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml b/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml
new file mode 100644
index 0000000000000000000000000000000000000000..5f0d953d6e38d3cebfdaf972de215341afa4af40
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+
+DapUiQmlScreenDialogAddWalletHeader {
+ title: ""
+
+ mouseArea.onClicked: {
+ rightPanel.header.pop(null);
+ rightPanel.content.pop(null);
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
index 74752d1b4039e09d433a565101ac1e8a7c8fdf10..9ecd40b1c0a91863d13099c374fd12df7df7b6c7 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
@@ -2,9 +2,7 @@ import QtQuick 2.13
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.13
-
Rectangle {
-
property alias textAreaCmdHistory: txtCommand
property alias textAreaCmd: consoleCmd
@@ -96,5 +94,9 @@ Rectangle {
txtCommand.append(history);
}
}
+
+ Component.onCompleted: {
+ rightPanel.content.currentItem.consoleData = dapConsoleForm.textAreaCmdHistory;
+ }
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetHistoryLastActions.qml b/CellFrameDashboardGUI/DapUiQmlWidgetHistoryLastActions.qml
new file mode 100644
index 0000000000000000000000000000000000000000..e900efb77c334a179c6f359be225168754a187ae
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetHistoryLastActions.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+DapUiQmlWidgetLastActions {
+ viewModel: dapHistoryModel
+ viewDelegate: DapUiQmlWidgetLastActionsDelegateForm {}
+ viewSection.property: "date"
+ viewSection.criteria: ViewSection.FullString
+ viewSection.delegate: DapUiQmlWidgetLastActionsSectionForm {
+ width: parent.width
+ height: 30 * pt
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
index 4ff619a69af15bb039d2ef69b628f705fadb00e4..57853a3aa5ed1ce052c417880aa16d51e9c77954 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
@@ -27,30 +27,9 @@ DapUiQmlWidgetLastActionsForm {
}
}
- DapUiQmlWidgetLastActionsHeaderForm {
- id: dapHeader
- height: 36 * pt
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.right: parent.right
- anchors.leftMargin: 1 * pt
- }
-
- Rectangle {
- id: splitHeader
- anchors.top: dapHeader.bottom
- anchors.left: parent.left
- anchors.right: parent.right
- height: 1 * pt
- color: "#C2CAD1"
- }
-
ListView {
id: dapListView
- anchors.top: splitHeader.bottom
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
+ anchors.fill: parent
clip: true
property var contentPos: 0.0;
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
index 66af5b4500966a15ef2c9ca47832ebf634d4faec..b6c9f37df3005285cc785497a34dd5da1dda3417 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
@@ -10,9 +10,6 @@ Component {
height: 50 * pt
color: "transparent"
- border.color: "#C2CAD1"
- border.width: 1 * pt
-
Rectangle {
id: dapData
width: childrenRect.width
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
index 27c038bccdac2e0064179f19529f0dc3684d6cc4..7648b3a8cefb5f12585e52c214eccafc46a4daee 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
@@ -1,14 +1,5 @@
import QtQuick 2.4
Rectangle {
- width: 400 * pt
- border.color: "#B5B5B5"
- border.width: 1 * pt
- color: "#EDEFF2"
-
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
+ color: "transparent"
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
index bc8002bda195737b8e9c7716a8d293dcd77dcf7b..a8a3b4b957687faa2cde7e93284bf8da78b8c0cd 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
@@ -4,15 +4,24 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
Rectangle {
- color: "#EDEFF2"
+ height: 36 * pt
+ color: "transparent"
Text {
anchors.fill: parent
anchors.leftMargin: 16 * pt
text: qsTr("Last actions")
verticalAlignment: Qt.AlignVCenter
- font.family: "Roboto"
+ font.family: fontRobotoRegular.name
font.pixelSize: 12 * pt
color: "#5F5F63"
}
+
+ Rectangle {
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 1
+ color: "#757184"
+ }
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
index 3acb5e81676f923a1b15fa28e6a56dbe898aff9f..6ea635c49f0a9b3a23f3f3e6f0b4e18a1ba1b930 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
@@ -4,15 +4,15 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
Rectangle {
- color: "#C2CAD1"
+ color: "#757184"
Text {
anchors.fill: parent
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignLeft
- color: "#797979"
+ color: "#FFFFFF"
text: section
- font.family: "Roboto"
+ font.family: fontRobotoRegular.name
font.pixelSize: 12 * pt
leftPadding: 16 * pt
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanel.qml b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..8169b7b84e59d2ac450307732050b75b26857448
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanel.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.4
+
+DapUiQmlWidgetRightPanelForm {
+
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..27a6895a22036f5606c4365771adc66e5ba95d7e
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
@@ -0,0 +1,42 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.13
+
+Rectangle {
+ id: rightPanel
+ property alias header : stackViewHeader
+ property alias content : stackViewContent
+ property alias background : rightPanelPage.background
+ property alias footer: stackViewFooter
+
+ width: visible ? 400 * pt : 0
+ color: "#E3E2E6"
+
+ Page {
+ id: rightPanelPage
+ anchors.fill: parent
+ anchors.leftMargin: 1
+ background: Rectangle {
+ color: "#F8F7FA"
+ }
+
+ header: StackView {
+ id: stackViewHeader
+ width: parent.width
+ height: currentItem === null ? 0 : currentItem.height
+ clip: true
+ }
+
+ StackView {
+ id: stackViewContent
+ anchors.fill: parent
+ clip: true
+ }
+
+ footer: StackView {
+ id: stackViewFooter
+ width: parent.width
+ height: currentItem === null ? 0 : currentItem.height
+ clip: true
+ }
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
index 3e23035abb1830dc324dfd13c3745f3247c35206..fbce3f2ec0f83cabd8e7e12bc52aca87e02eb32b 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
@@ -5,7 +5,7 @@ import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
Rectangle {
- property alias addWalletPressed: statusBarAddWalletButton.pressed
+// property alias addWalletPressed: statusBarAddWalletButton.pressed
Rectangle {
anchors.fill: parent
anchors.bottomMargin: 1
@@ -71,6 +71,11 @@ Rectangle {
anchors.rightMargin: 20 * pt
anchors.bottom: parent.bottom
anchors.bottomMargin: 10 * pt
+
+ onClicked: {
+ rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel});
+ rightPanel.content.push("DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel});
+ }
}
}
}
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/Resources/Fonts/roboto_black.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf
deleted file mode 100644
index 51c71bbe2d565247a020319ff9b324e8c8e05353..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
deleted file mode 100644
index ca20ca399981d14c441b9ea2f3decc1c88e69da4..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf
deleted file mode 100644
index e612852d259930d0dcc632318ac0f15ae312422b..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
deleted file mode 100644
index 677bc045e565c7b74c3ce0f8ad55df305bb28a29..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf
deleted file mode 100644
index 5fd05c3b645a8fdcdeffae18bffc19369514a76a..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
deleted file mode 100644
index eec0ae9be8f8f74279afe5253de5286c04fc2fad..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
deleted file mode 100644
index 66aa174f058481c39bcd60bdb464a1b3f78e4dcc..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf
deleted file mode 100644
index a85eb7c29505713608ec9fd8489944977914be21..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
deleted file mode 100644
index ac77951b80fc3ad37533dcae49c9e8085c42f1fb..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf and /dev/null differ
diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
index 00ce401b807641e3bcae56344e1acd9b79916fc7..7379a76e4cf4f2b0a74ce9e0a7779c40cfccff7c 100755
--- a/CellFrameDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -54,6 +54,8 @@ int main(int argc, char *argv[])
mkdir("/tmp/cellframe-dashboard_log",0777);
dapLogger.setLogFile(QString("/tmp/cellframe-dashboard_log/%1Gui.log").arg(DAP_BRAND));
#elif defined Q_OS_WIN
+ dapLogger.setLogFile(QString("%Dashboard.log").arg(DAP_BRAND));
+ dapLogger.setLogLevel(L_DEBUG);
#endif
//#endif
diff --git a/CellFrameDashboardGUI/main.qml b/CellFrameDashboardGUI/main.qml
index 20ce225e664fb63e2267f2df59917d9c373f8b0d..936bd241232a572269fe68c6c79f74c22311ae15 100755
--- a/CellFrameDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/main.qml
@@ -30,174 +30,9 @@ ApplicationWindow {
window.hide()
}
}
-
-// onErrorConnect: {
-// imageNetwork.visible = false
-// if(imageErrorNetwork.visible)
-// imageErrorNetwork.visible = false
-// else
-// imageErrorNetwork.visible = true
-// }
-
-// onConnectedToService: {
-// imageNetwork.visible = true
-// imageErrorNetwork.visible = false
-// console.log("Connected")
-// }
- }
-
-
-// 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 5250471c1b9b3b4ce194d8870d06e9bc9c72e3a2..e00667e8653b0caf776b90455a55ff5dc26e85ab 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>
@@ -25,18 +25,9 @@
<file>DapUiQmlWidgetNodeNetworkExplorer.qml</file>
<file>Resources/Icons/defaul_icon.png</file>
<file>DapUiQmlScreenExchangeForm.ui.qml</file>
- <file>Resources/Fonts/roboto_black.ttf</file>
- <file>Resources/Fonts/roboto_black_italic.ttf</file>
- <file>Resources/Fonts/roboto_bold.ttf</file>
- <file>Resources/Fonts/roboto_bold_italic.ttf</file>
- <file>Resources/Fonts/roboto_italic.ttf</file>
<file>Resources/Fonts/roboto_light.ttf</file>
- <file>Resources/Fonts/roboto_light_italic.ttf</file>
<file>Resources/Fonts/roboto_medium.ttf</file>
- <file>Resources/Fonts/roboto_medium_italic.ttf</file>
<file>Resources/Fonts/roboto_regular.ttf</file>
- <file>Resources/Fonts/roboto_thin.ttf</file>
- <file>Resources/Fonts/roboto_thin_italic.ttf</file>
<file>DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
<file>DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file>
<file>DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
@@ -109,5 +100,12 @@
<file>Resources/Icons/ic_edit.png</file>
<file>Resources/Icons/ic_edit_hover.png</file>
<file>Resources/Icons/new-payment_icon.png</file>
+ <file>DapUiQmlWidgetRightPanel.qml</file>
+ <file>DapUiQmlWidgetRightPanelForm.ui.qml</file>
+ <file>DapUiQmlWidgetHistoryLastActions.qml</file>
+ <file>DapUiQmlScreen.qml</file>
+ <file>DapUiQmlScreenDialogAddWalletHeader.qml</file>
+ <file>DapUiQmlWalletCreatedHeader.qml</file>
+ <file>DapUiQmlWalletCreated.qml</file>
</qresource>
</RCC>
diff --git a/libdap-crypto b/libdap-crypto
index d9337dda7db1b3430d17914b4e290b9a200045a2..c81202ba5d48e5d77afcc8aea9962a10560527f3 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit d9337dda7db1b3430d17914b4e290b9a200045a2
+Subproject commit c81202ba5d48e5d77afcc8aea9962a10560527f3
diff --git a/libdap-qt b/libdap-qt
index cc89c94372b96df8e9ffec736e3da7ccecdb0abe..5f661c223be1ccd39f0dfa104a44de0d9f9dfb35 160000
--- a/libdap-qt
+++ b/libdap-qt
@@ -1 +1 @@
-Subproject commit cc89c94372b96df8e9ffec736e3da7ccecdb0abe
+Subproject commit 5f661c223be1ccd39f0dfa104a44de0d9f9dfb35
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index fc638ab642564dbe3136fe9c5ad573d6428099fc..257d070fbe0228bd5c6c6be433c48160eaaefb28 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit fc638ab642564dbe3136fe9c5ad573d6428099fc
+Subproject commit 257d070fbe0228bd5c6c6be433c48160eaaefb28