diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index 7c2c1bf0a9fe6fc988e52d41c649ea14d7956ef9..be1d35cb22dea59fadcee6dd8bafedf140526957 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -15,10 +15,10 @@ VER_MAJ = 1
VER_MIN = 6
VER_PAT = 4
-
win32 {
VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
+ DEFINES += HAVE_STRNDUP
}
else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
@@ -35,10 +35,10 @@ DEFINES += DAP_SERVICE_NAME=\\\"CellFrameDashboardService\\\"
DEFINES += DAP_VERSION=\\\"$$VERSION\\\"
DEFINES += DAP_SETTINGS_FILE=\\\"settings.json\\\"
macx {
-ICON = Resources/Icons/dashboard.icns
+ICON = res/icons/dashboard.icns
}
else {
-ICON = Resources/Icons/icon.ico
+ICON = res/icons/icon.ico
}
# You can also make your code fail to compile if you use deprecated APIs.
@@ -46,42 +46,43 @@ ICON = Resources/Icons/icon.ico
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+MOC_DIR = moc
+OBJECTS_DIR = obj
+RCC_DIR = rcc
+UI_DIR = uic
+
+CONFIG(debug, debug|release) {
+ DESTDIR = bin/debug
+} else {
+ DESTDIR = bin/release
+}
+
+INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ \
+ $$_PRO_FILE_PWD_/../DapRPCProtocol/
+
SOURCES += \
- DapChainNodeNetworkExplorer.cpp \
- DapChainNodeNetworkModel.cpp \
- DapChainWalletModel.cpp \
- DapClipboard.cpp \
- DapConsoleModel.cpp \
- DapScreenHistoryFilterModel.cpp \
- DapScreenHistoryModel.cpp \
- DapSettingsNetworkModel.cpp \
- DapUiQmlWidgetChainTransactions.cpp \
- DapWalletFilterModel.cpp \
- main.cpp \
- DapUiQmlWidgetChainBallance.cpp \
- DapUiQmlWidgetChainBlockExplorer.cpp \
- DapUiQmlWidgetChainNodeLogs.cpp \
- DapUiQmlWidgetChainOperations.cpp \
- DapUiQmlWidgetModel.cpp \
- DapUiQmlWidget.cpp \
- DapScreenDialog.cpp \
- DapScreenDialogChangeWidget.cpp \
- DapServiceClient.cpp \
- DapServiceController.cpp \
- DapCommandController.cpp \
- DapServiceClientNativeAbstract.cpp \
- DapServiceClientNativeLinux.cpp \
- DapServiceClientNativeWin.cpp \
- DapServiceClientNativeMacOS.cpp \
- DapChainWalletsModel.cpp
-
-RESOURCES += qml.qrc
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
+ $$PWD/DapChainNodeNetworkExplorer.cpp \
+ $$PWD/DapChainNodeNetworkModel.cpp \
+ $$PWD/DapChainWalletModel.cpp \
+ $$PWD/DapClipboard.cpp \
+ $$PWD/DapConsoleModel.cpp \
+ $$PWD/DapScreenHistoryFilterModel.cpp \
+ $$PWD/DapScreenHistoryModel.cpp \
+ $$PWD/DapSettingsNetworkModel.cpp \
+ $$PWD/DapWalletFilterModel.cpp \
+ $$PWD/main.cpp \
+ $$PWD/DapScreenDialog.cpp \
+ $$PWD/DapScreenDialogChangeWidget.cpp \
+ $$PWD/DapServiceClient.cpp \
+ $$PWD/DapServiceController.cpp \
+ $$PWD/DapCommandController.cpp \
+ $$PWD/DapServiceClientNativeAbstract.cpp \
+ $$PWD/DapServiceClientNativeLinux.cpp \
+ $$PWD/DapServiceClientNativeWin.cpp \
+ $$PWD/DapServiceClientNativeMacOS.cpp \
+ $$PWD/DapChainWalletsModel.cpp
+
+RESOURCES += $$PWD/qml.qrc
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
@@ -89,31 +90,24 @@ else: unix:!android: target.path = /opt/cellframe-dashboard/bin
!isEmpty(target.path): INSTALLS += target
HEADERS += \
- DapChainNodeNetworkExplorer.h \
- DapChainNodeNetworkModel.h \
- DapChainWalletModel.h \
- DapClipboard.h \
- DapConsoleModel.h \
- DapScreenHistoryFilterModel.h \
- DapScreenHistoryModel.h \
- DapSettingsNetworkModel.h \
- DapUiQmlWidgetChainBallance.h \
- DapUiQmlWidgetChainBlockExplorer.h \
- DapUiQmlWidgetChainNodeLogs.h \
- DapUiQmlWidgetChainOperations.h \
- DapUiQmlWidgetChainTransactions.h \
- DapUiQmlWidgetModel.h \
- DapUiQmlWidget.h \
- DapScreenDialog.h \
- DapScreenDialogChangeWidget.h \
- DapServiceClient.h \
- DapServiceController.h \
- DapCommandController.h \
- DapServiceClientNativeAbstract.h \
- DapServiceClientNativeLinux.h \
- DapServiceClientNativeWin.h \
- DapChainWalletsModel.h \
- DapWalletFilterModel.h
+ $$PWD/DapChainNodeNetworkExplorer.h \
+ $$PWD/DapChainNodeNetworkModel.h \
+ $$PWD/DapChainWalletModel.h \
+ $$PWD/DapClipboard.h \
+ $$PWD/DapConsoleModel.h \
+ $$PWD/DapScreenHistoryFilterModel.h \
+ $$PWD/DapScreenHistoryModel.h \
+ $$PWD/DapSettingsNetworkModel.h \
+ $$PWD/DapScreenDialog.h \
+ $$PWD/DapScreenDialogChangeWidget.h \
+ $$PWD/DapServiceClient.h \
+ $$PWD/DapServiceController.h \
+ $$PWD/DapCommandController.h \
+ $$PWD/DapServiceClientNativeAbstract.h \
+ $$PWD/DapServiceClientNativeLinux.h \
+ $$PWD/DapServiceClientNativeWin.h \
+ $$PWD/DapChainWalletsModel.h \
+ $$PWD/DapWalletFilterModel.h
include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri)
@@ -123,10 +117,6 @@ include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
-INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/
- $$_PRO_FILE_PWD_/../DapRPCProtocol/
-
-
unix: !mac : !android {
gui_target.files = $${BRAND}
gui_target.path = /opt/cellframe-dashboard/bin/
diff --git a/CellFrameDashboardGUI/DapChainWalletsModel.cpp b/CellFrameDashboardGUI/DapChainWalletsModel.cpp
old mode 100755
new mode 100644
diff --git a/CellFrameDashboardGUI/DapChainWalletsModel.h b/CellFrameDashboardGUI/DapChainWalletsModel.h
old mode 100755
new mode 100644
diff --git a/CellFrameDashboardGUI/DapCommandController.cpp b/CellFrameDashboardGUI/DapCommandController.cpp
old mode 100755
new mode 100644
index 0fa87cd4a48227f0b5f54fe18cd0e7fc97a7fa61..e690e439f3bacb1310db3854b4fe52d1f6c2d468
--- a/CellFrameDashboardGUI/DapCommandController.cpp
+++ b/CellFrameDashboardGUI/DapCommandController.cpp
@@ -93,9 +93,6 @@ void DapCommandController::requestWalletData()
void DapCommandController::processChangedLog()
{
-// QStringList tempLogModel;
-// for(int x{0}; x < aLogModel.count(); ++x)
-// tempLogModel.append(aLogModel.at(x).toString());
emit onChangeLogModel();
}
@@ -294,8 +291,7 @@ void DapCommandController::getNetworkList()
void DapCommandController::setNodeStatus(const bool aIsOnline)
{
- /*DapRpcServiceReply *reply =*/ m_DAPRpcSocket->invokeRemoteMethod("RPCServer.setNodeStatus", aIsOnline);
-// connect(reply, SIGNAL(finished()), this, SLOT(processGetNodeStatus()));
+ m_DAPRpcSocket->invokeRemoteMethod("RPCServer.setNodeStatus", aIsOnline);
}
void DapCommandController::executeCommand(const QString &command)
diff --git a/CellFrameDashboardGUI/DapCommandController.h b/CellFrameDashboardGUI/DapCommandController.h
old mode 100755
new mode 100644
diff --git a/CellFrameDashboardGUI/DapQmlScreenAbout.qml b/CellFrameDashboardGUI/DapQmlScreenAbout.qml
deleted file mode 100755
index 49ab8b446c2c6b4fb3b899190cd43cb7ebf85406..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapQmlScreenAbout.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.9
-import QtQml 2.3
-import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
-
-DapUiQmlScreenAbout {
- id: dapQmlScreenAbout
-
- textTitle.text: dapServiceController.Brand
- textAbout.text: "CellFrameDashboard"
- textVersion.text: "Version " + dapServiceController.Version
- textYear.text: new Date().toLocaleDateString(locale, "dd MMM yyyy")
-}
diff --git a/CellFrameDashboardGUI/DapScreenDialog.cpp b/CellFrameDashboardGUI/DapScreenDialog.cpp
index f044c6616751016e7696c6dfb7e831624b692b22..0814c9e09ea8a6841d53f3ad31d2d432c3d2acf2 100644
--- a/CellFrameDashboardGUI/DapScreenDialog.cpp
+++ b/CellFrameDashboardGUI/DapScreenDialog.cpp
@@ -3,9 +3,7 @@
DapScreenDialog::DapScreenDialog(QObject *parent) : QObject(parent)
{
m_proxyModel = new QSortFilterProxyModel;
- m_proxyModel->setSourceModel(&DapUiQmlWidgetModel::getInstance());
m_proxyModel->setFilterRegExp(QRegExp("true"));
- m_proxyModel->setFilterRole(VisibleRole);
}
QSortFilterProxyModel *DapScreenDialog::proxyModel() const
diff --git a/CellFrameDashboardGUI/DapScreenDialog.h b/CellFrameDashboardGUI/DapScreenDialog.h
index 9c064639f48f755ec444936792d837cd4b4385f8..a0347f393163917f40c80ede2bdad686865d845a 100644
--- a/CellFrameDashboardGUI/DapScreenDialog.h
+++ b/CellFrameDashboardGUI/DapScreenDialog.h
@@ -4,8 +4,6 @@
#include <QObject>
#include <QSortFilterProxyModel>
-#include "DapUiQmlWidgetModel.h"
-
/// Class of screen dialog. Can filtered different models
class DapScreenDialog : public QObject
{
diff --git a/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
old mode 100755
new mode 100644
index 6dfe8643a271b35d1a798090e0f977aee6bd6c9d..fa396332d6ea156db0b70505bef53ef2701f1dcb
--- a/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
+++ b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
@@ -3,9 +3,7 @@
DapScreenDialogChangeWidget::DapScreenDialogChangeWidget(QObject *parent) : QObject(parent)
{
m_proxyModel = new QSortFilterProxyModel(this);
- m_proxyModel->setSourceModel(&DapUiQmlWidgetModel::getInstance());
m_proxyModel->setFilterRegExp(QRegExp("false"));
- m_proxyModel->setFilterRole(VisibleRole);
}
QSortFilterProxyModel *DapScreenDialogChangeWidget::proxyModel() const
diff --git a/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
index d1c4dce80064722a5f52f13c4984a5ae54c9bde8..20dab74440ed7978adfcc662b929494c3ebd49ed 100644
--- a/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
+++ b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
@@ -4,8 +4,6 @@
#include <QObject>
#include <QSortFilterProxyModel>
-#include "DapUiQmlWidgetModel.h"
-
/// Class of dialog change widget
class DapScreenDialogChangeWidget : public QObject
{
diff --git a/CellFrameDashboardGUI/DapServiceController.cpp b/CellFrameDashboardGUI/DapServiceController.cpp
old mode 100755
new mode 100644
index 8391b39ed12aef86eebb9987b4eb2e7493b7a504..aaa03277b822a913b74d0e710247383c343579ec
--- a/CellFrameDashboardGUI/DapServiceController.cpp
+++ b/CellFrameDashboardGUI/DapServiceController.cpp
@@ -1,11 +1,7 @@
#include "DapServiceController.h"
-#include "DapUiQmlWidgetModel.h"
#include "DapLogMessage.h"
#include "DapChainWallet.h"
#include "DapSettings.h"
-
-
-
#include <QRegularExpression>
DapServiceController::DapServiceController(QObject *apParent)
@@ -114,7 +110,6 @@ void DapServiceController::processGetNodeLogs(const QStringList &aNodeLogs)
if(aNodeLogs.isEmpty())
return;
- int xx = DapLogModel::getInstance().rowCount();
QRegularExpression re("(?<=])\\s");
for (auto const & log : aNodeLogs)
{
@@ -140,7 +135,6 @@ void DapServiceController::getNodeLogs() const
void DapServiceController::clearLogModel()
{
DapLogModel::getInstance().clear();
- int z = DapLogModel::getInstance().rowCount();
emit logCompleted();
}
@@ -222,10 +216,6 @@ void DapServiceController::processGetWalletInfo(const QString &asWalletName, con
qInfo() << QString("processGetWalletInfo(%1, %2)").arg(asWalletName).arg(asWalletAddress);
DapChainWallet wallet("", asWalletName, asWalletAddress, aBalance, aTokens);
DapChainWalletsModel::getInstance().append(wallet);
-
- for (QString s : aBalance) {
- qDebug() << s;
- }
}
void DapServiceController::processExecuteCommandInfo(const QString &result)
diff --git a/CellFrameDashboardGUI/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h
old mode 100755
new mode 100644
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenAbout.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenAbout.ui.qml
deleted file mode 100644
index 55b664fa6c7cfd88ba2ee43a1e3c7eb17299ba42..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenAbout.ui.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.1
-
-Page {
- id: dapUiQmlScreenAbout
-
- property alias textTitle: textTitle
- property alias textAbout: textAbout
- property alias textVersion: textVersion
- property alias textYear: textYear
-
- title: qsTr("About")
-
- ColumnLayout {
- id: columnScreenLogin
- width: parent.width
- anchors.centerIn: parent
- clip: true
-
- RowLayout {
- id: rowAboutInformation
- spacing: 15
- Layout.alignment: Qt.AlignHCenter
- Layout.bottomMargin: 20
-
- Image {
- id: name
- source: "qrc:/Resources/Icons/icon.png"
- scale: 2
- Layout.alignment: Qt.AlignHCenter
- }
-
- ColumnLayout {
- id: columnText
-
- Text {
- id: textTitle
- width: parent.width
- font.pointSize: 14
- font.bold: true
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignHCenter
- }
-
- Text {
- id: textAbout
- width: parent.width
- font.pointSize: 12
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignHCenter
- }
- }
- }
-
- Text {
- id: textVersion
- width: parent.width
- font.pointSize: 10
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignHCenter
- }
-
- Text {
- id: textYear
- width: parent.width
- font.pointSize: 10
- wrapMode: Text.WordWrap
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignHCenter
- }
- }
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml b/CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml
deleted file mode 100755
index e34d54d2b10c647fd3dd002aa8cfe3c84e66bd44..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml
+++ /dev/null
@@ -1,160 +0,0 @@
-import QtQuick 2.9
-import QtQml 2.3
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
-import QtQml.Models 2.2
-import CellFrameDashboard 1.0
-
-Dialog {
- id: dialogChangeWidget
-
- function addWidget() {
- dialogChangeWidget.open();
- }
-
- width: parent.width/1.5
- height: parent.width/1.5
-
- x: parent.width / 2 - width / 2
- y: parent.height / 2 - height / 2
-
- focus: true
- modal: true
- title: qsTr("Change widget...")
-
- contentItem:
-
- Rectangle {
- id: b
- width: dialogChangeWidget.width
- height: dialogChangeWidget.height
- border.color: "gray"
- clip: true
-
- DapScreenDialogChangeWidget {
- id: widgetModel
- }
-
-// DelegateModel {
-// id: delegateModel
-
-// model: widgetModel.ProxyModel
-
-// groups: [
-// DelegateModelGroup {
-// id: group
-// name: "selected"
-// }
-// ]
-
-// delegate:
-// Rectangle {
-// id: item
-// height: text.height+10
-// width: listViewDapWidgets.width
-// RowLayout {
-// anchors.fill: parent
-
-// Text {
-// id: text
-// text: name
-// Layout.alignment: Qt.AlignVCenter
-// Layout.leftMargin: 10
-// }
-// }
-// MouseArea {
-// anchors.fill: parent
-// onClicked:
-// {
-// item.DelegateModel.inSelected = !item.DelegateModel.inSelected
-
-// if (item.DelegateModel.inSelected)
-// {
-// item.color = "aliceblue"
-// }
-// else
-// {
-// item.color = "transparent"
-// }
-// }
-// }
-// }
-// }
-
-// ListView {
-
-// id: listViewDapWidgets
-
-// anchors.fill: parent
-
-// anchors.margins: 1
-
-// model: delegateModel
-
-// ScrollBar.vertical: ScrollBar { }
-// }
- ListView {
-
- id: listViewDapWidgets
-
- anchors.fill: parent
-
- anchors.margins: 1
-
- model: dapUiQmlWidgetModel
-
- clip: true
-
- delegate:
- Rectangle {
- id: itemWidget
- height: checkBoxWidget.height+10
- width: listViewDapWidgets.width
- Row {
- anchors.fill: parent
-
- CheckBox {
- id: checkBoxWidget
- checkable: true
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 10
- }
-
- Text
- {
- id: textWidget
- text: qsTr(name)
- anchors.verticalCenter: parent.verticalCenter
- }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked:
- {
- listViewDapWidgets.currentIndex = index
- var item = DapUiQmlWidgetModel.get(index)
- dapUiQmlWidgetModel.set(index, dapUiQmlWidgetModel.get(index).name, dapUiQmlWidgetModel.get(index).URLpage, dapUiQmlWidgetModel.get(index).image, !item.visible)
- console.log("I: " +index + " : " + dapUiQmlWidgetModel.get(index) + " value = " + !item.visible)
-
- if(checkBoxWidget.checked)
- {
- checkBoxWidget.checkState = Qt.Unchecked
- }
- else
- {
- checkBoxWidget.checkState = Qt.Checked
- }
- }
- }
- }
-
- ScrollBar.vertical: ScrollBar { }
-
- highlight: Rectangle { color: "aliceblue"; radius: 5 }
-
- focus: true
- }
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
deleted file mode 100644
index e593f92f8c0ddd7e397f91b4b2cb56f966610373..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
+++ /dev/null
@@ -1,139 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
-
-Dialog {
- id: dialogRemoveWallet
- focus: true
- modal: true
-
- header:
- Rectangle
- {
- 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"
- }
- }
-
- width: parent.width/1.5
- height: 150
-
- x: parent.width / 2 - width / 2
- y: parent.height / 2 - height / 2
-
- function show() {
- 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
- {
- 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()
- }
- }
-
- 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/DapUiQmlScreenDialogSendToken.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogSendToken.qml
deleted file mode 100755
index ed1f96482d8183e4cf86492d67b5b2ccbe01bcdd..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogSendToken.qml
+++ /dev/null
@@ -1,278 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Controls.Private 1.0
-//import QtQuick.Controls 2.5
-import CellFrameDashboard 1.0
-
-Dialog {
- id: dialogSendToken
- focus: true
- modal: true
-
- header:
- Rectangle
- {
- height: 30
- color: "#353841"
-
- Text
- {
- id: textTitle
- leftPadding: 10
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Send token...")
- 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: 280
-
- x: parent.width / 2 - width / 2
- y: parent.height / 2 - height / 2
-
- function show() {
- textFieldAmount.clear()
- comboBoxToken.currentIndex = -1
- comboBoxAddressWallet.editText = ""
- dialogSendToken.open();
- }
-
- contentItem:
-
- Rectangle
- {
- anchors.fill: parent
-
- // TextField
- // {
- // background: Rectangle {
- // radius: 2
- // border.color: "gray"
- // border.width: 1
- // }
-
- // id: textFieldNameWallet
- // selectByMouse: true
- // height: 35
- // 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
-
-
- // }
-
- Row
- {
- anchors { bottom: rowAddress.top; bottomMargin: 20; right: parent.right; rightMargin: 10;
- left: parent.left; leftMargin: 10 }
- Rectangle
- {
- id: rectangleToken
- color: "green"
- width: 100
- height: comboBoxToken.height
- Text
- {
- font.family: "Roboto"
- font.weight: Font.Thin
- anchors.centerIn: parent
- text: qsTr("Token")
- color: "white"
- }
- }
-
- ComboBox {
- id: comboBoxToken
- width: parent.width - rectangleToken.width
- model: listViewTokens.model
- displayText: currentIndex === -1 ? "Please choose..." : currentText
- textRole: "token"
- delegate: ItemDelegate {
- width: comboBoxToken.width
- contentItem: Text {
- text: token
- font: comboBoxToken.font
- elide: Text.ElideRight
- verticalAlignment: Text.AlignVCenter
- }
- highlighted: comboBoxToken.highlightedIndex !== index
- }
- onAccepted: {
- currentText = listViewTokens.model.get(currentIndex).token
- }
- }
- }
-
- Row
- {
- id: rowAddress
- anchors { bottom: rowAmount.top; bottomMargin: 20; right: parent.right; rightMargin: 10;
- left: parent.left; leftMargin: 10 }
- Rectangle
- {
- id: rectangleAddress
- color: "green"
- width: 100
- height: comboBoxAddressWallet.height
- Text
- {
- font.family: "Roboto"
- font.weight: Font.Thin
- anchors.centerIn: parent
- text: qsTr("Receiver")
- color: "white"
- }
- }
-
- ComboBox {
- id: comboBoxAddressWallet
- width: parent.width - rectangleAddress.width
- editable: true
- textRole: "text"
- editText: currentIndex === -1 ? "Please enter..." : currentText
- onAccepted: {
- if (find(currentText) === -1) {
- model.append({text: editText})
- // currentIndex = find(editText)
- // fnameField.insert(currentIndex)
-
- }
- }
- }
- }
-
- Row
- {
- id: rowAmount
- anchors { bottom: buttonCancel.top; bottomMargin: 20; right: parent.right; rightMargin: 10;
- left: parent.left; leftMargin: 10 }
- Rectangle
- {
- id: rectangleAmount
- color: "green"
- width: 100
- height: comboBoxToken.height
- Text
- {
- font.family: "Roboto"
- font.weight: Font.Thin
- anchors.centerIn: parent
- text: qsTr("Amount")
- color: "white"
- }
- }
-
- TextField {
- property real realValue: parseFloat(textFieldAmount.text.replace(',', '.')) * 1e12;
- height: rectangleAmount.height
- width: parent.width - rectangleAmount.width
- id: textFieldAmount
- placeholderText: "Amount (Ex. 2,9103)"
- validator: DoubleValidator{}
- background: Rectangle {
- radius: 1
- border.color: "green"
- border.width: 1
- }
- }
- }
-
- 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()
- }
- }
-
- 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:
- {
- var wallet = listViewWallet.model.get(listViewWallet.currentIndex).name;
- var token = comboBoxToken.currentText;
- var amount = textFieldAmount.realValue.toString();
- var receiver = comboBoxAddressWallet.editText;
-
- if (wallet && token && amount && receiver) {
- console.log("Send " + token + "(" + amount + ") to address " + receiver + " from wallet " + wallet );
- dapServiceController.sendToken(wallet, receiver, token, amount);
- dapChainWalletsModel.clear();
- dapServiceController.getWallets();
- } else {
- console.log("There's error!");
- console.log(amount);
- }
-
- close()
- }
- }
- }
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenLogin.cpp.autosave b/CellFrameDashboardGUI/DapUiQmlScreenLogin.cpp.autosave
deleted file mode 100644
index e2737face41be9339d81b9ff9adb82c2ac4cfb95..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenLogin.cpp.autosave
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "DapUiQmlScreenLogin.h"
-
-DapUiQmlScreenLogin::DapUiQmlScreenLogin(QObject *parent) : QObject(parent)
-{
-
-}
-
-QString DapUiQmlScreenLogin::getPassword() const
-{
-
-}
-
-void DapUiQmlScreenLogin::setPassword(const QString &password)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenLogin.h.autosave b/CellFrameDashboardGUI/DapUiQmlScreenLogin.h.autosave
deleted file mode 100644
index de225a2d0e4202a4e4781a64881d35529c16419a..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenLogin.h.autosave
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef DAPUIQMLSCREENLOGIN_H
-#define DAPUIQMLSCREENLOGIN_H
-
-#include <QObject>
-
-class DapUiQmlScreenLogin : public QObject
-{
- Q_OBJECT
-
- QString m_password;
-public:
- explicit DapUiQmlScreenLogin(QObject *parent = nullptr);
-
- Q_PROPERTY(QString Password MEMBER m_password READ Password WRITE setPassword NOTIFY passwordChanged)
-
- QString getPassword() const;
-
- void setPassword(const QString &password);
-signals:
-
- void passwordChanged(const QString& password);
-public slots:
-};
-
-#endif // DAPUIQMLSCREENLOGIN_H
\ No newline at end of file
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml b/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml
deleted file mode 100644
index d764fba09aba7faae098b42a8719adfb46219bd0..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlScreenVpn.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.4
-
-DapUiQmlScreenVpnForm {
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidget.cpp b/CellFrameDashboardGUI/DapUiQmlWidget.cpp
deleted file mode 100644
index 5502b8281663969cdf6ee7e6e77c2b38230f0d5a..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidget.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "DapUiQmlWidget.h"
-
-bool DapUiQmlWidget::getVisible() const
-{
- return m_visible;
-}
-
-void DapUiQmlWidget::setVisible(bool visible)
-{
- m_visible = visible;
-}
-
-DapUiQmlWidget::DapUiQmlWidget(const QString &name, const QString &URLpage, const QString &image, const bool &visible, QObject *parent) : QObject(parent)
-{
- setName(name);
- setURLpage(URLpage);
- setImage(image);
- setVisible(visible);
-}
-
-QString DapUiQmlWidget::getName() const
-{
- return m_name;
-}
-
-void DapUiQmlWidget::setName(const QString &name)
-{
- m_name = name;
-}
-
-QString DapUiQmlWidget::getURLpage() const
-{
- return m_URLpage;
-}
-
-void DapUiQmlWidget::setURLpage(const QString &URLpage)
-{
- m_URLpage = URLpage;
-}
-
-QString DapUiQmlWidget::getImage() const
-{
- return m_image;
-}
-
-void DapUiQmlWidget::setImage(const QString &image)
-{
- m_image = image;
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidget.h b/CellFrameDashboardGUI/DapUiQmlWidget.h
deleted file mode 100644
index d321690e3dbd67679e5f55b33ea38b94598149d4..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidget.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef DAPUIQMLWIDGET_H
-#define DAPUIQMLWIDGET_H
-
-#include <QObject>
-
-class DapUiQmlWidget : public QObject
-{
- Q_OBJECT
-
-protected:
- QString m_name;
- QString m_URLpage;
- QString m_image;
- bool m_visible{false};
-public:
- explicit DapUiQmlWidget(QObject *parent = nullptr);
- explicit DapUiQmlWidget(const QString &name, const QString &URLpage, const QString &image, const bool &visible = false, QObject *parent = nullptr);
-
- ///
- Q_PROPERTY(QString Name MEMBER m_nameService READ getName WRITE setName NOTIFY nameChanged)
- ///
- Q_PROPERTY(QString URLpage MEMBER m_nameService READ getURLpage WRITE setURLpage NOTIFY URLpageChanged)
- ///
- Q_PROPERTY(QString Image MEMBER m_nameService READ getImage WRITE setImage NOTIFY imageChanged)
- ///
- Q_PROPERTY(bool Visible MEMBER m_nameService READ getVisible WRITE setVisible NOTIFY visibleChanged)
-
- QString getName() const;
- void setName(const QString &name);
-
- QString getURLpage() const;
- void setURLpage(const QString &URLpage);
-
- QString getImage() const;
- void setImage(const QString &image);
-
- bool getVisible() const;
- void setVisible(bool visible);
-
-signals:
- void nameChanged(const QString &name);
- void URLpageChanged(const QString &URLpage);
- void imageChanged(const QString &image);
- void visibleChanged(const bool &visible);
-
-public slots:
-};
-
-#endif // DAPUIQMLWIDGET_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.cpp
deleted file mode 100644
index 4a7b8233a4911a799cda5b1cf99e86e5339a3c52..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlWidgetChainBallance.h"
-
-DapUiQmlWidgetChainBallance::DapUiQmlWidgetChainBallance(const QString &name, const QString &URLpage, const QString &image) : DapUiQmlWidget(name, URLpage, image)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.h
deleted file mode 100644
index aea12f51fb60e3d914b4201ae83157ba8ca8a465..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef DAPUIQMLWIDGETCHAINBALLANCE_H
-#define DAPUIQMLWIDGETCHAINBALLANCE_H
-
-#include "DapUiQmlWidget.h"
-
-class DapUiQmlWidgetChainBallance : public DapUiQmlWidget
-{
-public:
- explicit DapUiQmlWidgetChainBallance(const QString &name, const QString &URLpage, const QString &image);
-
-};
-
-#endif // DAPUIQMLWIDGETCHAINBALLANCE_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp
deleted file mode 100644
index c125c66ac657cd452243e53106b989879522f78d..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlWidgetChainBlockExplorer.h"
-
-DapUiQmlWidgetChainBlockExplorer::DapUiQmlWidgetChainBlockExplorer(const QString &name, const QString &URLpage, const QString &image) : DapUiQmlWidget(name, URLpage, image)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h
deleted file mode 100644
index 135d4ffb15b277921cb2fc32a6e5da79bb0afed5..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef DAPUIQMLWIDGETCHAINBLOCKEXPLORER_H
-#define DAPUIQMLWIDGETCHAINBLOCKEXPLORER_H
-
-#include "DapUiQmlWidget.h"
-
-class DapUiQmlWidgetChainBlockExplorer : public DapUiQmlWidget
-{
-public:
- DapUiQmlWidgetChainBlockExplorer(const QString &name, const QString &URLpage, const QString &image);
-};
-
-#endif // DAPUIQMLWIDGETCHAINBLOCKEXPLORER_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml
deleted file mode 100644
index 33225cc2eacc68742842b14aee75c6030ccf256b..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-Page {
- id: dapUiQmlWidgetChainBlockExplorer
-
- title: qsTr("Blockchain explorer")
-
- Text {
- id: name
- anchors.centerIn: parent
- text: qsTr("Blockchain explorer")
- }
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp
deleted file mode 100644
index 0dae3836f4719fa526b8368c2e58605876a6fa45..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlWidgetChainNodeLogs.h"
-
-DapUiQmlWidgetChainNodeLogs::DapUiQmlWidgetChainNodeLogs(const QString &name, const QString &URLpage, const QString &image) : DapUiQmlWidget(name, URLpage, image)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.h
deleted file mode 100644
index debcc446393fdbe26b369caeea3b0341f294b9f0..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef DAPUIQMLWIDGETCHAINNODELOGS_H
-#define DAPUIQMLWIDGETCHAINNODELOGS_H
-
-#include "DapUiQmlWidget.h"
-
-class DapUiQmlWidgetChainNodeLogs : public DapUiQmlWidget
-{
-public:
- explicit DapUiQmlWidgetChainNodeLogs(const QString &name, const QString &URLpage, const QString &image);
-};
-
-#endif // DAPUIQMLWIDGETCHAINNODELOGS_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.cpp
deleted file mode 100644
index 1c22b7338e570e3805929b43b835296317154376..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlWidgetChainOperations.h"
-
-DapUiQmlWidgeChainOperations::DapUiQmlWidgeChainOperations(const QString &name, const QString &URLpage, const QString &image) : DapUiQmlWidget(name, URLpage, image)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.h
deleted file mode 100644
index 25d25fed895f715bff353eea79df6f7b5c144492..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef DAPUIQMLWIDGECHAINOPERATIONS_H
-#define DAPUIQMLWIDGECHAINOPERATIONS_H
-
-#include "DapUiQmlWidget.h"
-
-class DapUiQmlWidgeChainOperations : public DapUiQmlWidget
-{
-public:
- explicit DapUiQmlWidgeChainOperations(const QString &name, const QString &URLpage, const QString &image);
-};
-
-#endif // DAPUIQMLWIDGECHAINOPERATIONS_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml
deleted file mode 100644
index 61065a0d44f5023cb061d719c59cf036cef79d23..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-Page {
- id: dapUiQmlWidgetChainServicesClient
-
- title: qsTr("Services client")
-
- Text {
- id: name
- anchors.centerIn: parent
- text: qsTr("Services client")
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml
deleted file mode 100644
index 194f89e2ec45552e72ab39c7f89846a1c2e0e06b..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-Page {
- id: dapUiQmlWidgetChainServicesShareControl
-
- title: qsTr("Services share control")
-
- Text {
- id: name
- anchors.centerIn: parent
- text: qsTr("Services share control")
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml
deleted file mode 100644
index 54d6ac5b4a03c2ebe6d3a3e8fdba3347e4800bf7..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-Page {
- id: dapUiQmlWidgetChainSettings
-
- title: qsTr("Settings")
-
- Text {
- id: name
- anchors.centerIn: parent
- text: qsTr("Settings")
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.cpp
deleted file mode 100644
index 3231a0962a50c95c6edc4f1fca86493e11f87996..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "DapUiQmlWidgetChainTransactions.h"
-
-DapUiQmlWidgetChainTransactions::DapUiQmlWidgetChainTransactions(const QString &name, const QString &URLpage, const QString &image) : DapUiQmlWidget(name, URLpage, image)
-{
-
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.h
deleted file mode 100644
index d68fb2d08e1a9647e33b563d82dee892ee669458..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef DAPUIQMLWIDGETCHAINTRANSCTIONS_H
-#define DAPUIQMLWIDGETCHAINTRANSCTIONS_H
-
-#include "DapUiQmlWidget.h"
-
-class DapUiQmlWidgetChainTransactions : public DapUiQmlWidget
-{
-public:
- explicit DapUiQmlWidgetChainTransactions(const QString &name, const QString &URLpage, const QString &image);
-};
-
-#endif // DAPUIQMLWIDGETCHAINTRANSCTIONS_H
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml
deleted file mode 100755
index a49037b58301046c491e15837c50e0b91cec0abb..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Window 2.0
-import QtQuick.Controls.Styles 1.3
-import QtQuick.Controls.Styles 1.4
-import Qt.labs.platform 1.0
-import CellFrameDashboard 1.0
-
-DapUiQmlWidgetChainWalletForm {
- id: dapQmlWidgetChainWallet
-
- property int indexWallet: -1
- property string nameWallet: ""
-
- listViewWallet.highlight:
- Component
- {
- Rectangle {
- id: rectangleMenu
- color: "#121B28"
- Rectangle
- {
- height: rectangleMenu.height
- width: 4
- color: "green"
- }
- }
- }
-
- listViewWallet.onCurrentItemChanged:
- {
- listViewTokens.model.clear()
- for(var i = 0; i < listViewWallet.model.get(listViewWallet.currentIndex).count; i++)
- {
- var value = listViewWallet.model.get(listViewWallet.currentIndex).balance[i]
- listViewTokens.model.append({token: listViewWallet.model.get(listViewWallet.currentIndex).tokens[i], balance: value.replace(/[^\d.-]/g, '')});
- }
-
- if(listViewWallet.currentIndex >= 0)
- {
- indexWallet = listViewWallet.currentIndex
- nameWallet = listViewWallet.model.get(listViewWallet.currentIndex).name
- }
- else
- {
- listViewWallet.currentIndex = 0
- }
-
- addressWallet.text = listViewWallet.model.get(listViewWallet.currentIndex).address
- }
-
-// buttonSaveWallet.onClicked: {
-// dialogAddWallet.show()
-// }
-
- buttonDeleteWallet.onClicked: {
- dialogRemoveWallet.show()
- }
-
- buttonSendToken.onClicked: {
- dialogSendToken.show()
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
deleted file mode 100755
index 887a96ae253e5106601f6c583092e306cb2bca98..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
+++ /dev/null
@@ -1,271 +0,0 @@
-import QtQuick 2.9
-import QtGraphicalEffects 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.4
-import CellFrameDashboard 1.0
-
-Page {
- id: dapUiQmlWidgetChainWallet
-
- title: qsTr("Wallet")
-
- property alias listViewWallet: listViewWallet
- property alias buttonSaveWallet: buttonSaveWallet
- property alias dialogAddWallet: dialogAddWallet
- property alias dialogSendToken: dialogSendToken
- property alias addressWallet: addressWallet
- property alias listViewTokens: listViewTokens
- property alias buttonSendToken: buttonSendToken
- property alias buttonDeleteWallet: buttonDeleteWallet
- property alias dialogRemoveWallet: dialogRemoveWallet
-
- Rectangle {
- id: rectanglePanel
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- color: "#353841"
- width: 100
- ListView {
- id: listViewWallet
- anchors.fill: parent
- keyNavigationEnabled: true
- model: dapChainWalletsModel
-
- delegate: Item {
- id: delegateWallet
- width: parent.width
- height: 100
-
- Column {
- anchors.centerIn: parent
- spacing: 5
-
- Label {
- id: nameWallet
- anchors.horizontalCenter: parent.horizontalCenter
- text: qsTr(name)
- font.pixelSize: 14
- color: "#BBBEBF"
- font.family: "Roboto"
- width: delegateWallet.width
- elide: Text.ElideRight
- leftPadding: 5
- }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: listViewWallet.currentIndex = index
- }
- }
-
- focus: true
- }
- }
-
- Rectangle {
- anchors.left: rectanglePanel.right
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.bottom: parent.bottom
-
- Row
- {
- id: rowAddress
- anchors.top: parent.top
- anchors.left: parent.left
- anchors.right: parent.right
- height: 100
- width: parent.width
- Rectangle
- {
- id: rectangleLableAddress
- color: "green"
- width: 150
- height: parent.height
- Text
- {
- id: labelAddress
- anchors.centerIn: parent
- text: "Address"
- font.pixelSize: 22
- color: "white"
- }
- }
- Column
- {
- id: columnAddress
- width: rowAddress.width - rectangleLableAddress.width
- height: parent.height
- clip: true
- TextEdit {
- id: addressWallet
- font.pixelSize: 16
- wrapMode: TextEdit.WrapAnywhere
-
- selectByMouse: true
- color: "#353841"
- selectionColor: "#353841"
- clip: true
- readOnly: true
- height: parent.height - rectangleBottomBorder.height
- width: parent.width
- verticalAlignment: TextEdit.AlignVCenter
- horizontalAlignment: TextEdit.AlignHCenter
- }
- Rectangle
- {
- id: rectangleBottomBorder
- color: "green"
- height: 1
- width: columnAddress.width
- }
- }
- }
-
- ListView {
- id: listViewTokens
- height: 100
- orientation: ListView.Horizontal
- anchors.top: rowAddress.bottom
- anchors.left: parent.left
- anchors.right: parent.right
- flickableDirection: Flickable.VerticalFlick
- preferredHighlightBegin: parent.width/2-width/3/2;
- preferredHighlightEnd: parent.width/2+width/3/2
- highlightRangeMode: ListView.StrictlyEnforceRange
- snapMode: ListView.SnapOneItem;
- model: ListModel {
- id: modelTokens
- }
-
- delegate: Item {
- id: delegateListViewTokens
- width: listViewTokens.width/3; height: listViewTokens.height
- Column
- {
- id: itemRectangleIfoWallet
- anchors.centerIn: delegateListViewTokens
- Text {
- id: itemNameWallet;
- anchors.horizontalCenter: parent.horizontalCenter
- text: token;
- color: listViewTokens.currentIndex === index ? 'green' : "#BBBEBF";
- font.pixelSize: listViewTokens.currentIndex === index ? 40 : 30;
- font.family: "Roboto"
- font.weight: Font.Thin
- }
- Text {
- id: itemBalanceWallet;
- anchors.horizontalCenter: parent.horizontalCenter
- text: balance
- color: listViewTokens.currentIndex === index ? 'green' : "#BBBEBF";
- font.pixelSize: listViewTokens.currentIndex === index ? 40 : 30;
- font.family: "Roboto"
- font.weight: Font.Thin
- }
- }
- MouseArea {
- anchors.fill: parent
- onClicked: listViewTokens.currentIndex = index
- }
- }
-
- focus: true
- clip: true
- }
-
- Rectangle
- {
- id: rectangleHistory
- anchors.top: listViewTokens.bottom
- anchors.left: parent.left
- anchors.right: parent.right
- color: "green"
- width: parent.width
- height: 30
- Text
- {
- id: labelHistory
- anchors.centerIn: parent
- text: "History"
- font.pixelSize: 22
- color: "white"
- }
- }
- }
-
-// DapUiQmlScreenDialogAddWallet {
-// id: dialogAddWallet
-// }
- DapUiQmlScreenDialogSendToken {
- id: dialogSendToken
- }
- DapUiQmlScreenDialogRemoveWallet {
- id: dialogRemoveWallet
- }
- RoundButton {
- id: buttonDeleteWallet
- highlighted: true
- anchors.margins: 10
- anchors.left: parent.left
- anchors.bottom: buttonSaveWallet.top
- height: 40
- width: 40
- contentItem: Text {
- text: qsTr("-")
- color: "#121B28"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
- background: Rectangle {
- color: "white"
- border.color: "#121B28"
- radius: 20
- }
- }
-
- RoundButton {
- id: buttonSaveWallet
- contentItem: Text {
- text: qsTr("+")
- color: "#121B28"
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
- background: Rectangle {
- id: inSave
- color: "white"
- border.color: "#121B28"
- radius: 20
- }
-
- highlighted: true
- anchors.margins: 10
- anchors.left: parent.left
- anchors.bottom: parent.bottom
- height: 40
- width: 40
- }
-
- RoundButton {
- id: buttonSendToken
- text: qsTr("->")
- highlighted: true
- anchors.margins: 10
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- }
-
- RoundButton {
- id: buttonAddToken
- text: qsTr("+")
- highlighted: true
- anchors.margins: 10
- anchors.right: parent.right
- anchors.bottom: buttonSendToken.top
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetDashboardTokenSectionDelegate.qml b/CellFrameDashboardGUI/DapUiQmlWidgetDashboardTokenSectionDelegate.qml
deleted file mode 100644
index 1654091d879fae370bbf487b225e0e18f0f0e50b..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetDashboardTokenSectionDelegate.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.0
-
-Component {
-// property string walletAddress
-// width: parent.width
-// height: 32 * pt
-
- Text {
- anchors.fill: parent
- text: qsTr("Wallet address: ") + walletAddressDisplayRole
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetDelegate.qml b/CellFrameDashboardGUI/DapUiQmlWidgetDelegate.qml
deleted file mode 100644
index d8ccef85e08a2b8492302b1663e199591e020f40..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetDelegate.qml
+++ /dev/null
@@ -1,4 +0,0 @@
-import QtQuick 2.2
-
-DapUiQmlWidgetDelegateForm {
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml
deleted file mode 100644
index 638d3db2cc3ae467eaf0055ac9bd3aa1f277c0d0..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-
-ItemDelegate {
- id: itemDelegateDapWidget
-
- checkable: true
-
- contentItem: Rectangle {
- anchors.fill: parent
- border.color: "grey"
- color: "transparent"
- radius: width/50
- anchors.margins: 5
- clip: true
-
- Column {
- width: parent.width
- anchors.centerIn: parent
- spacing: width / 10
- anchors.margins: width / 10
- Image {
- id: iconWidget
- source: image
- width: parent.width * 2/3
- height: width
- anchors.horizontalCenter: parent.horizontalCenter
- }
- Text {
- text: name
- color: "darkgrey"
- anchors.horizontalCenter: parent.horizontalCenter
- }
- }
- }
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeComboBox.qml b/CellFrameDashboardGUI/DapUiQmlWidgetExchangeComboBox.qml
deleted file mode 100644
index 21152a57db0f4d2f07787088df053a4d1b30c4ae..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeComboBox.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 2.0
-
-///This file will be deleted in feature 2708
-DapUiQmlWidgetStatusBarComboBox {
-
- fontSizeDelegateComboBox: 16*pt
-
- indicator: Image {
- // id: imageIndicator
- source: parent.popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up_dark_blue.png" : "qrc:/Resources/Icons/ic_arrow_drop_down_dark_blue.png"
- width: 24 * pt
- height: 24 * pt
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 16 * pt
- }
-
- contentItem: Text {
- id: headerText
- anchors.fill: parent
- anchors.leftMargin: 16 * pt
- anchors.topMargin: 12 * pt
- text: parent.displayText
- font.family: fontRobotoRegular.name
- font.pixelSize: 16 * pt
- color: hilightColor
- verticalAlignment: Text.AlignTop
- }
- hilightColor: "#070023"
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetModel.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetModel.cpp
deleted file mode 100755
index 97be86b6950f710ec0cd8a5df5271c52e8b340cb..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetModel.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "DapUiQmlWidgetModel.h"
-
-DapUiQmlWidgetModel::DapUiQmlWidgetModel(QObject *parent) : QAbstractListModel(parent)
-{
- m_dapUiQmlWidgets.append(new DapUiQmlWidget("Blockchain explorer", "DapUiQmlWidgetChainBlockExplorer.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Exchanges", "DapUiQmlWidgetChainExchanges.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Services client", "DapUiQmlWidgetChainServicesClient.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Services share control", "DapUiQmlWidgetChainServicesShareControl.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Settings", "DapUiQmlWidgetChainSettings.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Wallet", "DapUiQmlWidgetChainWallet.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Logs", "DapUiQmlWidgetChainNodeLogsForm.ui.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Console cli", "DapUiQmlWidgetConsole.qml", "qrc:/Resources/Icons/add.png"));
- m_dapUiQmlWidgets.append(new DapUiQmlWidget( "Map", "DapUiQmlWidgetNodeNetworkExplorer.qml", "qrc:/Resources/Icons/add.png"));
-}
-
-DapUiQmlWidgetModel &DapUiQmlWidgetModel::getInstance()
-{
- static DapUiQmlWidgetModel instance;
- return instance;
-}
-
-int DapUiQmlWidgetModel::rowCount(const QModelIndex &) const
-{
- return m_dapUiQmlWidgets.count();
-}
-
-QVariant DapUiQmlWidgetModel::data(const QModelIndex &index, int role) const
-{
- if (index.row() < rowCount())
- switch (role) {
- case NameRole: return m_dapUiQmlWidgets.at(index.row())->getName();
- case URLPageRole: return m_dapUiQmlWidgets.at(index.row())->getURLpage();
- case ImageRole: return m_dapUiQmlWidgets.at(index.row())->getImage();
- case VisibleRole: return m_dapUiQmlWidgets.at(index.row())->getVisible();
- default:
- return QVariant();
- }
- return QVariant();
-}
-
-QHash<int, QByteArray> DapUiQmlWidgetModel::roleNames() const
-{
- static const QHash<int, QByteArray> roles {
- { NameRole, "name" },
- { URLPageRole, "URLpage" },
- { ImageRole, "image" },
- { VisibleRole, "visible" }
- };
-
- return roles;
-}
-
-QVariantMap DapUiQmlWidgetModel::get(int row) const
-{
- const DapUiQmlWidget *widget = m_dapUiQmlWidgets.value(row);
- return { {"name", widget->getName()}, {"URLpage", widget->getURLpage()}, {"image", widget->getImage()}, {"visible", widget->getVisible()} };
-}
-
-void DapUiQmlWidgetModel::append(const QString &name, const QString &URLpage, const QString &image, const bool &visible)
-{
- int row = 0;
- while (row < m_dapUiQmlWidgets.count() && name > m_dapUiQmlWidgets.at(row)->getName())
- ++row;
- beginInsertRows(QModelIndex(), row, row);
- m_dapUiQmlWidgets.insert(row, new DapUiQmlWidget(name, URLpage, image, visible));
- endInsertRows();
-}
-
-void DapUiQmlWidgetModel::set(int row, const QString &name, const QString &URLpage, const QString &image, const bool &visible)
-{
- if (row < 0 || row >= m_dapUiQmlWidgets.count())
- return;
-
- DapUiQmlWidget *widget = m_dapUiQmlWidgets.value(row);
- widget->setName(name);
- widget->setURLpage(URLpage);
- widget->setImage(image);
- widget->setVisible(visible);
- dataChanged(index(row, 0), index(row, 0), { NameRole, URLPageRole, ImageRole, VisibleRole });
-}
-
-void DapUiQmlWidgetModel::remove(int row)
-{
- if (row < 0 || row >= m_dapUiQmlWidgets.count())
- return;
-
- beginRemoveRows(QModelIndex(), row, row);
- m_dapUiQmlWidgets.removeAt(row);
- endRemoveRows();
-}
-
-/// Method that implements the singleton pattern for the qml layer.
-/// @param engine QML application.
-/// @param scriptEngine The QJSEngine class provides an environment for evaluating JavaScript code.
-QObject *DapUiQmlWidgetModel::singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
- Q_UNUSED(engine)
- Q_UNUSED(scriptEngine)
-
- return &getInstance();
-}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetModel.h b/CellFrameDashboardGUI/DapUiQmlWidgetModel.h
deleted file mode 100644
index 9613864d2c6ae2fdc2b3da0a18a1699dd16f0824..0000000000000000000000000000000000000000
--- a/CellFrameDashboardGUI/DapUiQmlWidgetModel.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef DAPUIQMLWIDGETMODEL_H
-#define DAPUIQMLWIDGETMODEL_H
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QList>
-#include <QQmlEngine>
-#include <QJSEngine>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QXmlStreamAttribute>
-
-#include "DapUiQmlWidget.h"
-
-enum DapUiQmlWidgetRole {
- NameRole = Qt::DisplayRole,
- URLPageRole = Qt::UserRole,
- ImageRole,
- VisibleRole
- };
-
-class DapUiQmlWidgetModel : public QAbstractListModel
-{
- Q_OBJECT
-
- QList<DapUiQmlWidget*> m_dapUiQmlWidgets;
-
- DapUiQmlWidgetModel(QObject *parent = nullptr);
-public:
-
- /// Get an instance of a class.
- /// @return Instance of a class.
- Q_INVOKABLE static DapUiQmlWidgetModel &getInstance();
-
-
- Q_ENUM(DapUiQmlWidgetRole)
-
- int rowCount(const QModelIndex & = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- QHash<int, QByteArray> roleNames() const;
-
- Q_INVOKABLE QVariantMap get(int row) const;
- Q_INVOKABLE void append(const QString &name, const QString &URLpage, const QString &image, const bool &visible);
- Q_INVOKABLE void set(int row, const QString &name, const QString &URLpage, const QString &image, const bool &visible);
- Q_INVOKABLE void remove(int row);
-
-public slots:
- /// Method that implements the singleton pattern for the qml layer.
- /// @param engine QML application.
- /// @param scriptEngine The QJSEngine class provides an environment for evaluating JavaScript code.
- static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine);
-};
-
-#endif // DAPUIQMLWIDGETMODEL_H
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down_dark_blue.png b/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down_dark_blue.png
deleted file mode 100644
index 1ac87aaa588bca2ae4b208cab2e93b3606f7b1e3..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down_dark_blue.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up_dark_blue.png b/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up_dark_blue.png
deleted file mode 100644
index 3fe34c8940c90afcecbe24eefd9a9db045be19fb..0000000000000000000000000000000000000000
Binary files a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up_dark_blue.png and /dev/null differ
diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
old mode 100755
new mode 100644
index 7379a76e4cf4f2b0a74ce9e0a7779c40cfccff7c..942af0aef38cbcc1f7a0c536dfb3170244940b4d
--- a/CellFrameDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -11,9 +11,7 @@
#include "DapHalper.h"
#include "DapScreenDialog.h"
#include "DapScreenDialogChangeWidget.h"
-#include "DapUiQmlWidgetModel.h"
#include "DapSettings.h"
-#include "DapSettingsCipher.h"
#include "DapServiceClient.h"
#include "DapServiceController.h"
#include "DapLogger.h"
@@ -43,7 +41,7 @@ int main(int argc, char *argv[])
app.setOrganizationName("DEMLABS");
app.setOrganizationDomain("demlabs.net");
app.setApplicationName("CellFrame Dashboard");
- app.setWindowIcon(QIcon(":/Resources/Icons/icon.ico"));
+ app.setWindowIcon(QIcon(":/res/icons/icon.ico"));
DapLogger dapLogger;
/// TODO: The code is commented out at the time of developing the logging strategy in the project
@@ -81,14 +79,12 @@ int main(int argc, char *argv[])
qmlRegisterType<DapScreenDialogChangeWidget>("CellFrameDashboard", 1, 0, "DapScreenDialogChangeWidget");
qmlRegisterType<DapLogMessage>("LogMessage", 1, 0, "DapLogMessage");
qmlRegisterType<DapChainNodeNetworkExplorer>("NodeNetworkExplorer", 1, 0, "DapUiQmlWidgetNodeNetwork");
- qmlRegisterSingletonType<DapUiQmlWidgetModel>("CellFrameDashboard", 1, 0, "DapUiQmlWidgetModel", DapUiQmlWidgetModel::singletonProvider);
qmlRegisterType<DapScreenHistoryModel>("DapTransactionHistory", 1, 0, "DapTransactionModel");
QQmlApplicationEngine engine;
/// TODO: this method for getting DPI screen can be useful in the future
// qreal dpi = QGuiApplication::primaryScreen()->physicalDotsPerInch();
engine.rootContext()->setContextProperty("dapServiceController", &DapServiceController::getInstance());
- engine.rootContext()->setContextProperty("dapUiQmlWidgetModel", &DapUiQmlWidgetModel::getInstance());
engine.rootContext()->setContextProperty("dapLogModel", &DapLogModel::getInstance());
engine.rootContext()->setContextProperty("dapChainWalletsModel", &DapChainWalletsModel::getInstance());
engine.rootContext()->setContextProperty("dapNodeNetworkModel", &DapChainNodeNetworkModel::getInstance());
@@ -100,9 +96,7 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("dapWalletModel", &DapChainWalletModel::instance());
engine.rootContext()->setContextProperty("clipboard", &DapClipboard::instance());
engine.rootContext()->setContextProperty("pt", 1.3);
- engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-
-
+ engine.load(QUrl("qrc:/screen/main.qml"));
if (engine.rootObjects().isEmpty())
return -1;
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 53ef6ece4a58790f2ffb0d8115f5714561e7c661..2cfbf67d724c395e5c4b897bc11650f4611b8cf2 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -1,106 +1,95 @@
<RCC>
<qresource prefix="/">
- <file>main.qml</file>
<file>CellFrameDashboardGUI.conf</file>
- <file>DapUiQmlWidgetChainBlockExplorer.ui.qml</file>
- <file>DapUiQmlWidgetChainExchanges.ui.qml</file>
- <file>DapUiQmlWidgetChainServicesClient.ui.qml</file>
- <file>DapUiQmlWidgetChainServicesShareControl.ui.qml</file>
- <file>DapUiQmlWidgetChainSettings.ui.qml</file>
- <file>DapUiQmlScreenDashboard.qml</file>
- <file>Resources/Icons/icon.png</file>
- <file>DapUiQmlScreenAbout.ui.qml</file>
- <file>DapQmlScreenAbout.qml</file>
- <file>DapUiQmlWidgetDelegate.qml</file>
- <file>DapUiQmlWidgetDelegateForm.ui.qml</file>
- <file>DapUiQmlScreenChangeWidget.qml</file>
- <file>Resources/Icons/icon.ico</file>
- <file>DapUiQmlScreenDialogAddWallet.qml</file>
- <file>DapUiQmlWidgetChainWallet.qml</file>
- <file>DapUiQmlWidgetChainWalletForm.ui.qml</file>
- <file>DapUiQmlWidgetChainNodeLogs.qml</file>
- <file>DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
- <file>DapUiQmlScreenDialogSendToken.qml</file>
- <file>DapUiQmlScreenDialogRemoveWallet.qml</file>
- <file>DapUiQmlWidgetNodeNetworkExplorer.qml</file>
- <file>Resources/Icons/defaul_icon.png</file>
- <file>DapUiQmlScreenExchangeForm.ui.qml</file>
- <file>Resources/Fonts/roboto_light.ttf</file>
- <file>Resources/Fonts/roboto_medium.ttf</file>
- <file>Resources/Fonts/roboto_regular.ttf</file>
- <file>DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
- <file>DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file>
- <file>DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
- <file>DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
- <file>DapUiQmlScreenHistory.qml</file>
- <file>Resources/Icons/ic_scroll-down.png</file>
- <file>Resources/Icons/ic_scroll-down_hover.png</file>
- <file>Resources/Icons/ic_scroll-up.png</file>
- <file>Resources/Icons/ic_scroll-up_hover.png</file>
- <file>DapUiQmlWidgetLastActionsButtonForm.qml</file>
- <file>DapUiQmlWidgetLastActionsDelegateForm.qml</file>
- <file>DapUiQmlWidgetLastActionsSectionForm.qml</file>
- <file>DapUiQmlWidgetLastActionsHeaderForm.qml</file>
- <file>DapUiQmlScreenMainWindow.qml</file>
- <file>DapUiQmlScreenMainWindowForm.ui.qml</file>
- <file>DapUiQmlWidgetLastActions.qml</file>
- <file>DapUiQmlWidgetLastActionsForm.ui.qml</file>
- <file>DapUiQmlScreenHistoryForm.ui.qml</file>
- <file>DapUiQmlScreenConsoleForm.ui.qml</file>
- <file>DapUiQmlWidgetConsoleLastActionsForm.qml</file>
- <file>DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file>
- <file>DapUiQmlWidgetConsole.qml</file>
- <file>DapUiQmlWidgetConsoleForm.ui.qml</file>
- <file>Resources/Icons/icon_console.png</file>
- <file>Resources/Icons/icon_console_hover.png</file>
- <file>Resources/Icons/icon_dashboard.png</file>
- <file>Resources/Icons/icon_dashboard_hover.png</file>
- <file>Resources/Icons/icon_exchange.png</file>
- <file>Resources/Icons/icon_exchange_hover.png</file>
- <file>Resources/Icons/icon_history.png</file>
- <file>Resources/Icons/icon_history_hover.png</file>
- <file>Resources/Icons/icon_logs.png</file>
- <file>Resources/Icons/icon_logs_hover.png</file>
- <file>Resources/Icons/ic_arrow_drop_down.png</file>
- <file>Resources/Icons/ic_arrow_drop_up.png</file>
- <file>DapUiQmlWidgetStatusBar.qml</file>
- <file>DapUiQmlWidgetSettingsNetwork.qml</file>
- <file>DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
- <file>DapUiQmlScreenSettings.qml</file>
- <file>DapUiQmlScreenSettingsForm.ui.qml</file>
- <file>DapUiQmlScreenSettingsSection.qml</file>
- <file>DapUiQmlWidgetStatusBarButton.ui.qml</file>
- <file>Resources/Icons/icon_settings.png</file>
- <file>Resources/Icons/icon_settings_hover.png</file>
- <file>DapUiQmlScreenVpn.qml</file>
- <file>DapUiQmlScreenVpnForm.ui.qml</file>
- <file>DapUiQmlWidgetSettingsVpn.qml</file>
- <file>DapUiQmlWidgetSettingsVpnForm.ui.qml</file>
- <file>DapUiQmlWidgetSettingsVpnComboBox.qml</file>
- <file>DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file>
- <file>DapUiQmlWidgetDashboardTokenSectionDelegate.qml</file>
- <file>DapUiQmlScreenDialogAddWalletForm.ui.qml</file>
- <file>DapUiQmlRecoveryQrForm.ui.qml</file>
- <file>DapUiQmlRecoveryNotesForm.ui.qml</file>
- <file>DapUiQmlWalletCreatedForm.ui.qml</file>
- <file>Resources/Icons/back_icon.png</file>
- <file>Resources/Icons/back_icon_hover.png</file>
- <file>Resources/Icons/close_icon.png</file>
- <file>Resources/Icons/close_icon_hover.png</file>
- <file>Resources/Icons/ic_copy.png</file>
- <file>Resources/Icons/ic_copy_hover.png</file>
- <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>
- <file>Resources/Icons/ic_arrow_drop_down_dark_blue.png</file>
- <file>Resources/Icons/ic_arrow_drop_up_dark_blue.png</file>
- <file>DapUiQmlWidgetExchangeComboBox.qml</file>
+ <file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
+ <file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
+ <file>res/cellframe-logo.svg</file>
+ <file>res/Settings.json</file>
+ <file>res/fonts/roboto_light.ttf</file>
+ <file>res/fonts/roboto_medium.ttf</file>
+ <file>res/fonts/roboto_regular.ttf</file>
+ <file>res/icons/back_icon.png</file>
+ <file>res/icons/back_icon_hover.png</file>
+ <file>res/icons/close_icon.png</file>
+ <file>res/icons/close_icon_hover.png</file>
+ <file>res/icons/dashboard.icns</file>
+ <file>res/icons/defaul_icon.png</file>
+ <file>res/icons/ic_arrow_drop_down.png</file>
+ <file>res/icons/ic_arrow_drop_up.png</file>
+ <file>res/icons/ic_copy.png</file>
+ <file>res/icons/ic_copy_hover.png</file>
+ <file>res/icons/ic_edit.png</file>
+ <file>res/icons/ic_edit_hover.png</file>
+ <file>res/icons/ic_scroll-down.png</file>
+ <file>res/icons/ic_scroll-down_hover.png</file>
+ <file>res/icons/ic_scroll-up.png</file>
+ <file>res/icons/ic_scroll-up_hover.png</file>
+ <file>res/icons/icon.ico</file>
+ <file>res/icons/icon.png</file>
+ <file>res/icons/icon_console.png</file>
+ <file>res/icons/icon_console_hover.png</file>
+ <file>res/icons/icon_dashboard.png</file>
+ <file>res/icons/icon_dashboard_hover.png</file>
+ <file>res/icons/icon_exchange.png</file>
+ <file>res/icons/icon_exchange_hover.png</file>
+ <file>res/icons/icon_history.png</file>
+ <file>res/icons/icon_history_hover.png</file>
+ <file>res/icons/icon_logs.png</file>
+ <file>res/icons/icon_logs_hover.png</file>
+ <file>res/icons/icon_settings.png</file>
+ <file>res/icons/icon_settings_hover.png</file>
+ <file>res/icons/new-payment_icon.png</file>
+ <file>screen/DapUiQmlScreen.qml</file>
+ <file>screen/DapUiQmlScreenMainWindow.qml</file>
+ <file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
+ <file>screen/main.qml</file>
+ <file>screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
+ <file>screen/Console/DapUiQmlWidgetConsole.qml</file>
+ <file>screen/Console/DapUiQmlWidgetConsoleForm.ui.qml</file>
+ <file>screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file>
+ <file>screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file>
+ <file>screen/Dashboard/DapUiQmlScreenDashboard.qml</file>
+ <file>screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file>
+ <file>screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml</file>
+ <file>screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
+ <file>screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
+ <file>screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
+ <file>screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file>
+ <file>screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml</file>
+ <file>screen/History/DapUiQmlScreenHistory.qml</file>
+ <file>screen/History/DapUiQmlScreenHistoryForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlScreenDialogAddWallet.qml</file>
+ <file>screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml</file>
+ <file>screen/LastAction/DapUiQmlWalletCreated.qml</file>
+ <file>screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlWalletCreatedHeader.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActions.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetRightPanel.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml</file>
+ <file>screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml</file>
+ <file>screen/Log/DapUiQmlWidgetChainNodeLogs.qml</file>
+ <file>screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
+ <file>screen/Settings/DapUiQmlScreenSettings.qml</file>
+ <file>screen/Settings/DapUiQmlScreenSettingsForm.ui.qml</file>
+ <file>screen/Settings/DapUiQmlScreenSettingsSection.qml</file>
+ <file>screen/Settings/DapUiQmlWidgetSettingsNetwork.qml</file>
+ <file>screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
+ <file>screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file>
+ <file>screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml</file>
+ <file>screen/VPN/DapUiQmlScreenVpn.qml</file>
+ <file>screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file>
+ <file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file>
+ <file>screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml</file>
+ <file>screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file>
+ <file>screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/Resources/Settings.json b/CellFrameDashboardGUI/res/Settings.json
old mode 100755
new mode 100644
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Settings.json
rename to CellFrameDashboardGUI/res/Settings.json
diff --git a/CellFrameDashboardGUI/Resources/cellframe-logo.svg b/CellFrameDashboardGUI/res/cellframe-logo.svg
similarity index 100%
rename from CellFrameDashboardGUI/Resources/cellframe-logo.svg
rename to CellFrameDashboardGUI/res/cellframe-logo.svg
diff --git a/CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt b/CellFrameDashboardGUI/res/fonts/LICENSE.txt
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt
rename to CellFrameDashboardGUI/res/fonts/LICENSE.txt
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_black.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..51c71bbe2d565247a020319ff9b324e8c8e05353
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_black.ttf differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ca20ca399981d14c441b9ea2f3decc1c88e69da4
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e612852d259930d0dcc632318ac0f15ae312422b
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..677bc045e565c7b74c3ce0f8ad55df305bb28a29
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fd05c3b645a8fdcdeffae18bffc19369514a76a
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_light.ttf
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..eec0ae9be8f8f74279afe5253de5286c04fc2fad
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_medium.ttf
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..66aa174f058481c39bcd60bdb464a1b3f78e4dcc
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf differ
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf b/CellFrameDashboardGUI/res/fonts/roboto_regular.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_regular.ttf
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a85eb7c29505713608ec9fd8489944977914be21
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf differ
diff --git a/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ac77951b80fc3ad37533dcae49c9e8085c42f1fb
Binary files /dev/null and b/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf differ
diff --git a/CellFrameDashboardGUI/Resources/Icons/back_icon.png b/CellFrameDashboardGUI/res/icons/back_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/back_icon.png
rename to CellFrameDashboardGUI/res/icons/back_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/back_icon_hover.png b/CellFrameDashboardGUI/res/icons/back_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/back_icon_hover.png
rename to CellFrameDashboardGUI/res/icons/back_icon_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/close_icon.png b/CellFrameDashboardGUI/res/icons/close_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/close_icon.png
rename to CellFrameDashboardGUI/res/icons/close_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/close_icon_hover.png b/CellFrameDashboardGUI/res/icons/close_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/close_icon_hover.png
rename to CellFrameDashboardGUI/res/icons/close_icon_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/dashboard.icns b/CellFrameDashboardGUI/res/icons/dashboard.icns
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/dashboard.icns
rename to CellFrameDashboardGUI/res/icons/dashboard.icns
diff --git a/CellFrameDashboardGUI/Resources/Icons/defaul_icon.png b/CellFrameDashboardGUI/res/icons/defaul_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/defaul_icon.png
rename to CellFrameDashboardGUI/res/icons/defaul_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down.png
rename to CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up.png
rename to CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_copy.png b/CellFrameDashboardGUI/res/icons/ic_copy.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_copy.png
rename to CellFrameDashboardGUI/res/icons/ic_copy.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_copy_hover.png b/CellFrameDashboardGUI/res/icons/ic_copy_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_copy_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_copy_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_edit.png b/CellFrameDashboardGUI/res/icons/ic_edit.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_edit.png
rename to CellFrameDashboardGUI/res/icons/ic_edit.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_edit_hover.png b/CellFrameDashboardGUI/res/icons/ic_edit_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_edit_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_edit_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png b/CellFrameDashboardGUI/res/icons/ic_scroll-down.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-down.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png b/CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png b/CellFrameDashboardGUI/res/icons/ic_scroll-up.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-up.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png b/CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon.ico b/CellFrameDashboardGUI/res/icons/icon.ico
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon.ico
rename to CellFrameDashboardGUI/res/icons/icon.ico
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon.png b/CellFrameDashboardGUI/res/icons/icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon.png
rename to CellFrameDashboardGUI/res/icons/icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console.png b/CellFrameDashboardGUI/res/icons/icon_console.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_console.png
rename to CellFrameDashboardGUI/res/icons/icon_console.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png b/CellFrameDashboardGUI/res/icons/icon_console_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_console_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png b/CellFrameDashboardGUI/res/icons/icon_dashboard.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png
rename to CellFrameDashboardGUI/res/icons/icon_dashboard.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png b/CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange.png b/CellFrameDashboardGUI/res/icons/icon_exchange.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_exchange.png
rename to CellFrameDashboardGUI/res/icons/icon_exchange.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png b/CellFrameDashboardGUI/res/icons/icon_exchange_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_exchange_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history.png b/CellFrameDashboardGUI/res/icons/icon_history.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_history.png
rename to CellFrameDashboardGUI/res/icons/icon_history.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png b/CellFrameDashboardGUI/res/icons/icon_history_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_history_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs.png b/CellFrameDashboardGUI/res/icons/icon_logs.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_logs.png
rename to CellFrameDashboardGUI/res/icons/icon_logs.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png b/CellFrameDashboardGUI/res/icons/icon_logs_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_logs_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings.png b/CellFrameDashboardGUI/res/icons/icon_settings.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_settings.png
rename to CellFrameDashboardGUI/res/icons/icon_settings.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png b/CellFrameDashboardGUI/res/icons/icon_settings_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_settings_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/new-payment_icon.png b/CellFrameDashboardGUI/res/icons/new-payment_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/new-payment_icon.png
rename to CellFrameDashboardGUI/res/icons/new-payment_icon.png
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
similarity index 97%
rename from CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
rename to CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
index 50d2151500c7cf8ca0f8e6c1a41e5d268af2fe74..0bd82d2d613ea0a26f0b18c50afa85d1ca572b17 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
@@ -3,6 +3,7 @@ import QtQml 2.12
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
import QtQuick.Controls 1.4
+import "../"
DapUiQmlScreen {
SplitView {
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
rename to CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml
rename to CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
rename to CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
similarity index 91%
rename from CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
rename to CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
index e96f0f39cca36d0f9ba446d5e68f2074b75d1a15..d59b10cbf67f751d8cf8f55c7f13a5ea84409e8e 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
@@ -1,6 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.13
+import "../LastAction"
DapUiQmlWidgetLastActions {
property TextArea consoleData
diff --git a/CellFrameDashboardGUI/DapUiQmlScreen.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
similarity index 62%
rename from CellFrameDashboardGUI/DapUiQmlScreen.qml
rename to CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
index 3596945747322680dd44ebd38db5141e2241a461..ad714740099b3d5169997e49c13d31800bcff8f5 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
@@ -1,4 +1,5 @@
-import QtQuick 2.4
+import QtQuick 2.9
+import "LastAction"
Rectangle {
property DapUiQmlWidgetRightPanel rightPanel
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
similarity index 97%
rename from CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
rename to CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
index 33f62f756b3ddca073e60df14ddb35453318eaf7..a1ab023fc352024fc799a083ddb8978003627cd5 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
@@ -84,9 +84,3 @@ DapUiQmlScreenMainWindowForm {
}
}
}
-
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
similarity index 61%
rename from CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
rename to CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
index 86cc5e6821193518a0fd87901ce8b06d6a90a40b..7858fad9b66d9b28c6ce193a529fa8f43eecb8e9 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
@@ -2,8 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
import QtQuick.Controls.Styles 1.4
-
-import CellFrameDashboard 1.0
+import "./StatusBar"
+import "./LastAction"
Page {
id: dapUiQmlScreenMainWindow
@@ -12,14 +12,14 @@ Page {
/// ----------- Load fonts -----------
/// using example: font.family: fontRobotoLight.name
readonly property FontLoader fontRobotoLight: FontLoader {
- source: "qrc:/Resources/Fonts/roboto_light.ttf"
+ source: "qrc:/res/fonts/roboto_light.ttf"
}
readonly property FontLoader fontRobotoRegular: FontLoader {
- source: "qrc:/Resources/Fonts/roboto_regular.ttf"
+ source: "qrc:/res/fonts/roboto_regular.ttf"
}
readonly property FontLoader fontRobotoMedium: FontLoader {
- source: "qrc:/Resources/Fonts/roboto_medium.ttf"
+ source: "qrc:/res/fonts/roboto_medium.ttf"
}
/// -----------
property alias listViewTabs: listViewTabs
@@ -55,63 +55,63 @@ Page {
ListElement {
name: qsTr("Dashboard")
- page: "DapUiQmlScreenDashboard.qml"
- normal: "qrc:/Resources/Icons/icon_dashboard.png"
- hover: "qrc:/Resources/Icons/icon_dashboard_hover.png"
- panelHeader: "DapUiQmlWidgetLastActionsHeaderForm.qml"
- panelContent: "DapUiQmlWidgetHistoryLastActions.qml"
+ page: "qrc:/screen/Dashboard/DapUiQmlScreenDashboard.qml"
+ normal: "qrc:/res/icons/icon_dashboard.png"
+ hover: "qrc:/res/icons/icon_dashboard_hover.png"
+ panelHeader: "qrc:/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml"
+ panelContent: "qrc:/screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml"
}
ListElement {
name: qsTr("Exchange")
- page: "DapUiQmlScreenExchangeForm.ui.qml"
- normal: "qrc:/Resources/Icons/icon_exchange.png"
- hover: "qrc:/Resources/Icons/icon_exchange_hover.png"
+ page: "qrc:/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml"
+ normal: "qrc:/res/icons/icon_exchange.png"
+ hover: "qrc:/res/icons/icon_exchange_hover.png"
panelHeader: ""
panelContent: ""
}
ListElement {
name: qsTr("History")
- page: "DapUiQmlScreenHistory.qml"
- normal: "qrc:/Resources/Icons/icon_history.png"
- hover: "qrc:/Resources/Icons/icon_history_hover.png"
+ page: "qrc:/screen/History/DapUiQmlScreenHistory.qml"
+ normal: "qrc:/res/icons/icon_history.png"
+ hover: "qrc:/res/icons/icon_history_hover.png"
panelHeader: ""
panelContent: ""
}
ListElement {
name: qsTr("Console")
- 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"
+ page: "qrc:/screen/Console/DapUiQmlScreenConsoleForm.ui.qml"
+ normal: "qrc:/res/icons/icon_console.png"
+ hover: "qrc:/res/icons/icon_console_hover.png"
+ panelHeader: "qrc:/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml"
+ panelContent: "qrc:/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml"
}
ListElement {
name: qsTr("Logs")
- page: "DapUiQmlWidgetChainNodeLogs.qml"
- normal: "qrc:/Resources/Icons/icon_logs.png"
- hover: "qrc:/Resources/Icons/icon_logs_hover.png"
+ page: "qrc:/screen/Log/DapUiQmlWidgetChainNodeLogs.qml"
+ normal: "qrc:/res/icons/icon_logs.png"
+ hover: "qrc:/res/icons/icon_logs_hover.png"
panelHeader: ""
panelContent: ""
}
ListElement {
name: qsTr("Settings")
- page: "DapUiQmlScreenSettings.qml"
- normal: "qrc:/Resources/Icons/icon_settings.png"
- hover: "qrc:/Resources/Icons/icon_settings_hover.png"
+ page: "qrc:/screen/Settings/DapUiQmlScreenSettings.qml"
+ normal: "qrc:/res/icons/icon_settings.png"
+ hover: "qrc:/res/icons/icon_settings_hover.png"
panelHeader: ""
panelContent: ""
}
ListElement {
name: qsTr("VPN")
- page: "DapUiQmlScreenVpn.qml"
- normal: "qrc:/Resources/Icons/defaul_icon.png"
- hover: "qrc:/Resources/Icons/defaul_icon.png"
+ page: "qrc:/screen/VPN/DapUiQmlScreenVpn.qml"
+ normal: "qrc:/res/icons/defaul_icon.png"
+ hover: "qrc:/res/icons/defaul_icon.png"
panelHeader: ""
panelContent: ""
}
@@ -146,7 +146,7 @@ Page {
anchors.right: rightPanel.left
anchors.top: parent.top
anchors.bottom: parent.bottom
- source: "DapUiQmlScreenDashboard.qml"
+ source: "qrc:/screen/Dashboard/DapUiQmlScreenDashboard.qml"
}
DapUiQmlWidgetRightPanel {
@@ -154,8 +154,8 @@ Page {
anchors.bottom: parent.bottom
anchors.top: parent.top
anchors.right: parent.right
- header.initialItem: "DapUiQmlWidgetLastActionsHeaderForm.qml"
- content.initialItem: "DapUiQmlWidgetHistoryLastActions.qml"
+ header.initialItem: "qrc:/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml"
+ content.initialItem: "qrc:/screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml"
}
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
similarity index 96%
rename from CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
rename to CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
index fa42a42c0f7371ab88bafc09f2cfbbb91e57f95c..d470646efc6f1f4b8a9a444dcf72767a5c9dd0ce 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/screen/Dashboard/DapUiQmlScreenDashboard.qml
@@ -4,7 +4,7 @@ import CellFrameDashboard 1.0
import QtQml 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.12
-
+import "../"
DapUiQmlScreen {
id: dapUiQmlScreenDialog
@@ -45,7 +45,7 @@ DapUiQmlScreen {
icon.width: 20 * pt
icon.height: 20 * pt
- icon.source: "qrc:/Resources/Icons/new-payment_icon.png"
+ icon.source: "qrc:/res/icons/new-payment_icon.png"
icon.color: "#FFFFFF"
}
}
@@ -142,15 +142,15 @@ DapUiQmlScreen {
anchors.centerIn: parent
width: 16 * pt
height: 16 * pt
- source: "qrc:/Resources/Icons/ic_copy.png"
+ source: "qrc:/res/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"
+ onEntered: imageButton.source = "qrc:/res/icons/ic_copy_hover.png"
+ onExited: imageButton.source = "qrc:/res/icons/ic_copy.png"
onClicked: clipboard.setText(titleWalletAddress.text);
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
similarity index 98%
rename from CellFrameDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
index 6953786fd857acea11394616ae0e9f1e10386ecc..d3993c689633936018ae7da6b1b1f28c5b2648d5 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
import QtQml 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
-
+import "../../"
Page {
///Top panel in tab Exchange
Rectangle{
@@ -40,6 +40,7 @@ Page {
}
}
+
///Time ComboBox
Rectangle{
id:rightComboBox
@@ -67,6 +68,7 @@ Page {
x:popup.visible ? spacingEdgeActive * (-1) : spacingEdgeNormal
}
}
+
///Value Last price
Rectangle{
id: lastPrice
@@ -151,10 +153,3 @@ Page {
}
}
}
-
-
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml b/CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
rename to CellFrameDashboardGUI/screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml b/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
similarity index 99%
rename from CellFrameDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml
rename to CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
index d0cd5729717e2969d9beabd36d6432a4841a29e5..a32806736472840c0d238087938f21feb7ed15dc 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml
+++ b/CellFrameDashboardGUI/screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml
@@ -7,7 +7,6 @@ import NodeNetworkExplorer 1.0
Page {
Rectangle {
anchors.fill: parent;
-// color: "#3b3353";
}
RowLayout {
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenHistory.qml b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
similarity index 98%
rename from CellFrameDashboardGUI/DapUiQmlScreenHistory.qml
rename to CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
index fb8290be3464c96ec078a2558a8edae9397287a0..7882a45eb782960dfb11d8e37ce98df8df64ea5a 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenHistory.qml
+++ b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistory.qml
@@ -2,7 +2,6 @@ import QtQuick 2.9
import QtQml 2.12
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
-
import DapTransactionHistory 1.0
DapUiQmlScreenHistoryForm {
@@ -102,7 +101,6 @@ DapUiQmlScreenHistoryForm {
Text {
id: dapNumberWallet
-// width: parent.width / 2
anchors.fill: parent
color: "#4F5357"
text: numberWallet
@@ -244,8 +242,3 @@ DapUiQmlScreenHistoryForm {
visible: false
}
}
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
similarity index 96%
rename from CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
rename to CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
index 5df08dc4b659e8a566d9d5fa4c2fd84b89e27b33..91671e853fa742e64f637f22e47deeb4bf9681fb 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/History/DapUiQmlScreenHistoryForm.ui.qml
@@ -2,8 +2,8 @@ import QtQuick 2.9
import QtQml 2.12
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
-
import DapTransactionHistory 1.0
+import "../"
DapUiQmlScreen {
ListView {
diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
similarity index 99%
rename from CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
index cbf77711c0732ecc2d205992c2a384cad687c01f..fd6d621da2c87296fe154b88fc8ca29a20865627 100644
--- a/CellFrameDashboardGUI/DapUiQmlRecoveryNotesForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml
@@ -1,6 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
+import "../"
DapUiQmlScreen {
id: recoveryNoteMenu
diff --git a/CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlRecoveryQrForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
similarity index 89%
rename from CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
index 0415ef0f13432f027eb2c7e4097fd704438a390b..ec0e0f95d86a152cf5a6a819dcdade88e0647e77 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml
@@ -1,6 +1,5 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import CellFrameDashboard 1.0
DapUiQmlScreenDialogAddWalletForm {
id: dialogAddWallet
@@ -13,16 +12,16 @@ DapUiQmlScreenDialogAddWalletForm {
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",
+ "backButtonNormal": "qrc:/res/icons/back_icon.png",
+ "backButtonHovered": "qrc:/res/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",
+ "backButtonNormal": "qrc:/res/icons/back_icon.png",
+ "backButtonHovered": "qrc:/res/icons/back_icon_hover.png",
"rightPanel": rightPanel
});
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
similarity index 97%
rename from CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
index 5edc6524c7ee3b76f4d0d49b1765f3d3eb9097f3..2e72910537da434c651ab239ac2612a513c93d69 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml
@@ -1,6 +1,8 @@
import QtQuick 2.4
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
+import "../../"
+import "../"
DapUiQmlScreen {
property alias nextButton: nextButton
@@ -146,8 +148,8 @@ DapUiQmlScreen {
spacingEdgeActive: 20*pt
indicator: Image {
- source: parent.popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up_dark_blue.png"
- : "qrc:/Resources/Icons/ic_arrow_drop_down_dark_blue.png"
+ source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up_dark_blue.png"
+ : "qrc:/res/icons/ic_arrow_drop_down_dark_blue.png"
width: 20 * pt
height: 20 * pt
anchors.verticalCenter: parent.verticalCenter
@@ -168,6 +170,7 @@ DapUiQmlScreen {
elide: Text.ElideRight
}
}
+
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
similarity index 87%
rename from CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
index e05b8e9b7552645a235f4417ae4e6a51174cf51b..d911b79941c30813a86976305a9a2deaecf406a8 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWalletHeader.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml
@@ -1,13 +1,14 @@
import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
+import "../"
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 backButtonNormal : "qrc:/res/icons/close_icon.png"
+ property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png"
property string title : qsTr("New wallet")
property alias mouseArea : mouseArea
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreated.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWalletCreated.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreated.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
similarity index 99%
rename from CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
index dff7c07884c7fb65a700e56705184c4991422d36..8ed3fe723909c88ba09463edd8655b76a15db8b1 100644
--- a/CellFrameDashboardGUI/DapUiQmlWalletCreatedForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml
@@ -1,6 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.1
+import "../"
DapUiQmlScreen {
property alias buttonDone: doneCreateWalletButton
diff --git a/CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedHeader.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWalletCreatedHeader.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedHeader.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetHistoryLastActions.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetHistoryLastActions.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
similarity index 84%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
index 4cfdf0c59f097f6e465531c1bb2c4a9b1d0e3146..56694c6f41dc0ca2e177d20ab3db5d31cc0b4ae9 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml
+++ b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml
@@ -22,7 +22,7 @@ Item {
id: imageButton
anchors.fill: parent
fillMode: Image.PreserveAspectFit
- source: "qrc:/Resources/Icons/ic_scroll-down.png"
+ source: "qrc:/res/icons/ic_scroll-down.png"
}
states: [
@@ -61,18 +61,18 @@ Item {
onEntered: {
isHovered = true;
if(buttonScroll.state === "goUp")
- imageButton.source = "qrc:/Resources/Icons/ic_scroll-down_hover.png";
+ imageButton.source = "qrc:/res/icons/ic_scroll-down_hover.png";
else if(buttonScroll.state === "goDown")
- imageButton.source = "qrc:/Resources/Icons/ic_scroll-up_hover.png";
+ imageButton.source = "qrc:/res/icons/ic_scroll-up_hover.png";
}
onExited: {
isHovered = false;
if(buttonScroll.state === "goUp")
- imageButton.source = "qrc:/Resources/Icons/ic_scroll-down.png";
+ imageButton.source = "qrc:/res/icons/ic_scroll-down.png";
else if(buttonScroll.state === "goDown")
- imageButton.source = "qrc:/Resources/Icons/ic_scroll-up.png";
+ imageButton.source = "qrc:/res/icons/ic_scroll-up.png";
}
onClicked: {
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanel.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetRightPanel.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanel.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetRightPanelForm.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetScreenDialogAddWallet.ui.qml b/CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetScreenDialogAddWallet.ui.qml
rename to CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
rename to CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogs.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml b/CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
rename to CellFrameDashboardGUI/screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
similarity index 92%
rename from CellFrameDashboardGUI/DapUiQmlScreenSettings.qml
rename to CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
index 5fb8481403408cb8c49a3e94c3f879483848d2eb..f2a1bd322860c8bfcfc87a2b5562fa94b8646070 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml
+++ b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettings.qml
@@ -13,7 +13,7 @@ DapUiQmlScreenSettingsForm {
ListElement {
name: qsTr("VPN")
- element: "DapUiQmlWidgetSettingsVpn.qml"
+ element: "qrc:/screen/VPN/DapUiQmlWidgetSettingsVpn.qml"
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenSettingsForm.ui.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlScreenSettingsForm.ui.qml
rename to CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenSettingsSection.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsSection.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlScreenSettingsSection.qml
rename to CellFrameDashboardGUI/screen/Settings/DapUiQmlScreenSettingsSection.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml
rename to CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetwork.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetworkForm.ui.qml b/CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetworkForm.ui.qml
rename to CellFrameDashboardGUI/screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
similarity index 86%
rename from CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
rename to CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
index 1a68b5f760ce5f6533abc0b1afee7db76db410f7..d6cca8cce92e6030bda5e5ea1ca7493e36a7ffc4 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBar.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml
@@ -3,9 +3,8 @@ import QtQuick.Controls 2.5
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.3
-
+import "../../"
Rectangle {
-// property alias addWalletPressed: statusBarAddWalletButton.pressed
Rectangle {
anchors.fill: parent
anchors.bottomMargin: 1
@@ -15,7 +14,7 @@ Rectangle {
anchors.top: parent.top
anchors.left: parent.left
anchors.bottom: parent.bottom
- anchors.right: buttonAddWallet.left
+ anchors.right: statusBarAddWalletButton.left
anchors.leftMargin: 30 * pt
anchors.topMargin: 10 * pt
anchors.bottomMargin: 10 * pt
@@ -44,7 +43,7 @@ Rectangle {
indicator: Image {
id: arrow
- source: parent.popup.visible ? "qrc:/Resources/Icons/ic_arrow_drop_up.png" : "qrc:/Resources/Icons/ic_arrow_drop_down.png"
+ source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/ic_arrow_drop_down.png"
width: 24 * pt
height: 24 * pt
anchors.verticalCenter: parent.verticalCenter
@@ -93,7 +92,7 @@ Rectangle {
}
}
- DapUiQmlWidgetStatusBarButton {
+ DapUiQmlWidgetStatusBarButtonForm {
id: statusBarAddWalletButton
width: 130 * pt
anchors.right: parent.right
@@ -104,15 +103,9 @@ Rectangle {
anchors.bottomMargin: 10 * pt
onClicked: {
- rightPanel.header.push("DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel});
- rightPanel.content.push("DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel});
+ rightPanel.header.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml", {"rightPanel": rightPanel});
+ rightPanel.content.push("qrc:/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml", {"rightPanel": rightPanel});
}
}
}
}
-
-/*##^##
-Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
-##^##*/
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarButton.ui.qml b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
similarity index 92%
rename from CellFrameDashboardGUI/DapUiQmlWidgetStatusBarButton.ui.qml
rename to CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
index 8072bbcb0c7991f12de4a98171ac9b25d88e2af6..8ff9e9cbe228da38adf920008908ec13147de359 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetStatusBarButton.ui.qml
+++ b/CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml
@@ -24,7 +24,7 @@ Button {
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 10 * pt
- source: "qrc:/Resources/Icons/defaul_icon.png"
+ source: "qrc:/res/icons/defaul_icon.png"
width: 28 * pt
height: 28 * pt
}
diff --git a/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpn.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpn.qml
new file mode 100644
index 0000000000000000000000000000000000000000..4dcee1be4d260ee2f5c508b720b333e8eb98dd7f
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpn.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.4
+
+DapUiQmlScreenVpnForm {
+ imageServer.source: modelTest.get(modelTest.index(comboboxServer.currentIndex, 0)).icon
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
similarity index 87%
rename from CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml
rename to CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
index 930a444d4a328addb748e5b27c148ede7ac4df43..2a848acb739d1529933eba872bf311d096612308 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenVpnForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/VPN/DapUiQmlScreenVpnForm.ui.qml
@@ -8,6 +8,10 @@ Item {
width: 400
height: 600
+ property ListModel modelTest: modelTest
+ property ComboBox comboboxServer: comboboxServer
+ property alias imageServer: imageServer
+
Text {
anchors.left: parent.left
anchors.top: parent.top
@@ -31,7 +35,7 @@ Item {
Layout.alignment: Qt.AlignVCenter
width: 48 * pt
height: 48 * pt
- source: "qrc:/Resources/Icons/defaul_icon.png"
+ source: "qrc:/res/icons/defaul_icon.png"
}
Text {
@@ -44,7 +48,6 @@ Item {
}
}
-
Switch {
id: control
anchors.verticalCenter: parent.verticalCenter
@@ -87,6 +90,18 @@ Item {
}
}
+ ListModel {
+ id: modelTest
+ ListElement {
+ name: "first"
+ icon: "qrc:/res/icons/defaul_icon.png"
+ }
+ ListElement {
+ name: "second"
+ icon: "qrc:/res/icons/defaul_icon.png"
+ }
+ }
+
ComboBox {
id: comboboxServer
anchors.horizontalCenter: parent.horizontalCenter
@@ -96,11 +111,7 @@ Item {
height: 48 * pt
textRole: "name"
- model: ListModel {
- id: modelTest
- ListElement {name: "first"; icon: "qrc:/Resources/Icons/defaul_icon.png" }
- ListElement {name: "second"; icon: "qrc:/Resources/Icons/defaul_icon.png" }
- }
+ model: modelTest
background: Rectangle {
anchors.fill: parent
@@ -130,7 +141,6 @@ Item {
anchors.left: parent.left
anchors.leftMargin: 22 * pt
anchors.verticalCenter: parent.verticalCenter
- source: modelTest.get(modelTest.index(comboboxServer.currentIndex, 0)).icon
width: 24 * pt
height: 24 * pt
}
@@ -144,6 +154,5 @@ Item {
font.pixelSize: 16 * pt
}
}
-
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpn.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpn.qml
rename to CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpn.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBox.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBox.qml
rename to CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
rename to CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnForm.ui.qml b/CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml
similarity index 100%
rename from CellFrameDashboardGUI/DapUiQmlWidgetSettingsVpnForm.ui.qml
rename to CellFrameDashboardGUI/screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml
diff --git a/CellFrameDashboardGUI/main.qml b/CellFrameDashboardGUI/screen/main.qml
old mode 100755
new mode 100644
similarity index 96%
rename from CellFrameDashboardGUI/main.qml
rename to CellFrameDashboardGUI/screen/main.qml
index 936bd241232a572269fe68c6c79f74c22311ae15..7458e4c24c54e4baefae574f232f5e7cf125c120
--- a/CellFrameDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/screen/main.qml
@@ -5,7 +5,6 @@ import QtQuick.Window 2.0
import QtQuick.Controls.Styles 1.3
import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.0
-import CellFrameDashboard 1.0
ApplicationWindow {
id: window
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index 9832f5ebd69cdde397ddf8f0bca22289b0838c93..58f806d02d04cac6a19fb1d5bf42028e04947e99 100755
--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -24,6 +24,7 @@ win32 {
DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
DEFINES += LOG_FILE=\\\"./opt/cellframe-node/var/log/cellframe-node_logs.txt\\\"
DEFINES += CMD_LOG=\\\"./opt/cellframe-dashboard/data/cellframe-cmd_log.txt\\\"
+ DEFINES += HAVE_STRNDUP
}
else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
@@ -69,7 +70,6 @@ HEADERS += \
include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri)
-include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
diff --git a/libCellFrameDashboardCommon/DapChainWallet.cpp b/libCellFrameDashboardCommon/DapChainWallet.cpp
index a49ecf96db1235ceb28020fb2cd51a32d9587ec3..2fa9c8c972e2623a3dd12fe6fd3196a5ececc26d 100755
--- a/libCellFrameDashboardCommon/DapChainWallet.cpp
+++ b/libCellFrameDashboardCommon/DapChainWallet.cpp
@@ -8,11 +8,7 @@ DapChainWalletTokenItem::DapChainWalletTokenItem(const QString& aWalletAddress,
}
DapChainWalletTokenItem::DapChainWalletTokenItem(const QString& aWalletAddress, const DapChainWalletTokenData& aData, QObject* parent) :
- QObject(parent)/*
- m_wallet(aWalletAddress),
- m_name(aData.Name),
- m_balance(aData.Balance),
- m_emission(aData.Emission)*/
+ QObject(parent)
{
m_wallet = aWalletAddress;
m_name = aData.Name;
diff --git a/libCellFrameDashboardCommon/DapSettingsCipher.cpp b/libCellFrameDashboardCommon/DapSettingsCipher.cpp
deleted file mode 100644
index 60e8946831e779dc907dd5da959d18b229146512..0000000000000000000000000000000000000000
--- a/libCellFrameDashboardCommon/DapSettingsCipher.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "DapSettingsCipher.h"
-
-DapSettingsCipher::DapSettingsCipher(const DapSettings& settings)
- : DapSettings(), m_settings(settings)
-{
- setFileName(settings.getFileName());
-}
-
-QByteArray DapSettingsCipher::encrypt(const QByteArray &byteArray) const
-{
-// TODO: implement encryption to next iteration.
-// return m_settings.encrypt(byteArray);
-}
-
-QByteArray DapSettingsCipher::decrypt(const QByteArray &byteArray) const
-{
-// TODO: implement decryption to next iteration.
-// return m_settings.decrypt(byteArray);
-}
-
-DapSettingsCipher &DapSettingsCipher::getInstance(const DapSettings& settings)
-{
- static DapSettingsCipher instance(settings);
- return instance;
-}
diff --git a/libCellFrameDashboardCommon/DapSettingsCipher.h b/libCellFrameDashboardCommon/DapSettingsCipher.h
deleted file mode 100644
index 1bc366692f7847f014ffc407119448f374d2b808..0000000000000000000000000000000000000000
--- a/libCellFrameDashboardCommon/DapSettingsCipher.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef DAPSETTINGSCIPHER_H
-#define DAPSETTINGSCIPHER_H
-
-#include <QObject>
-
-#include "DapSettings.h"
-
-class DapSettingsCipher : public DapSettings
-{
- Q_OBJECT
-
-protected:
-
- const DapSettings &m_settings;
-
- DapSettingsCipher(const DapSettings& settings);
-
-public:
- virtual QByteArray encrypt(const QByteArray &byteArray) const;
-
- virtual QByteArray decrypt(const QByteArray &byteArray) const;
-
- /// Removed as part of the implementation of the pattern sington.
- DapSettingsCipher(const DapSettingsCipher&) = delete;
- DapSettingsCipher& operator= (const DapSettingsCipher &) = delete;
-
- /// Get an instance of a class.
- /// @return Instance of a class.
- Q_INVOKABLE static DapSettingsCipher &getInstance(const DapSettings& settings);
-};
-
-#endif // DAPSETTINGSCIPHER_H
diff --git a/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri b/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
index 7bd94e5639947ac6e65d14200ec05149d9cbd168..cf5328792504681b6a7642ad7ddc3bf6491edf80 100755
--- a/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
+++ b/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
@@ -17,7 +17,6 @@ SOURCES +=\
$$PWD/DapHalper.cpp \
$$PWD/DapHistoryType.cpp \
$$PWD/DapSettings.cpp \
- $$PWD/DapSettingsCipher.cpp \
$$PWD/DapLogMessage.cpp \
$$PWD/DapLogModel.cpp \
$$PWD/DapChainWallet.cpp
@@ -27,7 +26,6 @@ HEADERS +=\
$$PWD/DapHalper.h \
$$PWD/DapHistoryType.h \
$$PWD/DapSettings.h \
- $$PWD/DapSettingsCipher.h \
$$PWD/DapLogMessage.h \
$$PWD/DapLogModel.h \
$$PWD/DapChainWallet.h \