diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b189a61c938876efe3206bb8ffe351bc5ad447c3..636e1d4dd56ad191b67b05e12de26eff2ab8399b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ stages:
variables:
GIT_SUBMODULE_STRATEGY: normal
-kelvin-dashboard-schedule:
+cellframe-dashboard-schedule:
stage: build
tags:
- - kelvin-dashboard
- script: ~/production/integration/gitlab-CI/build_all_handler.sh kelvin-dashboard
+ - cellframe-dashboard
+ script: ~/production/integration/gitlab-CI/build_all_handler.sh cellframe-dashboard
diff --git a/CellFrameDashboard.pro b/CellFrameDashboard.pro
new file mode 100755
index 0000000000000000000000000000000000000000..14df6c1fe475dab4f0977db5ac850d7320b55bc3
--- /dev/null
+++ b/CellFrameDashboard.pro
@@ -0,0 +1,17 @@
+TEMPLATE = subdirs
+SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService
+
+CellFrameDashboardGUI.subdir = CellFrameDashboardGUI
+CellFrameDashboardService.subdir = CellFrameDashboardService
+CellFrameDashboardGUI.depends = CellFrameDashboardService
+
+!defined(BRAND, var)
+{
+ BRAND = CellFrameDashboard
+}
+
+unix: !mac : !android {
+ share_target.files = debian/share/*
+ share_target.path = /opt/cellframe-dashboard/share/
+ INSTALLS += share_target
+}
diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.conf b/CellFrameDashboardGUI/CellFrameDashboardGUI.conf
similarity index 100%
rename from KelvinDashboardGUI/KelvinDashboardGUI.conf
rename to CellFrameDashboardGUI/CellFrameDashboardGUI.conf
diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
similarity index 86%
rename from KelvinDashboardGUI/KelvinDashboardGUI.pro
rename to CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index 9386bcf43829781d39fe1b2047e253e6fbfa45b5..b20767a8ad3da1a8a21d82bc9c6754ba7d3d7394 100755
--- a/KelvinDashboardGUI/KelvinDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -6,7 +6,7 @@ CONFIG += c++11
!defined(BRAND,var){
# Default brand
- BRAND = KelvinDashboard
+ BRAND = CellFrameDashboard
}
TARGET = $$BRAND
@@ -18,11 +18,11 @@ VER_PAT = 0
win32 {
VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
- DEFINES += CLI_PATH=\\\"./kelvin-node-cli.exe\\\"
+ DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
}
else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
- DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\"
+ DEFINES += CLI_PATH=\\\"/opt/cellframe-node/bin/cellframe-node-cli\\\"
}
# The following define makes your compiler emit warnings if you use
@@ -31,7 +31,7 @@ else {
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += DAP_BRAND=\\\"$$BRAND\\\"
-DEFINES += DAP_SERVICE_NAME=\\\"KelvinDashboardService\\\"
+DEFINES += DAP_SERVICE_NAME=\\\"CellFrameDashboardService\\\"
DEFINES += DAP_VERSION=\\\"$$VERSION\\\"
ICON = icon.ico
# You can also make your code fail to compile if you use deprecated APIs.
@@ -73,7 +73,7 @@ QML_DESIGNER_IMPORT_PATH =
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/kelvin-dashboard/bin
+else: unix:!android: target.path = /opt/cellframe-dashboard/bin
!isEmpty(target.path): INSTALLS += target
HEADERS += \
@@ -104,16 +104,16 @@ include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri)
-include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri)
+include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
-INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/
$$_PRO_FILE_PWD_/../DapRPCProtocol/
unix: !mac : !android {
gui_target.files = $${BRAND}
- gui_target.path = /opt/kelvin-dashboard/bin/
+ gui_target.path = /opt/cellframe-dashboard/bin/
INSTALLS += gui_target
}
diff --git a/KelvinDashboardGUI/DapChainNodeNetworkExplorer.cpp b/CellFrameDashboardGUI/DapChainNodeNetworkExplorer.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapChainNodeNetworkExplorer.cpp
rename to CellFrameDashboardGUI/DapChainNodeNetworkExplorer.cpp
diff --git a/KelvinDashboardGUI/DapChainNodeNetworkExplorer.h b/CellFrameDashboardGUI/DapChainNodeNetworkExplorer.h
similarity index 99%
rename from KelvinDashboardGUI/DapChainNodeNetworkExplorer.h
rename to CellFrameDashboardGUI/DapChainNodeNetworkExplorer.h
index 5e348687556a393f1f9155c71ac8f21d2b41fe7a..e0a81969cf13d877e445372f488812200a278829 100644
--- a/KelvinDashboardGUI/DapChainNodeNetworkExplorer.h
+++ b/CellFrameDashboardGUI/DapChainNodeNetworkExplorer.h
@@ -10,7 +10,7 @@
#include "DapNodeType.h"
/// The DapChainNodeNetworkExplorer class
-/// details Class paiting DapKelvin map
+/// details Class paiting DapCellFrame map
/// @warning To use this class it requers to send DapChainNodeNetworkModel model to slot setModel()
class DapChainNodeNetworkExplorer : public QQuickPaintedItem
{
diff --git a/KelvinDashboardGUI/DapChainNodeNetworkModel.cpp b/CellFrameDashboardGUI/DapChainNodeNetworkModel.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapChainNodeNetworkModel.cpp
rename to CellFrameDashboardGUI/DapChainNodeNetworkModel.cpp
diff --git a/KelvinDashboardGUI/DapChainNodeNetworkModel.h b/CellFrameDashboardGUI/DapChainNodeNetworkModel.h
similarity index 100%
rename from KelvinDashboardGUI/DapChainNodeNetworkModel.h
rename to CellFrameDashboardGUI/DapChainNodeNetworkModel.h
diff --git a/KelvinDashboardGUI/DapChainWalletsModel.cpp b/CellFrameDashboardGUI/DapChainWalletsModel.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapChainWalletsModel.cpp
rename to CellFrameDashboardGUI/DapChainWalletsModel.cpp
diff --git a/KelvinDashboardGUI/DapChainWalletsModel.h b/CellFrameDashboardGUI/DapChainWalletsModel.h
similarity index 100%
rename from KelvinDashboardGUI/DapChainWalletsModel.h
rename to CellFrameDashboardGUI/DapChainWalletsModel.h
diff --git a/KelvinDashboardGUI/DapCommandController.cpp b/CellFrameDashboardGUI/DapCommandController.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapCommandController.cpp
rename to CellFrameDashboardGUI/DapCommandController.cpp
diff --git a/KelvinDashboardGUI/DapCommandController.h b/CellFrameDashboardGUI/DapCommandController.h
similarity index 100%
rename from KelvinDashboardGUI/DapCommandController.h
rename to CellFrameDashboardGUI/DapCommandController.h
diff --git a/CellFrameDashboardGUI/DapConsoleModel.cpp b/CellFrameDashboardGUI/DapConsoleModel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..01d0ad78a6a60f5ca25964bc7d4342da5b9ce6dc
--- /dev/null
+++ b/CellFrameDashboardGUI/DapConsoleModel.cpp
@@ -0,0 +1,101 @@
+#include "DapConsoleModel.h"
+
+DapConsoleModel::DapConsoleModel(QObject *parent) :
+ QAbstractListModel(parent)
+{
+
+}
+
+DapConsoleModel& DapConsoleModel::getInstance()
+{
+ static DapConsoleModel instance;
+ return instance;
+}
+
+void DapConsoleModel::receiveResponse(const QString& aResponse)
+{
+ m_History.append(aResponse);
+ emit sendResponse(aResponse);
+}
+
+int DapConsoleModel::rowCount(const QModelIndex& parent) const
+{
+ Q_UNUSED(parent)
+
+ return m_CommandList.count();
+}
+
+QVariant DapConsoleModel::data(const QModelIndex& index, int role) const
+{
+ if (!index.isValid()) return QVariant();
+
+ if(role == LastCommand)
+ return m_CommandList.at(index.row());
+
+ return QVariant();
+}
+
+QHash<int, QByteArray> DapConsoleModel::roleNames() const
+{
+ QHash<int, QByteArray> roles;
+ roles[LastCommand] = "lastCommand";
+ return roles;
+}
+
+QString DapConsoleModel::getCommandUp()
+{
+ if(m_CommandList.isEmpty()) return QString();
+ if(m_CommandIndex > m_CommandList.begin()) m_CommandIndex--;
+ return *m_CommandIndex;
+}
+
+QString DapConsoleModel::getCommandDown()
+{
+ if(m_CommandList.isEmpty()) return QString();
+ if(m_CommandIndex < m_CommandList.end() -1) m_CommandIndex++;
+ else return QString();
+ return *m_CommandIndex;
+}
+
+void DapConsoleModel::receiveRequest(const QString& aCommand)
+{
+ beginResetModel();
+ if(!m_CommandList.contains(aCommand))
+ m_CommandList.append(aCommand);
+ endResetModel();
+ m_CommandIndex = m_CommandList.end();
+
+ QString returnSymbol = "\n";
+
+#ifdef Q_OS_WIN
+ returnSymbol.prepend("\r");
+#endif
+
+ m_History.append(returnSymbol + "> " + aCommand + returnSymbol);
+ emit sendRequest(aCommand);
+}
+
+QString DapConsoleModel::getCmdHistory()
+{
+ return m_History;
+}
+
+void DapConsoleModel::receiveCmdHistory(const QString& aHistory)
+{
+ m_History = aHistory;
+ QRegularExpression rx("^> (.+)$");
+ rx.setPatternOptions(QRegularExpression::MultilineOption);
+
+ QRegularExpressionMatchIterator i = rx.globalMatch(m_History);
+
+ while (i.hasNext()) {
+ QRegularExpressionMatch match = i.next();
+ QString cmd = match.captured(1).remove(QChar('\r'), Qt::CaseInsensitive);
+ if(!m_CommandList.contains(cmd))
+ m_CommandList.append(cmd);
+ }
+
+ if(!m_CommandList.isEmpty())
+ m_CommandIndex = m_CommandList.end();
+ emit cmdHistoryChanged(m_History);
+}
diff --git a/CellFrameDashboardGUI/DapConsoleModel.h b/CellFrameDashboardGUI/DapConsoleModel.h
new file mode 100644
index 0000000000000000000000000000000000000000..00bd228e4d905260b56eb8f6eb988f9fe8dc905d
--- /dev/null
+++ b/CellFrameDashboardGUI/DapConsoleModel.h
@@ -0,0 +1,69 @@
+#ifndef DAPUIQMLSCREENCONSOLEFORM_H
+#define DAPUIQMLSCREENCONSOLEFORM_H
+
+#include <QDebug>
+#include <QAbstractListModel>
+#include <QStringList>
+#include <QRegularExpression>
+
+/// Model for DAP console
+class DapConsoleModel : public QAbstractListModel
+{
+ Q_OBJECT
+
+public:
+ /// Enumeration for model roles
+ enum ConsoleRole {
+ LastCommand = Qt::DisplayRole
+ };
+
+private:
+ QString m_History;
+ QStringList m_CommandList;
+ QStringList::iterator m_CommandIndex;
+
+public:
+ explicit DapConsoleModel(QObject *parent = nullptr);
+
+public slots:
+ /// Receive response from service about command
+ /// @param result
+ void receiveResponse(const QString& aResponse);
+ /// Override methods of abstract model
+ int rowCount(const QModelIndex& parent) const override;
+ QVariant data(const QModelIndex& index, int role) const override;
+ QHash<int, QByteArray> roleNames() const override;
+
+ /// Getting instanse of this class
+ /// @return instanse of this class
+ Q_INVOKABLE static DapConsoleModel& getInstance();
+ /// Get the latest commands
+ /// @return the latest commands
+ Q_INVOKABLE QString getCommandUp();
+ /// Get the earliest commands
+ /// @return the earliest commands. If it is last command in the list
+ /// it returns QString()
+ Q_INVOKABLE QString getCommandDown();
+ /// Receive command requst for service
+ /// @param command request
+ Q_INVOKABLE void receiveRequest(const QString& aCommand);
+ /// Get current history
+ /// @return history of commands
+ Q_INVOKABLE QString getCmdHistory();
+ /// Receive new history of commands
+ /// @param last 50 commands
+ void receiveCmdHistory(const QString& aHistory);
+
+signals:
+ /// Signal to send request to the service
+ /// @param command
+ void sendRequest(QString command);
+ /// Signal for getting response from service
+ /// @param result of command
+ void sendResponse(QString response);
+ /// Signal for view about changing history
+ /// @param last 50 commands
+ void cmdHistoryChanged(QString history);
+};
+
+#endif // DAPUIQMLSCREENCONSOLEFORM_H
diff --git a/KelvinDashboardGUI/DapQmlScreenAbout.qml b/CellFrameDashboardGUI/DapQmlScreenAbout.qml
similarity index 81%
rename from KelvinDashboardGUI/DapQmlScreenAbout.qml
rename to CellFrameDashboardGUI/DapQmlScreenAbout.qml
index 5e97667eb1d885d7ec4767f90f4d9825b559dc8c..49ab8b446c2c6b4fb3b899190cd43cb7ebf85406 100755
--- a/KelvinDashboardGUI/DapQmlScreenAbout.qml
+++ b/CellFrameDashboardGUI/DapQmlScreenAbout.qml
@@ -1,13 +1,13 @@
import QtQuick 2.9
import QtQml 2.3
import QtQuick.Controls 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
DapUiQmlScreenAbout {
id: dapQmlScreenAbout
textTitle.text: dapServiceController.Brand
- textAbout.text: "KelvinDashboard"
+ textAbout.text: "CellFrameDashboard"
textVersion.text: "Version " + dapServiceController.Version
textYear.text: new Date().toLocaleDateString(locale, "dd MMM yyyy")
}
diff --git a/KelvinDashboardGUI/DapScreenDialog.cpp b/CellFrameDashboardGUI/DapScreenDialog.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapScreenDialog.cpp
rename to CellFrameDashboardGUI/DapScreenDialog.cpp
diff --git a/KelvinDashboardGUI/DapScreenDialog.h b/CellFrameDashboardGUI/DapScreenDialog.h
similarity index 100%
rename from KelvinDashboardGUI/DapScreenDialog.h
rename to CellFrameDashboardGUI/DapScreenDialog.h
diff --git a/KelvinDashboardGUI/DapScreenDialogChangeWidget.cpp b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapScreenDialogChangeWidget.cpp
rename to CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
diff --git a/KelvinDashboardGUI/DapScreenDialogChangeWidget.h b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
similarity index 100%
rename from KelvinDashboardGUI/DapScreenDialogChangeWidget.h
rename to CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
diff --git a/KelvinDashboardGUI/DapScreenHistoryFilterModel.cpp b/CellFrameDashboardGUI/DapScreenHistoryFilterModel.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapScreenHistoryFilterModel.cpp
rename to CellFrameDashboardGUI/DapScreenHistoryFilterModel.cpp
diff --git a/KelvinDashboardGUI/DapScreenHistoryFilterModel.h b/CellFrameDashboardGUI/DapScreenHistoryFilterModel.h
similarity index 100%
rename from KelvinDashboardGUI/DapScreenHistoryFilterModel.h
rename to CellFrameDashboardGUI/DapScreenHistoryFilterModel.h
diff --git a/KelvinDashboardGUI/DapScreenHistoryModel.cpp b/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
similarity index 99%
rename from KelvinDashboardGUI/DapScreenHistoryModel.cpp
rename to CellFrameDashboardGUI/DapScreenHistoryModel.cpp
index 91754fae220b5828e8b552efadac766768a0db9c..ac5b71693c474e239c347945181a39be5a4402ea 100644
--- a/KelvinDashboardGUI/DapScreenHistoryModel.cpp
+++ b/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
@@ -50,6 +50,7 @@ void DapScreenHistoryModel::receiveNewData(const QVariant& aData)
return;
}
+ qDebug() << aData;
beginResetModel();
QList<QVariant> dataList = aData.toList();
m_elementList.clear();
diff --git a/KelvinDashboardGUI/DapScreenHistoryModel.h b/CellFrameDashboardGUI/DapScreenHistoryModel.h
similarity index 100%
rename from KelvinDashboardGUI/DapScreenHistoryModel.h
rename to CellFrameDashboardGUI/DapScreenHistoryModel.h
diff --git a/KelvinDashboardGUI/DapServiceClient.cpp b/CellFrameDashboardGUI/DapServiceClient.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClient.cpp
rename to CellFrameDashboardGUI/DapServiceClient.cpp
diff --git a/KelvinDashboardGUI/DapServiceClient.h b/CellFrameDashboardGUI/DapServiceClient.h
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClient.h
rename to CellFrameDashboardGUI/DapServiceClient.h
diff --git a/KelvinDashboardGUI/DapServiceClientNativeAbstract.cpp b/CellFrameDashboardGUI/DapServiceClientNativeAbstract.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeAbstract.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeAbstract.cpp
diff --git a/KelvinDashboardGUI/DapServiceClientNativeAbstract.h b/CellFrameDashboardGUI/DapServiceClientNativeAbstract.h
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeAbstract.h
rename to CellFrameDashboardGUI/DapServiceClientNativeAbstract.h
diff --git a/KelvinDashboardGUI/DapServiceClientNativeLinux.cpp b/CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeLinux.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
diff --git a/KelvinDashboardGUI/DapServiceClientNativeLinux.h b/CellFrameDashboardGUI/DapServiceClientNativeLinux.h
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeLinux.h
rename to CellFrameDashboardGUI/DapServiceClientNativeLinux.h
diff --git a/KelvinDashboardGUI/DapServiceClientNativeWin.cpp b/CellFrameDashboardGUI/DapServiceClientNativeWin.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeWin.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeWin.cpp
diff --git a/KelvinDashboardGUI/DapServiceClientNativeWin.h b/CellFrameDashboardGUI/DapServiceClientNativeWin.h
similarity index 100%
rename from KelvinDashboardGUI/DapServiceClientNativeWin.h
rename to CellFrameDashboardGUI/DapServiceClientNativeWin.h
diff --git a/KelvinDashboardGUI/DapServiceController.cpp b/CellFrameDashboardGUI/DapServiceController.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapServiceController.cpp
rename to CellFrameDashboardGUI/DapServiceController.cpp
diff --git a/KelvinDashboardGUI/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h
similarity index 100%
rename from KelvinDashboardGUI/DapServiceController.h
rename to CellFrameDashboardGUI/DapServiceController.h
diff --git a/KelvinDashboardGUI/DapUiQmlScreenAbout.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenAbout.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenAbout.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenAbout.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml b/CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml
index 8eed111a00b6511ae3db287541ba255a1ca3dd0b..e34d54d2b10c647fd3dd002aa8cfe3c84e66bd44 100755
--- a/KelvinDashboardGUI/DapUiQmlScreenChangeWidget.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenChangeWidget.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.2
import QtQml.Models 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Dialog {
id: dialogChangeWidget
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..86238fb7694a7203711deb25b686ddb78d598ddd
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.13
+import QtQml 2.12
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.12
+
+Page {
+
+ DapUiQmlWidgetConsoleForm {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.right: lastActionsPanel.left
+
+ anchors.topMargin: 30 * pt
+ anchors.leftMargin: 30 * pt
+ anchors.rightMargin: 30 * pt
+ }
+
+ DapUiQmlWidgetConsoleLastActionsForm {
+ id: lastActionsPanel
+ }
+}
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.cpp b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenDashboard.cpp
rename to CellFrameDashboardGUI/DapUiQmlScreenDashboard.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.h b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenDashboard.h
rename to CellFrameDashboardGUI/DapUiQmlScreenDashboard.h
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenDashboard.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenDashboard.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialog.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
similarity index 98%
rename from KelvinDashboardGUI/DapUiQmlScreenDialog.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
index 4f15a205050ff270f88df7af748098eb50508491..7423cdc55b25e9133b9ba8b0a9573c86155f0473 100644
--- a/KelvinDashboardGUI/DapUiQmlScreenDialog.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialog.qml
@@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Page {
id: dapUiQmlScreenDialog
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
index a4db345db1d014abf9e5a10b3f58757140620137..6b7f671717022e688deab1814f7b18e86ddb84cf 100644
--- a/KelvinDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogAddWallet.qml
@@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Dialog {
id: dialogAddWallet
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
index 17aa34305f285bb768d54ea3620d2b4a85a99c87..b59e3dda394bde76af0f691528a5421273a4ed6d 100644
--- a/KelvinDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogRemoveWallet.qml
@@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Dialog {
id: dialogRemoveWallet
diff --git a/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml b/CellFrameDashboardGUI/DapUiQmlScreenDialogSendToken.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenDialogSendToken.qml
index a7a96035d4ab8847c1badcbe21602b0443dba0c0..ed1f96482d8183e4cf86492d67b5b2ccbe01bcdd 100755
--- a/KelvinDashboardGUI/DapUiQmlScreenDialogSendToken.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenDialogSendToken.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls 2.2
import QtQuick.Controls.Styles 1.3
import QtQuick.Controls.Private 1.0
//import QtQuick.Controls 2.5
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Dialog {
id: dialogSendToken
diff --git a/KelvinDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenExchangeForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenHistory.qml b/CellFrameDashboardGUI/DapUiQmlScreenHistory.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenHistory.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenHistory.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenHistoryForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenLogin.cpp.autosave b/CellFrameDashboardGUI/DapUiQmlScreenLogin.cpp.autosave
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenLogin.cpp.autosave
rename to CellFrameDashboardGUI/DapUiQmlScreenLogin.cpp.autosave
diff --git a/KelvinDashboardGUI/DapUiQmlScreenLogin.h.autosave b/CellFrameDashboardGUI/DapUiQmlScreenLogin.h.autosave
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenLogin.h.autosave
rename to CellFrameDashboardGUI/DapUiQmlScreenLogin.h.autosave
diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindow.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlScreenMainWindow.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenMainWindow.qml
diff --git a/KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
index da3b890a6e1a6b55b9dfce28f743851fccaf86e7..a4c12e54736b2e654db5a6e8017a0ddda46c515a 100644
--- a/KelvinDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenMainWindowForm.ui.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
import QtQuick.Controls.Styles 1.4
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Page {
id: dapUiQmlScreenMainWindow
diff --git a/KelvinDashboardGUI/DapUiQmlWidget.cpp b/CellFrameDashboardGUI/DapUiQmlWidget.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidget.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidget.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidget.h b/CellFrameDashboardGUI/DapUiQmlWidget.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidget.h
rename to CellFrameDashboardGUI/DapUiQmlWidget.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainBallance.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainBallance.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainBallance.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainBallance.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainBallance.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainBlockExplorer.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainExchanges.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
similarity index 98%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
index b41e0a23ff4317da0b299c35cc16371496080224..5a2d7bdb21d48f2152ac83dd1e417ca33d8e5ba8 100644
--- a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogs.qml
@@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 1.4
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
DapUiQmlWidgetChainNodeLogsForm {
id: dapQmlWidgetChainNodeLogs
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
similarity index 96%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
index 9f0bda925c1f991e03fd89d6ab724426c08a1a6b..3620bae882f94039297bae73af51a46d8c4752ed 100644
--- a/KelvinDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetChainNodeLogsForm.ui.qml
@@ -1,7 +1,7 @@
import QtQuick 2.11
import QtQuick.Controls 1.4
import QtQuick.Controls 2.2
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Page {
id: dapUiQmlWidgetChainNodeLogs
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainOperations.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainOperations.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainOperations.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainOperations.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainOperations.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainServicesClient.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainServicesShareControl.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainSettings.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainTransactions.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainTransactions.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainTransactions.h b/CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainTransactions.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainTransactions.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml
similarity index 98%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml
index ed93ce869f08215969df3ab33127106a14d6d7b5..b466600aa53e5910d12c41566d307c705efb9837 100755
--- a/KelvinDashboardGUI/DapUiQmlWidgetChainWallet.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetChainWallet.qml
@@ -5,7 +5,7 @@ import QtQuick.Window 2.0
import QtQuick.Controls.Styles 1.3
import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.0
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
DapUiQmlWidgetChainWalletForm {
id: dapQmlWidgetChainWallet
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
similarity index 99%
rename from KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
index e2c666e5302539b9202199c634a9f72676f9f175..c712296ae40d8b455e107e8fe64764adc6d368a7 100755
--- a/KelvinDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetChainWalletForm.ui.qml
@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Styles 1.4
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
Page {
id: dapUiQmlWidgetChainWallet
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetConsole.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetConsole.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetConsole.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetConsoleForm.ui.qml
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
new file mode 100644
index 0000000000000000000000000000000000000000..3092bc5c15cf97d79817c358a3416c13bcc44a73
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
@@ -0,0 +1,31 @@
+import QtQuick 2.0
+import QtQuick.Layouts 1.13
+
+Component {
+ ColumnLayout {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 18 * pt
+ anchors.rightMargin: 18 * pt
+
+ Rectangle {
+ height: 18 * pt
+ }
+
+ Text {
+ id: textLastCmd
+ Layout.fillWidth: true
+ verticalAlignment: Qt.AlignVCenter
+ wrapMode: Text.Wrap
+ text: lastCommand
+ color: "#5F5F63"
+ font.family: "Roboto Regular"
+ font.pixelSize: 14 * pt
+ clip: true
+ }
+
+ Rectangle {
+ height: 18 * pt
+ }
+ }
+}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
new file mode 100644
index 0000000000000000000000000000000000000000..d2ffab08835e00f5a6f2166fe15ace5d79e72924
--- /dev/null
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetConsoleLastActionsForm.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import QtQuick.Layouts 1.13
+
+DapUiQmlWidgetLastActions {
+ id: lastActionsPanel
+ viewModel: dapConsoleModel
+ viewDelegate: DapUiQmlWidgetConsoleLastActionsDelegateForm {}
+}
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml b/CellFrameDashboardGUI/DapUiQmlWidgetDelegate.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetDelegate.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetDelegate.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetDelegateForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderContentForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActions.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActionsButtonForm.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActionsDelegateForm.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActionsForm.ui.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetLastActionsSectionForm.qml
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetModel.cpp b/CellFrameDashboardGUI/DapUiQmlWidgetModel.cpp
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetModel.cpp
rename to CellFrameDashboardGUI/DapUiQmlWidgetModel.cpp
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetModel.h b/CellFrameDashboardGUI/DapUiQmlWidgetModel.h
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetModel.h
rename to CellFrameDashboardGUI/DapUiQmlWidgetModel.h
diff --git a/KelvinDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml b/CellFrameDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml
similarity index 100%
rename from KelvinDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml
rename to CellFrameDashboardGUI/DapUiQmlWidgetNodeNetworkExplorer.qml
diff --git a/KelvinDashboardGUI/Resources/Fonts/LICENSE.txt b/CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/LICENSE.txt
rename to CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_black.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_black.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_black_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_bold.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_bold.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_light.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_light.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_light_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_medium.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_medium.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_regular.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_regular.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_thin.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_thin.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf
diff --git a/KelvinDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf b/CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
similarity index 100%
rename from KelvinDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
rename to CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
diff --git a/KelvinDashboardGUI/Resources/Icons/defaul_icon.png b/CellFrameDashboardGUI/Resources/Icons/defaul_icon.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/defaul_icon.png
rename to CellFrameDashboardGUI/Resources/Icons/defaul_icon.png
diff --git a/KelvinDashboardGUI/Resources/Icons/ic_scroll-down.png b/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/ic_scroll-down.png
rename to CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png
diff --git a/KelvinDashboardGUI/Resources/Icons/ic_scroll-down_hover.png b/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/ic_scroll-down_hover.png
rename to CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png
diff --git a/KelvinDashboardGUI/Resources/Icons/ic_scroll-up.png b/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/ic_scroll-up.png
rename to CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png
diff --git a/KelvinDashboardGUI/Resources/Icons/ic_scroll-up_hover.png b/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/ic_scroll-up_hover.png
rename to CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png
diff --git a/KelvinDashboardGUI/Resources/Icons/icon.ico b/CellFrameDashboardGUI/Resources/Icons/icon.ico
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/icon.ico
rename to CellFrameDashboardGUI/Resources/Icons/icon.ico
diff --git a/KelvinDashboardGUI/Resources/Icons/icon.png b/CellFrameDashboardGUI/Resources/Icons/icon.png
similarity index 100%
rename from KelvinDashboardGUI/Resources/Icons/icon.png
rename to CellFrameDashboardGUI/Resources/Icons/icon.png
diff --git a/KelvinDashboardGUI/Resources/Settings.json b/CellFrameDashboardGUI/Resources/Settings.json
similarity index 100%
rename from KelvinDashboardGUI/Resources/Settings.json
rename to CellFrameDashboardGUI/Resources/Settings.json
diff --git a/CellFrameDashboardGUI/Resources/cellframe-logo.svg b/CellFrameDashboardGUI/Resources/cellframe-logo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bc1b43a11fbadf34a7f56064871411f69e308df7
--- /dev/null
+++ b/CellFrameDashboardGUI/Resources/cellframe-logo.svg
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 1200 1200" style="enable-background:new 0 0 1200 1200;" xml:space="preserve">
+<style type="text/css">
+ .st0{display:none;}
+ .st1{fill:#2895F9;}
+ .st2{fill:#9706BA;}
+ .st3{fill:#4126DD;}
+</style>
+<g id="Фон_xA0_Изображение_1_" class="st0">
+</g>
+<g id="Четвертый_xA0_Изображение_1_">
+ <path class="st1" d="M469.8,1122.16c-3.82-3.01-7.3-5.72-10.74-8.46c-49.26-39.25-98.52-78.51-147.78-117.76
+ c-38.88-30.98-77.76-61.96-116.64-92.94c-12.75-10.16-25.48-20.33-38.22-30.5c-3.32-2.65-3.34-2.82,0.22-4.9
+ c26.36-15.35,52.73-30.69,79.1-46.03c52.64-30.61,105.28-61.22,157.92-91.82c47.31-27.5,94.62-55,141.93-82.5
+ c20.03-11.64,40.08-23.25,60.06-34.99c2.4-1.41,4.15-1.46,6.62-0.02c29.94,17.54,59.95,34.94,89.95,52.38
+ c34.83,20.24,69.66,40.48,104.49,60.72c52.54,30.55,105.08,61.1,157.62,91.65c28.89,16.79,57.78,33.58,86.67,50.37
+ c3.98,2.31,4,2.35,0.48,5.15c-29.31,23.38-58.63,46.73-87.94,70.11c-27.31,21.77-54.6,43.57-81.92,65.33
+ c-31.32,24.96-62.67,49.89-94,74.83c-15.39,12.26-30.77,24.54-46.16,36.8c-0.97,0.77-1.84,1.74-3.03,1.92
+ c-0.86-0.66-0.69-1.41-0.69-2.08c0.03-5.47-0.16-10.96,0.19-16.41c0.63-9.89,0.47-19.79,0.47-29.68c0-3.41,1.16-5.55,3.79-7.59
+ c19.5-15.13,38.9-30.39,58.33-45.62c33.45-26.22,66.88-52.45,100.34-78.66c25.94-20.32,51.89-40.62,77.84-60.93
+ c0.37-0.29,0.75-0.56,1.1-0.86c2.56-2.13,2.54-2.34-0.34-4.06c-22.98-13.75-45.96-27.5-68.94-41.25
+ c-40.67-24.32-81.34-48.64-122.02-72.95c-41.47-24.79-82.95-49.57-124.43-74.36c-17.19-10.27-34.4-20.51-51.54-30.88
+ c-2.48-1.5-4.33-1.62-6.92-0.06c-24.32,14.68-48.74,29.21-73.12,43.78c-42.07,25.15-84.14,50.31-126.22,75.46
+ c-40.17,24.02-80.35,48.03-120.53,72.04c-15.29,9.14-30.58,18.28-45.88,27.41c-4.48,2.67-4.46,2.65-0.28,5.92
+ c38.67,30.31,77.34,60.62,116.01,90.93c29.14,22.84,58.3,45.66,87.44,68.49c11.18,8.76,22.32,17.57,33.56,26.26
+ c1.95,1.51,2.63,3.21,2.74,5.62c0.75,16.17,0.34,32.36,0.91,48.53C470.26,1120.9,470.08,1121.22,469.8,1122.16z"/>
+ <path class="st1" d="M680.96,512.38c0.66-1.08,1.91-1.54,2.97-2.16c9.27-5.37,18.55-10.7,27.84-16.04
+ c0.61-0.35,1.26-0.62,1.83-1.01c1.74-1.18,3.37-1.04,5.2-0.02c6.4,3.57,12.88,7.02,19.31,10.54c16.86,9.2,33.72,18.41,50.57,27.61
+ c18.9,10.32,37.79,20.66,56.69,30.98c16.76,9.14,33.54,18.25,50.29,27.39c16.65,9.09,33.29,18.21,49.94,27.3
+ c13.49,7.36,26.99,14.69,40.48,22.05c22.28,12.15,44.55,24.31,66.82,36.47c3.88,2.12,7.79,4.2,11.66,6.34
+ c2.64,1.46,2.78,1.77,2.3,4.72c-1.98,12.29-3.98,24.58-5.99,36.87c-0.09,0.57-0.25,1.14-0.39,1.7c-0.3,1.17-1.03,1.52-2.09,0.96
+ c-1.64-0.87-3.26-1.81-4.88-2.73c-31.93-18.03-63.85-36.07-95.77-54.1c-28.17-15.92-56.34-31.84-84.52-47.75
+ c-27.88-15.74-55.77-31.44-83.64-47.18c-26.15-14.77-52.28-29.56-78.43-44.34c-9.32-5.27-18.66-10.52-27.98-15.79
+ C682.4,513.75,681.42,513.52,680.96,512.38z"/>
+ <path class="st1" d="M130.99,685.36c-0.19-1.66,0.74-2.58,2.07-3.31c3.58-1.95,7.12-3.95,10.7-5.91
+ c30.14-16.46,60.28-32.92,90.42-49.36c24.43-13.32,48.88-26.59,73.3-39.91c24.22-13.21,48.41-26.48,72.62-39.69
+ c24.42-13.32,48.87-26.6,73.3-39.91c8.48-4.62,16.98-9.22,25.41-13.95c2.04-1.15,3.71-1.32,5.81-0.08
+ c9.93,5.84,19.95,11.54,29.94,17.3c0.5,0.29,1.01,0.58,1.48,0.92c0.84,0.59,1.02,1.28,0.08,1.93c-0.76,0.53-1.57,0.99-2.38,1.45
+ c-28.07,15.87-56.13,31.76-84.21,47.6c-28.39,16.02-56.8,31.98-85.19,48c-20.17,11.38-40.31,22.83-60.48,34.23
+ c-20.88,11.79-41.78,23.54-62.67,35.33c-20.68,11.67-41.35,23.36-62.03,35.04c-5.88,3.32-11.75,6.65-17.63,9.97
+ c-0.3,0.17-0.61,0.34-0.92,0.5c-2.65,1.33-2.87,1.26-3.37-1.55c-0.87-4.93-1.68-9.87-2.5-14.8c-1.17-7.12-2.32-14.24-3.47-21.37
+ C131.17,686.98,131.09,686.17,130.99,685.36z"/>
+</g>
+<g id="Третий__x28_Ñредний_x29__xA0_Изображение_1_">
+ <path class="st2" d="M552.73,586.02c0.22,31.22,0.44,62.21,0.66,93.15c1.68,0.39,2.53-0.59,3.48-1.16
+ c13.01-7.74,26.03-15.45,38.96-23.33c2.26-1.38,3.82-1.57,6.2-0.11c12.9,7.92,25.93,15.61,38.95,23.34
+ c1.03,0.61,2.07,2.07,3.34,1.24c0.99-0.65,0.46-2.17,0.47-3.3c0.11-28.53,0.2-57.06,0.29-85.58c0.02-4.99,0.02-4.99,4.27-2.52
+ c11.98,6.97,23.91,14,35.96,20.83c2.38,1.35,3.13,2.87,3.11,5.53c-0.21,28.88-0.29,57.75-0.41,86.63c0,0.93,0.06,1.87-0.02,2.79
+ c-0.16,1.86,0.66,3.01,2.26,3.92c3.84,2.2,7.59,4.54,11.39,6.81c89.32,53.44,178.65,106.87,267.97,160.32
+ c1.06,0.63,2.36,1.01,2.99,2.22c-0.27,1.06-1.19,1.45-1.89,2.02c-9.59,7.77-19.19,15.53-28.79,23.28c-3.15,2.54-3.16,2.52-6.59,0.4
+ c-38.03-23.51-76.05-47.02-114.08-70.53c-43.18-26.69-86.36-53.38-129.54-80.07c-1.07-0.66-2.06-1.5-3.28-1.71
+ c-0.99,0.61-0.72,1.5-0.77,2.27c-0.06,0.93-0.02,1.86-0.03,2.79c-0.33,66.6-0.66,133.21-1,199.81
+ c-0.21,41.22-0.32,82.44-0.71,123.66c-0.35,36.91-0.35,73.82-0.59,110.73c-0.01,1.37,0.25,2.79-0.34,4.11
+ c-0.92,0.57-1.58-0.09-2.23-0.49c-12.75-7.72-25.48-15.47-38.25-23.15c-1.63-0.98-2.16-2.23-2.12-4.02
+ c0.12-4.77,0.2-9.55,0.21-14.32c0.18-45.76,0.32-91.52,0.51-137.28c0.21-49.37,0.32-98.74,0.72-148.11
+ c0.38-45.99,0.34-91.99,0.6-137.98c0.01-1.05-0.06-2.1,0.02-3.14c0.13-1.72-0.65-2.79-2.08-3.68
+ c-13.78-8.48-27.55-16.99-41.29-25.54c-1.48-0.92-2.64-0.93-4.13,0c-13.84,8.62-27.7,17.18-41.58,25.73
+ c-1.33,0.82-2.04,1.8-1.9,3.4c0.09,1.04,0.01,2.09,0.02,3.14c0.3,66.72,0.46,133.44,0.94,200.16c0.34,47.86,0.32,95.71,0.61,143.57
+ c0.19,30.74,0.27,61.48,0.59,92.22c0.04,3.54-1.15,5.41-4.1,7.14c-11.44,6.72-22.73,13.72-34.08,20.59
+ c-1.26,0.76-2.45,1.76-4.17,2.06c-0.7-1.25-0.45-2.54-0.46-3.76c-0.25-42.15-0.48-84.3-0.71-126.45
+ c-0.29-53.68-0.44-107.36-0.9-161.04c-0.36-41.69-0.32-83.37-0.64-125.06c-0.06-8.03-0.17-16.07-0.29-24.1
+ c-0.01-1.02,0.22-2.1-0.46-3.04c-1.19-0.31-1.97,0.55-2.82,1.07c-36.95,22.82-73.89,45.66-110.82,68.5
+ c-44.66,27.61-89.32,55.23-133.99,82.84c-2.88,1.78-2.93,1.82-5.19,0c-10.07-8.11-20.11-16.24-30.16-24.37
+ c-0.53-0.43-1.16-0.8-1.38-1.76c0.81-1.2,2.28-1.71,3.53-2.46c43.95-26.31,87.92-52.61,131.88-78.91
+ c48.36-28.93,96.71-57.87,145.07-86.8c0.9-0.54,1.78-1.11,2.69-1.63c1-0.58,1.48-1.42,1.45-2.58c-0.03-1.05,0.01-2.1,0-3.14
+ c-0.18-28.76-0.31-57.51-0.61-86.27c-0.03-3.17,0.85-5.02,3.7-6.62c11.97-6.73,23.79-13.74,35.68-20.63
+ C549.92,587.04,550.94,586.23,552.73,586.02z"/>
+ <path class="st2" d="M1060.38,725.59c1.19-4.62,1.58-9.25,2.27-13.82c4.41-29.47,8.77-58.95,13.12-88.43
+ c4.31-29.13,8.58-58.27,12.89-87.4c4.29-29.02,8.62-58.03,12.93-87.04c1.28-8.64,2.6-17.27,3.77-25.92
+ c0.31-2.27,1.19-3.76,3.22-4.95c13.56-7.94,27.05-16.01,40.58-24.02c0.78-0.46,1.47-1.17,2.51-1.06c0.7,0.72,0.34,1.54,0.22,2.3
+ c-4.46,28.52-8.95,57.04-13.41,85.56c-4.52,28.86-9.02,57.73-13.54,86.6c-4.34,27.72-8.69,55.43-13.03,83.14
+ c-4.75,30.36-9.49,60.72-14.23,91.08c-2.44,15.64-4.9,31.28-7.35,46.92c-0.13,0.81-0.27,1.61-0.4,2.41
+ c-0.2,1.18-0.8,1.65-1.95,1.04c-0.92-0.49-1.83-1.02-2.74-1.54c-49.02-28.49-98.05-56.99-147.07-85.49
+ c-96.94-56.35-193.87-112.7-290.81-169.06c-0.7-0.41-1.38-0.89-2.12-1.22c-1.57-0.71-2.26-1.88-2.14-3.6c0.07-1.04,0-2.1,0-3.14
+ c0-168.03,0-336.06-0.01-504.09c0-7.05,0.17-6,5.73-3.83c122.36,47.63,244.71,95.29,367.05,142.94c1.48,0.58,3.06,1,4.43,1.98
+ c-0.55,1.39-1.77,1.67-2.72,2.21c-13.41,7.5-26.88,14.91-40.24,22.5c-2.41,1.37-4.4,1.33-6.87,0.34
+ c-44.95-18-89.94-35.92-134.91-53.87c-48.11-19.2-96.22-38.4-144.34-57.59c-4.89-1.95-4.98-2.59-5.04,3.38
+ c-0.29,28.99-0.6,57.98-0.94,86.98c-0.44,37.72-0.92,75.45-1.38,113.17c-0.47,38.77-0.94,77.54-1.42,116.31
+ c-0.44,36.09-0.88,72.19-1.33,108.28c-0.01,0.58,0.05,1.17-0.03,1.75c-0.31,2.37,0.57,3.85,2.78,4.99
+ c4.24,2.18,8.32,4.68,12.48,7.03c77.04,43.53,154.08,87.06,231.12,130.59c42.88,24.23,85.76,48.46,128.64,72.67
+ C1057.41,724.42,1058.61,725.38,1060.38,725.59z"/>
+ <path class="st2" d="M45.81,392.9c1.57-0.06,2.26,0.64,3.03,1.1c13.42,7.95,26.81,15.96,40.27,23.84c2.11,1.23,3.14,2.67,3.49,5.12
+ c2.85,19.82,5.83,39.61,8.77,59.41c4.34,29.24,8.68,58.49,13.01,87.73c4.07,27.52,8.12,55.04,12.19,82.56
+ c3.47,23.49,6.96,46.97,10.44,70.46c0.42,2.83,0.62,2.94,3.29,1.44c15.42-8.68,30.82-17.39,46.23-26.1
+ c56.66-32.01,113.32-64.02,169.98-96.04c52.2-29.5,104.38-59.03,156.61-88.46c2.59-1.46,3.49-3.08,3.45-6.03
+ c-0.45-32.83-0.74-65.66-1.12-98.49c-0.42-36.32-0.88-72.65-1.33-108.97c-0.48-39.58-0.96-79.17-1.45-118.75
+ c-0.41-33.53-0.84-67.06-1.27-100.59c-0.06-4.55-0.06-4.56-4.46-2.8c-19.68,7.85-39.35,15.7-59.03,23.55
+ c-73.41,29.28-146.82,58.54-220.2,87.89c-2.99,1.2-5.33,1.13-8.13-0.47c-12.94-7.38-26-14.56-39.02-21.81
+ c-1.1-0.62-2.18-1.29-3.4-2.02c0.97-1.48,2.42-1.65,3.65-2.13c33.72-13.15,67.46-26.29,101.19-39.42
+ c88.94-34.64,177.87-69.28,266.81-103.9c5.54-2.16,5.71-3.19,5.7,3.88c-0.01,168.25-0.01,336.5-0.01,504.74
+ c0,0.47-0.06,0.94,0.01,1.4c0.43,2.68-0.8,4.13-3.13,5.48c-80.86,46.92-161.68,93.92-242.5,140.91
+ c-65.42,38.03-130.85,76.07-196.28,114.1c-4.32,2.51-4.28,2.5-5.05-2.48c-4.06-25.99-8.16-51.97-12.23-77.96
+ c-4.78-30.59-9.54-61.18-14.32-91.77c-4.04-25.87-8.12-51.74-12.16-77.61c-4.34-27.71-8.65-55.43-12.99-83.14
+ c-3.13-20.01-6.28-40.01-9.41-60.02C46.23,396.08,46.05,394.59,45.81,392.9z"/>
+</g>
+<g id="Второй__x28_темный_x29__xA0_Изображение_1_">
+ <path class="st3" d="M4.06,320.04c1.7,0.06,2.58,0.9,3.56,1.47c90.07,51.92,180.14,103.86,270.2,155.79
+ c76.55,44.14,153.1,88.28,229.68,132.36c1.79,1.03,2.26,2.09,2.26,4.05c0.14,40.41,0.36,80.81,0.57,121.22
+ c0.2,39.36,0.41,78.72,0.63,118.07c0.5,91.52,0.99,183.05,1.49,274.57c0.11,20.73,0.26,41.45,0.39,62.18c0.01,1.39,0,2.78,0,4.27
+ c-1.69,0.21-2.48-0.95-3.41-1.69c-18.14-14.23-36.26-28.48-54.38-42.73c-70.3-55.27-140.6-110.54-210.9-165.81
+ c-21.42-16.84-42.83-33.68-64.26-50.52c-3.39-2.66-6.79-5.31-10.24-7.89c-1.28-0.96-2.06-2.11-2.47-3.65
+ c-4.43-16.53-8.89-33.04-13.33-49.56c-0.15-0.54-0.19-1.12-0.3-1.74c0.59,0.19-0.05,0,0.38-0.17c0.1-0.04,0.23-0.04,0.34-0.02
+ c0.11,0.02,0.22,0.09,0.31,0.15c0.19,0.13,0.38,0.27,0.56,0.41c0.18,0.14,0.36,0.29,0.54,0.44
+ c102.94,82.13,205.89,164.26,308.83,246.39c0.18,0.15,0.37,0.28,0.56,0.42c0.09,0.07,0.19,0.14,0.29,0.2
+ c0.1,0.06,0.19,0.13,0.3,0.18c0.1,0.05,0.21,0.1,0.32,0.13c0.11,0.02,0.22,0.01,0.38,0.02c0.87-0.5,0.61-1.39,0.59-2.14
+ c-0.39-18.74-0.8-37.49-1.22-56.23c-0.27-11.99-0.62-23.98-0.89-35.97c-0.83-36.67-1.62-73.34-2.45-110.01
+ c-0.92-40.28-1.87-80.55-2.8-120.83c-0.69-29.8-1.38-59.6-2.07-89.4c-0.45-19.21-0.97-38.41-1.27-57.62
+ c-0.05-3.07-1.05-4.76-3.68-6.34c-83.08-49.8-166.11-99.69-249.15-149.56c-50.7-30.45-101.4-60.9-152.11-91.34
+ c-1.27-0.76-2.46-1.74-4.57-2.23c6.8,44.11,13.77,87.83,20.6,131.56c6.86,43.93,13.82,87.85,20.72,131.77
+ c6.87,43.76,13.73,87.53,20.61,131.46c-1.86-0.05-2.44-1.2-3.22-1.97c-11.44-11.29-22.82-22.63-34.3-33.87
+ c-1.77-1.73-2.74-3.56-3.09-5.99c-1.87-13.25-3.83-26.49-5.8-39.73c-3.38-22.68-6.8-45.35-10.19-68.03
+ c-3.36-22.45-6.71-44.9-10.07-67.34c-3.84-25.67-7.68-51.34-11.52-77.01c-3.38-22.56-6.76-45.12-10.14-67.69
+ c-3.62-24.17-7.24-48.35-10.86-72.52c-1.71-11.4-3.43-22.79-5.13-34.19C4.19,322.35,4.16,321.31,4.06,320.04z"/>
+ <path class="st3" d="M731.35,1119.31c104.47-83.34,208.53-166.36,312.77-249.52c0.53,1.73-0.11,2.8-0.4,3.88
+ c-4.17,15.63-8.43,31.24-12.57,46.88c-0.63,2.39-1.82,4.08-3.76,5.59c-112.81,88.59-225.59,177.23-338.39,265.85
+ c-0.98,0.77-1.81,1.81-3.32,2.05c-0.73-0.87-0.5-1.95-0.49-2.93c0.18-39.94,0.36-79.88,0.56-119.81c0.2-39.7,0.4-79.41,0.62-119.11
+ c0.24-45.76,0.5-91.52,0.75-137.28c0.23-41.68,0.44-83.37,0.67-125.05c0.14-25.27,0.33-50.53,0.4-75.8
+ c0.01-2.23,0.57-3.43,2.61-4.61c153.54-88.44,307.03-176.95,460.52-265.46c12.91-7.44,25.81-14.89,38.73-22.32
+ c1.09-0.62,2.08-1.5,3.43-1.6c0.81,0.68,0.42,1.51,0.3,2.25c-4.24,28.32-8.51,56.63-12.75,84.94
+ c-3.84,25.67-7.65,51.34-11.49,77.01c-4.07,27.16-8.17,54.32-12.23,81.49c-3.84,25.67-7.65,51.34-11.5,77.01
+ c-4.09,27.28-8.21,54.55-12.29,81.83c-1.29,8.63-2.52,17.28-3.72,25.92c-0.23,1.68-0.73,3.07-1.98,4.31
+ c-12.26,12.11-24.48,24.26-36.72,36.39c-0.4,0.39-0.77,0.91-1.83,0.69c20.65-131.55,41.31-263.12,62.01-394.98
+ c-1.81,0.28-2.79,1.14-3.85,1.78c-64.28,38.59-128.55,77.19-192.82,115.79c-69.86,41.96-139.71,83.93-209.62,125.81
+ c-2.33,1.4-3.08,2.92-3.13,5.54c-0.62,30.73-1.37,61.46-2.08,92.19c-0.94,40.39-1.88,80.78-2.81,121.17
+ c-0.7,30.26-1.4,60.53-2.11,90.79c-0.93,39.93-1.84,79.85-2.78,119.78c-0.35,14.78-0.76,29.56-1.12,44.35
+ C730.94,1115.61,730.72,1117.11,731.35,1119.31z"/>
+ <path class="st3" d="M1104.22,166.3c0.84,1.07,0.56,2.14,0.55,3.14c-0.24,14.55-0.57,29.1-0.71,43.66
+ c-0.02,2.33-1.21,3.23-2.91,4.2c-22.42,12.86-44.81,25.76-67.21,38.64c-104.14,59.89-208.27,119.79-312.41,179.68
+ c-0.4,0.23-0.78,0.53-1.21,0.69c-2.3,0.85-2.92,2.5-2.97,4.89c-0.34,15.71-0.89,31.42-1.18,47.14c-0.05,2.8-0.96,4.39-3.4,5.75
+ c-9.96,5.56-19.8,11.33-29.7,17.01c-0.8,0.46-1.55,1.04-3.01,1.2c-0.37-4.37-0.07-8.71-0.07-13.03c0-4.31,0.12-8.62,0.19-12.92
+ c0.08-4.42,0.2-8.85,0.24-13.27c0.04-4.3,0.01-8.6,0.01-13.01c-1.67-0.32-2.7,0.78-3.83,1.43c-20.1,11.52-40.18,23.07-60.26,34.62
+ c-5.25,3.02-10.54,5.96-15.71,9.1c-1.43,0.87-2.33,0.73-3.71-0.06c-25.2-14.56-50.43-29.05-75.67-43.55
+ c-1.17-0.67-2.28-1.54-4.19-1.87c0.24,17.66,0.47,35.03,0.71,52.39c-1.62,0.21-2.42-0.57-3.3-1.07
+ c-9.9-5.67-19.74-11.45-29.71-16.99c-2.5-1.39-3.25-3.07-3.31-5.81c-0.3-15.48-0.86-30.96-1.14-46.44
+ c-0.05-2.96-1.17-4.5-3.67-5.94c-78.24-44.91-156.44-89.9-234.64-134.87c-47.93-27.56-95.87-55.13-143.8-82.69
+ c-0.91-0.52-1.79-1.1-2.72-1.57c-1.27-0.63-1.85-1.52-1.88-3.02c-0.22-15.25-0.51-30.5-0.77-45.75c-0.01-0.45,0.12-0.91,0.2-1.46
+ c1.59-0.17,2.64,0.87,3.79,1.53c30.8,17.65,61.59,35.33,92.39,53.01c95,54.53,190,109.07,285,163.59c1.28,0.73,2.5,1.63,3.91,1.98
+ c0.88-0.95,0.58-1.92,0.55-2.8c-0.6-22.93-1.21-45.86-1.83-68.79c-0.3-11.17-0.64-22.35-0.93-33.52c-0.58-22-1.1-44-1.7-66
+ c-1.05-38.52-2.2-77.05-3.17-115.57c-0.24-9.63-1.76-7.01,6.95-10.47c9.95-3.95,19.99-7.66,30-11.46c1.18-0.45,2.38-0.83,3.74-1.3
+ c0.7,1.38,0.49,2.66,0.51,3.88c0.28,21.54,0.54,43.08,0.81,64.62c0.47,37.37,0.95,74.75,1.42,112.12
+ c0.46,36.21,0.91,72.42,1.37,108.63c0.17,13.27,0.42,26.54,0.5,39.82c0.01,2.28,0.76,3.54,2.74,4.67
+ c25.78,14.71,51.53,29.49,77.23,44.33c1.87,1.08,3.23,1.01,5.07-0.05c25.71-14.83,51.45-29.62,77.24-44.32
+ c2.03-1.16,2.63-2.5,2.65-4.72c0.2-23.52,0.49-47.04,0.79-70.56c0.74-59.26,1.48-118.52,2.24-177.79
+ c0.33-25.5,0.7-50.99,1.06-76.49c0.02-1.26-0.19-2.56,0.35-3.78c1.13-0.42,2.06,0.24,3,0.6c11.64,4.42,23.27,8.86,34.9,13.31
+ c3.1,1.19,3.15,1.22,3.06,4.51c-0.59,22.23-1.2,44.46-1.82,66.69c-0.28,10.01-0.58,20.02-0.84,30.03
+ c-0.81,31.08-1.58,62.15-2.41,93.23c-0.86,32.24-1.77,64.48-2.65,96.72c-0.04,1.38-0.26,2.79,0.2,4.29
+ c1.51,0.19,2.56-0.87,3.7-1.53c29.49-16.9,58.97-33.82,88.45-50.74c96.41-55.34,192.83-110.68,289.24-166.02
+ C1101.75,167.46,1102.87,166.63,1104.22,166.3z"/>
+</g>
+<g id="Первый_xA0_Изображение_1_">
+ <path class="st1" d="M500.66,3.33c3.99,1.67,8.25,2.43,12.39,3.57c12.68,3.49,25.4,6.87,38.1,10.3c0.78,0.21,1.6,0.29,2.69,1.27
+ c-8.93,3.83-17.8,7.03-26.55,10.5c-8.87,3.52-17.8,6.92-26.7,10.37c-8.79,3.41-17.58,6.82-26.38,10.24
+ c-8.9,3.46-17.8,6.92-26.69,10.38c-8.9,3.46-17.79,6.93-26.69,10.39c-8.9,3.46-17.8,6.92-26.69,10.38
+ c-8.9,3.46-17.79,6.93-26.69,10.39c-8.79,3.42-17.58,6.83-26.37,10.24c-8.9,3.45-17.81,6.9-26.7,10.35
+ c-8.9,3.46-17.8,6.92-26.69,10.38c-8.9,3.46-17.79,6.93-26.69,10.4c-8.79,3.42-17.58,6.83-26.37,10.25
+ c-8.9,3.46-17.79,6.93-26.69,10.39c-8.84,3.44-17.68,6.89-27.26,10.62c2.61,1.53,4.46,2.66,6.36,3.71
+ c24.28,13.36,48.57,26.68,72.84,40.05c23.86,13.14,47.7,26.33,71.56,39.47c19.48,10.73,38.97,21.42,58.45,32.15
+ c21.93,12.07,43.84,24.17,65.76,36.25c19.38,10.67,38.77,21.32,58.14,31.99c24.17,13.31,48.33,26.64,72.49,39.95
+ c3.26,1.8,6.58,3.5,9.79,5.4c1.93,1.15,3.57,1.1,5.53,0c7.92-4.45,15.9-8.77,23.86-13.15c17.23-9.49,34.46-18.99,51.69-28.49
+ c19.57-10.79,39.14-21.6,58.72-32.38c19.38-10.67,38.77-21.32,58.14-31.99c22.03-12.13,44.05-24.28,66.08-36.41
+ c17.34-9.55,34.69-19.06,52.03-28.61c19.48-10.73,38.94-21.48,58.42-32.21c14.38-7.92,28.76-15.83,43.13-23.76
+ c0.88-0.48,2.01-0.68,2.62-2.27C892.2,115.21,768.14,66.98,643.95,18.69c0.9-1.48,2.18-1.37,3.22-1.66
+ c15.62-4.23,31.25-8.43,46.87-12.65c1-0.27,2.07-0.39,2.94-1.05c0.23,0,0.47,0,0.7,0c8.18,3.68,16.54,6.88,24.87,10.19
+ c48.47,19.27,96.96,38.5,145.44,57.75c46.32,18.39,92.63,36.78,138.95,55.16c30.95,12.29,61.9,24.57,92.85,36.86
+ c1.49,0.59,2.97,1.22,4.61,1.9c-0.65,1.61-1.99,1.96-3.01,2.56c-13.11,7.57-26.24,15.09-39.37,22.63
+ c-24.44,14.03-48.87,28.05-73.31,42.08c-27.77,15.94-55.54,31.87-83.31,47.81c-25.85,14.84-51.69,29.69-77.54,44.53
+ c-29.08,16.7-58.16,33.38-87.24,50.08c-25.75,14.79-51.48,29.58-77.23,44.37c-20.9,12-41.81,23.99-62.68,36.03
+ c-1.4,0.81-2.4,0.8-3.8,0c-30.46-17.56-60.95-35.07-91.45-52.58c-30.49-17.51-60.99-35.01-91.48-52.52
+ c-29.18-16.75-58.35-33.52-87.53-50.27c-33.72-19.36-67.46-38.71-101.18-58.07c-33.62-19.31-67.23-38.63-100.85-57.94
+ c-8.88-5.1-17.79-10.17-26.68-15.26c-1.5-0.86-2.96-1.76-4.63-2.76c1.29-1.64,2.98-1.87,4.42-2.44c22.6-9.02,45.22-18,67.84-26.98
+ c53.24-21.15,106.48-42.29,159.72-63.43c54.32-21.57,108.65-43.12,162.97-64.7c4-1.59,7.93-3.33,11.89-5
+ C500.19,3.33,500.43,3.33,500.66,3.33z"/>
+ <path class="st1" d="M1192.99,319.4c-0.27,1.12-1.15,1.33-1.83,1.72c-23.99,13.86-47.99,27.71-71.99,41.55
+ c-26.02,15.01-52.03,30.01-78.05,45.01c-27.23,15.7-54.46,31.39-81.69,47.09c-52.84,30.48-105.68,60.96-158.51,91.45
+ c-36.2,20.88-72.42,41.72-108.56,62.71c-3.23,1.87-5.66,1.97-8.88,0.01c-11.35-6.87-22.89-13.43-34.35-20.12
+ c-0.8-0.47-1.6-0.95-2.4-1.43c-1.23-0.76-1.32-1.56-0.04-2.34c1.29-0.79,2.6-1.54,3.92-2.3c30.87-17.77,61.74-35.55,92.61-53.32
+ c28.15-16.2,56.3-32.39,84.46-48.59c46.72-26.88,93.44-53.74,140.15-80.63c40.86-23.52,81.71-47.06,122.56-70.59
+ c18.76-10.8,37.57-21.53,56.26-32.46c2.71-1.58,4.69-1.46,7.31,0.04c11.42,6.53,22.96,12.84,34.45,19.25
+ C1190.01,317.37,1191.7,318.15,1192.99,319.4z"/>
+ <path class="st1" d="M5.16,319.77c0.24-1.15,1.08-1.41,1.77-1.79c12.51-6.97,25.05-13.86,37.5-20.94c2.58-1.47,4.53-1.23,7.03,0.21
+ c30.22,17.5,60.5,34.89,90.76,52.32c28.24,16.26,56.48,32.55,84.72,48.81c30.37,17.48,60.75,34.92,91.12,52.4
+ c26.63,15.33,53.25,30.69,79.88,46.02c27.24,15.68,54.49,31.34,81.73,47.01c23.31,13.41,46.61,26.82,69.92,40.24
+ c0.3,0.17,0.6,0.35,0.9,0.54c2.49,1.58,2.51,1.88-0.1,3.4c-12.67,7.39-25.37,14.72-38.02,22.15c-1.78,1.04-3.16,0.81-4.83-0.16
+ c-16.51-9.58-33.06-19.1-49.59-28.64c-28.23-16.28-56.47-32.57-84.7-48.85c-26.22-15.12-52.43-30.25-78.65-45.37
+ c-27.02-15.58-54.05-31.16-81.08-46.74c-24.2-13.95-48.4-27.91-72.6-41.87c-30.25-17.45-60.5-34.9-90.75-52.35
+ c-13.81-7.97-27.63-15.93-41.44-23.91C7.46,321.5,6.06,320.88,5.16,319.77z"/>
+</g>
+</svg>
diff --git a/KelvinDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
similarity index 85%
rename from KelvinDashboardGUI/main.cpp
rename to CellFrameDashboardGUI/main.cpp
index 1032786fcaeee708878c0cefd7541022efa299fd..ff2ee42c7a064ba77e8b90d68cd85082918b15c0 100755
--- a/KelvinDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -33,15 +33,15 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
app.setOrganizationName("DEMLABS");
- app.setOrganizationDomain("demlabs.com");
- app.setApplicationName("Kelvin Dashboard");
+ app.setOrganizationDomain("demlabs.net");
+ app.setApplicationName("CellFrame Dashboard");
app.setWindowIcon(QIcon(":/Resources/Icons/icon.ico"));
DapLogger dapLogger;
/// TODO: The code is commented out at the time of developing the logging strategy in the project
//#ifndef QT_DEBUG
#ifdef Q_OS_LINUX
- dapLogger.setLogFile(QString("/opt/kelvin-dashboard/log/%1Gui.log").arg(DAP_BRAND));
+ dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Gui.log").arg(DAP_BRAND));
#endif
//#endif
@@ -58,11 +58,11 @@ int main(int argc, char *argv[])
DapScreenHistoryFilterModel::getInstance()
.setSourceModel(&DapScreenHistoryModel::getInstance());
- qmlRegisterType<DapScreenDialog>("KelvinDashboard", 1, 0, "DapScreenDialog");
- qmlRegisterType<DapScreenDialogChangeWidget>("KelvinDashboard", 1, 0, "DapScreenDialogChangeWidget");
+ qmlRegisterType<DapScreenDialog>("CellFrameDashboard", 1, 0, "DapScreenDialog");
+ qmlRegisterType<DapScreenDialogChangeWidget>("CellFrameDashboard", 1, 0, "DapScreenDialogChangeWidget");
qmlRegisterType<DapLogMessage>("LogMessage", 1, 0, "DapLogMessage");
qmlRegisterType<DapChainNodeNetworkExplorer>("NodeNetworkExplorer", 1, 0, "DapUiQmlWidgetNodeNetwork");
- qmlRegisterSingletonType<DapUiQmlWidgetModel>("KelvinDashboard", 1, 0, "DapUiQmlWidgetModel", DapUiQmlWidgetModel::singletonProvider);
+ qmlRegisterSingletonType<DapUiQmlWidgetModel>("CellFrameDashboard", 1, 0, "DapUiQmlWidgetModel", DapUiQmlWidgetModel::singletonProvider);
qmlRegisterType<DapScreenHistoryModel>("DapTransactionHistory", 1, 0, "DapTransactionModel");
QQmlApplicationEngine engine;
diff --git a/KelvinDashboardGUI/main.qml b/CellFrameDashboardGUI/main.qml
similarity index 99%
rename from KelvinDashboardGUI/main.qml
rename to CellFrameDashboardGUI/main.qml
index 7a9e4cb62177127555645e9b6aed14705cf14b6b..2d45e306e10f1a7175c9120dc65857bb14583e99 100755
--- a/KelvinDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/main.qml
@@ -5,7 +5,7 @@ import QtQuick.Window 2.0
import QtQuick.Controls.Styles 1.3
import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.0
-import KelvinDashboard 1.0
+import CellFrameDashboard 1.0
ApplicationWindow {
id: window
diff --git a/KelvinDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
similarity index 98%
rename from KelvinDashboardGUI/qml.qrc
rename to CellFrameDashboardGUI/qml.qrc
index 848c3ce91fb90d65b43f96925379f011160a8305..16c736a9c50a1a30c4e8b6cdc92c7bf2c6f006f5 100755
--- a/KelvinDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>KelvinDashboardGUI.conf</file>
+ <file>CellFrameDashboardGUI.conf</file>
<file>DapUiQmlWidgetChainBlockExplorer.ui.qml</file>
<file>DapUiQmlWidgetChainExchanges.ui.qml</file>
<file>DapUiQmlWidgetChainServicesClient.ui.qml</file>
diff --git a/KelvinDashboardService/KelvinDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
similarity index 75%
rename from KelvinDashboardService/KelvinDashboardService.pro
rename to CellFrameDashboardService/CellFrameDashboardService.pro
index 1c7464286402e0f6f93d6224333da8625a57013f..3e2af3a756e8ab57b49dc783f3e8ff78f716db07 100755
--- a/KelvinDashboardService/KelvinDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
!defined(BRAND,var){
# Default brand
- BRAND = KelvinDashboard
+ BRAND = CellFrameDashboard
}
DEFINES += DAP_BRAND=\\\"$$BRAND\\\"
@@ -21,12 +21,12 @@ ICON = icon.ico
win32 {
VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
DEFINES += CLI_PATH=\\\"./kelvin-node-cli.exe\\\"
- DEFINES += LOG_FILE=\\\"./opt/kelvin-node/var/log/kelvin-node_logs.txt\\\"
+ DEFINES += LOG_FILE=\\\"./opt/cellframe-node/var/log/cellframe-node_logs.txt\\\"
}
else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
- DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\"
- DEFINES += LOG_FILE=\\\"/opt/kelvin-node/var/log/kelvin-node_logs.txt\\\"
+ DEFINES += CLI_PATH=\\\"/opt/cellframe-node/bin/cellframe-node-cli\\\"
+ DEFINES += LOG_FILE=\\\"/opt/cellframe-node/var/log/cellframe-node_logs.txt\\\"
}
# The following define makes your compiler emit warnings if you use
@@ -49,7 +49,7 @@ SOURCES += \
$$PWD/DapChainNodeCache.cpp \
$$PWD/DapChainWalletHandler.cpp \
$$PWD/DapChainLogHandler.cpp \
- DapChainConsoleHandler.cpp
+ $$PWD/DapChainConsoleHandler.cpp
HEADERS += \
$$PWD/DapChainDashboardService.h \
@@ -59,23 +59,23 @@ HEADERS += \
$$PWD/DapChainNodeNetworkHandler.h \
$$PWD/DapChainWalletHandler.h \
$$PWD/DapChainLogHandler.h \
- DapChainConsoleHandler.h
+ $$PWD/DapChainConsoleHandler.h
include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri)
-include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri)
+include (../libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
-INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/
$$_PRO_FILE_PWD_/../DapRPCProtocol/
- $$_PRO_FILE_PWD_/../kelvin-node/
+ $$_PRO_FILE_PWD_/../cellframe-node/
unix: !mac : !android {
service_target.files = $${BRAND}Service
- service_target.path = /opt/kelvin-dashboard/bin/
+ service_target.path = /opt/cellframe-dashboard/bin/
INSTALLS += service_target
}
RESOURCES += \
- $$PWD/KelvinDashboardService.qrc
+ $$PWD/CellFrameDashboardService.qrc
diff --git a/KelvinDashboardService/KelvinDashboardService.qrc b/CellFrameDashboardService/CellFrameDashboardService.qrc
similarity index 100%
rename from KelvinDashboardService/KelvinDashboardService.qrc
rename to CellFrameDashboardService/CellFrameDashboardService.qrc
diff --git a/CellFrameDashboardService/DapChainConsoleHandler.cpp b/CellFrameDashboardService/DapChainConsoleHandler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c13b20ac7eda6d00de44bdeec7eb5c192845734c
--- /dev/null
+++ b/CellFrameDashboardService/DapChainConsoleHandler.cpp
@@ -0,0 +1,47 @@
+#include "DapChainConsoleHandler.h"
+
+#define MAX_COUNT_CMD 50
+
+DapChainConsoleHandler::DapChainConsoleHandler(QObject *parent) : QObject(parent)
+{
+ m_File = new QFile("cmd_log.txt", this);
+ m_File->open(QIODevice::Append | QIODevice::ReadWrite);
+}
+
+QString DapChainConsoleHandler::getHistory() const
+{
+ if(!m_File->isOpen()) return QString();
+
+ quint8 countCmd = 0;
+ while (m_File->pos() > 0)
+ {
+ QByteArray symbol = m_File->read(1);
+ if(symbol == ">") ++countCmd;
+ m_File->seek(m_File->pos() - 2);
+ if(countCmd == MAX_COUNT_CMD) break;
+ }
+
+ QByteArray lastCmd = m_File->read(m_File->size() - m_File->pos());
+
+ return QString::fromStdString(lastCmd.toStdString());
+}
+
+QString DapChainConsoleHandler::getResult(const QString& aQuery) const
+{
+ QProcess process;
+ process.start(QString(CLI_PATH) + " " + aQuery);
+ process.waitForFinished(-1);
+
+ QByteArray returnSymbol = "\n";
+
+#ifdef Q_OS_WIN
+ returnSymbol.prepend("\r");
+#endif
+
+ QByteArray result = process.readAll();
+ m_File->write("> " + aQuery.toUtf8() + returnSymbol);
+ m_File->write(result + returnSymbol);
+ m_File->flush();
+
+ return QString::fromStdString(result.toStdString());
+}
diff --git a/CellFrameDashboardService/DapChainConsoleHandler.h b/CellFrameDashboardService/DapChainConsoleHandler.h
new file mode 100644
index 0000000000000000000000000000000000000000..907c47e6b9a62b15c312a0abdef0900c76f32df3
--- /dev/null
+++ b/CellFrameDashboardService/DapChainConsoleHandler.h
@@ -0,0 +1,28 @@
+#ifndef DAPCHAINCONSOLEHANDLER_H
+#define DAPCHAINCONSOLEHANDLER_H
+
+#include <QObject>
+#include <QProcess>
+#include <QDebug>
+#include <QFile>
+
+class DapChainConsoleHandler : public QObject
+{
+ Q_OBJECT
+
+private:
+ QFile * m_File;
+
+public:
+ explicit DapChainConsoleHandler(QObject *parent = nullptr);
+
+ /// Get history of commands
+ /// @return history
+ QString getHistory() const;
+ /// Get result of command
+ /// @param command
+ /// @return command result
+ QString getResult(const QString& aQuery) const;
+};
+
+#endif // DAPCHAINCONSOLEHANDLER_H
diff --git a/KelvinDashboardService/DapChainDashboardService.cpp b/CellFrameDashboardService/DapChainDashboardService.cpp
similarity index 91%
rename from KelvinDashboardService/DapChainDashboardService.cpp
rename to CellFrameDashboardService/DapChainDashboardService.cpp
index c9b7b6494d54d7f1fd471f2b0299f288bec589c2..3dd7b331b5ad9a313864fa329b4989e2e99e85b2 100755
--- a/KelvinDashboardService/DapChainDashboardService.cpp
+++ b/CellFrameDashboardService/DapChainDashboardService.cpp
@@ -166,14 +166,14 @@ void DapChainDashboardService::closeClient()
/// System tray initialization.
//void DapChainDashboardService::initTray()
//{
-// QSystemTrayIcon *trayIconKelvinDashboard = new QSystemTrayIcon();
-// trayIconKelvinDashboard->setIcon(QIcon(":/Resources/Icons/icon.ico"));
-// trayIconKelvinDashboard->setToolTip("KelvinDashboard");
-// QMenu * menuKelvinDashboardService = new QMenu();
+// QSystemTrayIcon *trayIconCellFrameDashboard = new QSystemTrayIcon();
+// trayIconCellFrameDashboard->setIcon(QIcon(":/Resources/Icons/icon.ico"));
+// trayIconCellFrameDashboard->setToolTip("CellFrameDashboard");
+// QMenu * menuCellFrameDashboardService = new QMenu();
// QAction * quitAction = new QAction("Выход");
-// menuKelvinDashboardService->addAction(quitAction);
-// trayIconKelvinDashboard->setContextMenu(menuKelvinDashboardService);
-// trayIconKelvinDashboard->show();
+// menuCellFrameDashboardService->addAction(quitAction);
+// trayIconCellFrameDashboard->setContextMenu(menuCellFrameDashboardService);
+// trayIconCellFrameDashboard->show();
// // If the "Exit" menu item is selected, then we shut down the service,
// // and also send a command to shut down the client.
@@ -184,6 +184,6 @@ void DapChainDashboardService::closeClient()
// // With a double click on the icon in the system tray,
// // we send a command to the client to activate the main window
-// connect(trayIconKelvinDashboard, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+// connect(trayIconCellFrameDashboard, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
// this, SLOT(activateClient(QSystemTrayIcon::ActivationReason)));
//}
diff --git a/KelvinDashboardService/DapChainDashboardService.h b/CellFrameDashboardService/DapChainDashboardService.h
similarity index 98%
rename from KelvinDashboardService/DapChainDashboardService.h
rename to CellFrameDashboardService/DapChainDashboardService.h
index 52fd3438cf9c9693caaa3544796d2ab7fb66b146..1d4644d0c6ec3bf85b1ce823059dc57d63a3d95c 100755
--- a/KelvinDashboardService/DapChainDashboardService.h
+++ b/CellFrameDashboardService/DapChainDashboardService.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** This file is part of the KelvinDashboardService application.
+** This file is part of the CellFrameDashboardService application.
**
** The class implements the main application object CalvinDashboardService.
** It involves the implementation of the interaction of all the components
diff --git a/KelvinDashboardService/DapChainHistoryHandler.cpp b/CellFrameDashboardService/DapChainHistoryHandler.cpp
similarity index 100%
rename from KelvinDashboardService/DapChainHistoryHandler.cpp
rename to CellFrameDashboardService/DapChainHistoryHandler.cpp
diff --git a/KelvinDashboardService/DapChainHistoryHandler.h b/CellFrameDashboardService/DapChainHistoryHandler.h
similarity index 100%
rename from KelvinDashboardService/DapChainHistoryHandler.h
rename to CellFrameDashboardService/DapChainHistoryHandler.h
diff --git a/KelvinDashboardService/DapChainLogHandler.cpp b/CellFrameDashboardService/DapChainLogHandler.cpp
similarity index 100%
rename from KelvinDashboardService/DapChainLogHandler.cpp
rename to CellFrameDashboardService/DapChainLogHandler.cpp
diff --git a/KelvinDashboardService/DapChainLogHandler.h b/CellFrameDashboardService/DapChainLogHandler.h
similarity index 100%
rename from KelvinDashboardService/DapChainLogHandler.h
rename to CellFrameDashboardService/DapChainLogHandler.h
diff --git a/KelvinDashboardService/DapChainNode.cpp b/CellFrameDashboardService/DapChainNode.cpp
similarity index 100%
rename from KelvinDashboardService/DapChainNode.cpp
rename to CellFrameDashboardService/DapChainNode.cpp
diff --git a/KelvinDashboardService/DapChainNode.h b/CellFrameDashboardService/DapChainNode.h
similarity index 100%
rename from KelvinDashboardService/DapChainNode.h
rename to CellFrameDashboardService/DapChainNode.h
diff --git a/KelvinDashboardService/DapChainNodeCache.cpp b/CellFrameDashboardService/DapChainNodeCache.cpp
similarity index 100%
rename from KelvinDashboardService/DapChainNodeCache.cpp
rename to CellFrameDashboardService/DapChainNodeCache.cpp
diff --git a/KelvinDashboardService/DapChainNodeCache.h b/CellFrameDashboardService/DapChainNodeCache.h
similarity index 100%
rename from KelvinDashboardService/DapChainNodeCache.h
rename to CellFrameDashboardService/DapChainNodeCache.h
diff --git a/KelvinDashboardService/DapChainNodeNetworkHandler.cpp b/CellFrameDashboardService/DapChainNodeNetworkHandler.cpp
similarity index 100%
rename from KelvinDashboardService/DapChainNodeNetworkHandler.cpp
rename to CellFrameDashboardService/DapChainNodeNetworkHandler.cpp
diff --git a/KelvinDashboardService/DapChainNodeNetworkHandler.h b/CellFrameDashboardService/DapChainNodeNetworkHandler.h
similarity index 100%
rename from KelvinDashboardService/DapChainNodeNetworkHandler.h
rename to CellFrameDashboardService/DapChainNodeNetworkHandler.h
diff --git a/KelvinDashboardService/DapChainWalletHandler.cpp b/CellFrameDashboardService/DapChainWalletHandler.cpp
similarity index 90%
rename from KelvinDashboardService/DapChainWalletHandler.cpp
rename to CellFrameDashboardService/DapChainWalletHandler.cpp
index e6f1a298790427d8f56c919b14959491f58e4d2c..32361ca17e9c51eef8cdc4d96e7527ca0b04ee9e 100755
--- a/KelvinDashboardService/DapChainWalletHandler.cpp
+++ b/CellFrameDashboardService/DapChainWalletHandler.cpp
@@ -30,8 +30,8 @@ void DapChainWalletHandler::removeWallet(const QString &asNameWallet)
{
QByteArray result;
QProcess process;
- process.start(QString("rm %1%2.dwallet").arg("/opt/kelvin-node/var/lib/wallet/").arg(asNameWallet));
- qDebug() << (QString("rm %1%2.dwallet").arg("/opt/kelvin-node/var/lib/wallet/").arg(asNameWallet));
+ process.start(QString("rm %1%2.dwallet").arg("/opt/cellframe-node/var/lib/wallet/").arg(asNameWallet));
+ qDebug() << (QString("rm %1%2.dwallet").arg("/opt/cellframe-node/var/lib/wallet/").arg(asNameWallet));
process.waitForFinished(-1);
result = process.readAll();
}
@@ -94,7 +94,7 @@ QString DapChainWalletHandler::sendToken(const QString &asSendWallet, const QStr
QString answer;
qInfo() << QString("sendTokenTest(%1, %2, %3, %4)").arg(asSendWallet).arg(asAddressReceiver).arg(asToken).arg(aAmount);
QProcess processCreate;
- processCreate.start(QString("%1 tx_create -net kelvin-testnet -chain gdb -from_wallet %2 -to_addr %3 -token %4 -value %5")
+ processCreate.start(QString("%1 tx_create -net cellframe-testnet -chain gdb -from_wallet %2 -to_addr %3 -token %4 -value %5")
.arg(CLI_PATH)
.arg(asSendWallet)
.arg(asAddressReceiver)
diff --git a/KelvinDashboardService/DapChainWalletHandler.h b/CellFrameDashboardService/DapChainWalletHandler.h
similarity index 100%
rename from KelvinDashboardService/DapChainWalletHandler.h
rename to CellFrameDashboardService/DapChainWalletHandler.h
diff --git a/KelvinDashboardService/Resources/Icons/add.png b/CellFrameDashboardService/Resources/Icons/add.png
similarity index 100%
rename from KelvinDashboardService/Resources/Icons/add.png
rename to CellFrameDashboardService/Resources/Icons/add.png
diff --git a/KelvinDashboardService/Resources/Icons/icon.ico b/CellFrameDashboardService/Resources/Icons/icon.ico
similarity index 100%
rename from KelvinDashboardService/Resources/Icons/icon.ico
rename to CellFrameDashboardService/Resources/Icons/icon.ico
diff --git a/KelvinDashboardService/Resources/Icons/icon.png b/CellFrameDashboardService/Resources/Icons/icon.png
similarity index 100%
rename from KelvinDashboardService/Resources/Icons/icon.png
rename to CellFrameDashboardService/Resources/Icons/icon.png
diff --git a/KelvinDashboardService/Resources/Icons/iconErrorNetwork.png b/CellFrameDashboardService/Resources/Icons/iconErrorNetwork.png
similarity index 100%
rename from KelvinDashboardService/Resources/Icons/iconErrorNetwork.png
rename to CellFrameDashboardService/Resources/Icons/iconErrorNetwork.png
diff --git a/KelvinDashboardService/Resources/Icons/iconNetwork.png b/CellFrameDashboardService/Resources/Icons/iconNetwork.png
similarity index 100%
rename from KelvinDashboardService/Resources/Icons/iconNetwork.png
rename to CellFrameDashboardService/Resources/Icons/iconNetwork.png
diff --git a/KelvinDashboardService/main.cpp b/CellFrameDashboardService/main.cpp
similarity index 82%
rename from KelvinDashboardService/main.cpp
rename to CellFrameDashboardService/main.cpp
index d2c81a1dbb42c8af7d6716eb6297079ea8f20cc8..29d312276dbd18f48615e3b70e49b0065bc0103e 100755
--- a/KelvinDashboardService/main.cpp
+++ b/CellFrameDashboardService/main.cpp
@@ -15,11 +15,11 @@ void processArgs();
int main(int argc, char *argv[])
{
// Creating a semaphore for locking external resources, as well as initializing an external resource-memory
- QSystemSemaphore systemSemaphore(QString("systemSemaphore for %1").arg("KelvinDashboardService"), 1);
+ QSystemSemaphore systemSemaphore(QString("systemSemaphore for %1").arg("CellFrameDashboardService"), 1);
- QSharedMemory memmoryAppBagFix(QString("memmory for %1").arg("KelvinDashboardService"));
+ QSharedMemory memmoryAppBagFix(QString("memmory for %1").arg("CellFrameDashboardService"));
- QSharedMemory memmoryApp(QString("memmory for %1").arg("KelvinDashboardService"));
+ QSharedMemory memmoryApp(QString("memmory for %1").arg("CellFrameDashboardService"));
// Check for the existence of a running instance of the program
bool isRunning = DapHalper::getInstance().checkExistenceRunningInstanceApp(systemSemaphore, memmoryApp, memmoryAppBagFix);
@@ -30,14 +30,14 @@ int main(int argc, char *argv[])
QCoreApplication a(argc, argv);
a.setOrganizationName("DEMLABS");
- a.setOrganizationDomain("demlabs.com");
- a.setApplicationName("KelvinDashboardService");
+ a.setOrganizationDomain("demlabs.net");
+ a.setApplicationName("CellFrameDashboardService");
DapLogger dapLogger;
/// TODO: The code is commented out at the time of developing the logging strategy in the project
//#ifndef QT_DEBUG
#ifdef Q_OS_LINUX
- dapLogger.setLogFile(QString("/opt/kelvin-dashboard/log/%1Service.log").arg(DAP_BRAND));
+ dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Service.log").arg(DAP_BRAND));
#endif
//#endif
// Creating the main application object
diff --git a/KelvinDashboard.pro b/KelvinDashboard.pro
deleted file mode 100755
index 72b0d9fe4fd2d05e9063565d02e904905c0acb7f..0000000000000000000000000000000000000000
--- a/KelvinDashboard.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = KelvinDashboardGUI KelvinDashboardService
-
-KelvinDashboardGUI.subdir = KelvinDashboardGUI
-KelvinDashboardService.subdir = KelvinDashboardService
-KelvinDashboardGUI.depends = KelvinDashboardService
-
-!defined(BRAND, var)
-{
- BRAND = KelvinDashboard
-}
-
-unix: !mac : !android {
- share_target.files = debian/share/*
- share_target.path = /opt/kelvin-dashboard/share/
- INSTALLS += share_target
-}
diff --git a/README.md b/README.md
index 9db1ef164cb9d7c5c4fb61e757196e2b2d451627..358f233959602f649b0bf8b018560a86da168dfb 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# kelvin-dashboard
-Kelvin Dashboard
+# cellframe-dashboard
+CellFrame Dashboard
diff --git a/debian/changelog b/debian/changelog
index 2a407c4f74c5fc6b9b6792587f540102ad4e1a7e..2e99e49140cad9913d08d80e628da212cf3cc92c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kelvin-dashboard (1.2-0) development; urgency=medium
+cellframe-dashboard (1.2-0) development; urgency=medium
* Refactored the package
diff --git a/debian/control b/debian/control
index 4e8e4c6fdebf8e6e2358ed9ea20d8e1ca332baa8..15a7f034ad9029b4fa4c0a46e0d5a9280b7e83f4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: kelvin-dashboard
+Source: cellframe-dashboard
Section: unknown
Priority: optional
Maintainer: Demlabs Support <support@demlabs.net>
@@ -6,12 +6,11 @@ Build-Depends: debhelper (>= 9)
Standards-Version: 5.8-4
Homepage: https://demlabs.net
-Package: kelvin-dashboard
+Package: cellframe-dashboard
Architecture: any
Depends: psmisc, menu, ${shlibs:Depends}, ${misc:Depends}
-Replaces: KelvinDashboard
-Description: Kelvin Dashboard
- Kelvin Dashboard
+Description: CellFrame Dashboard
+ CelLFrame Dashboard
diff --git a/debian/postinst b/debian/postinst
index d4bc996f3bed5d349ba59408a0c61c65b1e013ca..aa961ad3c2685d9b78b6a9c3252038288b7e6d60 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,14 +3,14 @@
case "$1" in
configure)
- ln -sf /opt/kelvin-dashboard/share/init.d/kelvin-dashboard.service /etc/systemd/user/KelvinDashboardService.service
- systemctl --system enable /opt/kelvin-dashboard/share/init.d/KelvinDashboardService.service
- ln -sf /opt/kelvin-dashboard/bin/KelvinDashboard /usr/local/bin/KelvinDashboard
- chmod +X /usr/local/bin/KelvinDashboard
- cp -f /opt/kelvin-dashboard/share/kelvindashboard.desktop /usr/share/applications/kelvindashboard.desktop
- cp -f /opt/kelvin-dashboard/share/kelvindashboard.ico /usr/share/pixmaps/kelvindashboard.ico
+ ln -sf /opt/cellframe-dashboard/share/init.d/cellframe-dashboard.service /etc/systemd/user/cellframe-dashboard.service
+ systemctl --system enable /opt/cellframe-dashboard/share/init.d/cellframe-dashboard.service
+ ln -sf /opt/cellframe-dashboard/bin/CellFrameDashboard /usr/local/bin/CellFrameDashboard
+ chmod +X /usr/local/bin/CellFrameDashboard
+ cp -f /opt/cellframe-dashboard/share/CellFrameDashboard.desktop /usr/share/applications/CellFrameDashboard.desktop
+ cp -f /opt/cellframe-dashboard/share/CellFrameDashboard.ico /usr/share/pixmaps/CellFrameFashboard.ico
update-menus
- echo "For start Kelvin Dashboard Service - run 'systemctl start KelvinDashboardService'"
+ echo "For start CellFrame Dashboard Service - run 'systemctl start cellframe-dashboard'"
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
diff --git a/debian/prerm b/debian/prerm
index b1a48574e8e5f71cc9c32322ca02ba243d936995..42891dac2c13ccdccb208c83820c6d326c85d191 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -2,13 +2,13 @@
case "$1" in
purge|remove|abort-upgrade|failed-upgrade|upgrade)
- [ -f /etc/init.d/kelvin-dashboard ] && service kelvin-dashboard stop
- [ -d /opt/kelvin-dashboard ] && rm -rf /opt/kelvin-dashboard/
- [ -f /usr/local/bin/KelvinDashboard ] && rm /usr/local/bin/KelvinDashboard
- [ -f /etc/init.d/kelvin-dashboard ] && rm /etc/init.d/kelvin-dashboard
+ [ -f /etc/init.d/cellframe-dashboard ] && service cellframe-dashboard stop
+ [ -d /opt/cellframe-dashboard ] && rm -rf /opt/cellframe-dashboard/
+ [ -f /usr/local/bin/CellFrameDashboard ] && rm /usr/local/bin/CellFrameDashboard
+ [ -f /etc/init.d/cellframe-dashboard ] && rm /etc/init.d/cellframe-dashboard
systemctl daemon-reload
- [ -f /usr/share/applications/kelvindashboard.desktop ] && rm /usr/share/applications/kelvindashboard.desktop
- [ -f /usr/share/pixmaps/kelvindashboard.ico ] && rm /usr/share/pixmaps/kelvindashboard.ico
+ [ -f /usr/share/applications/CellFrameDashboard.desktop ] && rm /usr/share/applications/CellFrameDashboard.desktop
+ [ -f /usr/share/pixmaps/CellFrameDdashboard.ico ] && rm /usr/share/pixmaps/CellFrameDashboard.ico
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
diff --git a/debian/share/CellFrameDashboard.desktop b/debian/share/CellFrameDashboard.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..ba2a6153aa2ed7737079b867750e1cc429f16af2
--- /dev/null
+++ b/debian/share/CellFrameDashboard.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=CellFrame Dashboard
+Exec=/opt/cellframe-dashboard/bin/CellFrameDashboard
+Icon=/opt/cellframe-dashboard/share/CellFrameDashboard.ico
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Network;Application;
+Name[en_US]=CellFrame Dashboard
diff --git a/debian/share/CellFrameDashboard.ico b/debian/share/CellFrameDashboard.ico
new file mode 100644
index 0000000000000000000000000000000000000000..22beaf23e9b4e1c6d9cfbb4ffc69f835223bb052
Binary files /dev/null and b/debian/share/CellFrameDashboard.ico differ
diff --git a/debian/share/init.d/cellframe-dashboard.service b/debian/share/init.d/cellframe-dashboard.service
new file mode 100644
index 0000000000000000000000000000000000000000..5216e33045dc687e1569a22dd2dacce0a4e6524b
--- /dev/null
+++ b/debian/share/init.d/cellframe-dashboard.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=CellFrame Dashboard Service
+After=network.target
+
+[Service]
+Type=forking
+OOMScoreAdjust=-1000
+PIDFile=/opt/cellframe-dashboard/CellFrameDashboardService.pid
+WorkingDirectory=/opt/cellframe-dashboard/
+ExecStart=/opt/cellframe-dashboard/bin/CellFrameDashboardService -D
+ExecStop=/opt/cellframe-dashboard/bin/CellFrameDashboardService --stop
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/share/init.d/kelvin-dashboard.service b/debian/share/init.d/kelvin-dashboard.service
deleted file mode 100644
index 617569a13b397f3e00267e055ef41ef48f3317c8..0000000000000000000000000000000000000000
--- a/debian/share/init.d/kelvin-dashboard.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Kelvin Dashboard Service
-After=network.target
-
-[Service]
-Type=forking
-OOMScoreAdjust=-1000
-PIDFile=/opt/kelvin-dashboard/kelvindashboardservice.pid
-WorkingDirectory=/opt/kelvin-dashboard/
-ExecStart=/opt/kelvin-dashboard/bin/KelvinDashboardService -D
-ExecStop=/opt/kelvin-dashboard/bin/KelvinDashboardService --stop
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/share/kelvindashboard.desktop b/debian/share/kelvindashboard.desktop
deleted file mode 100644
index 8a7d27814dce1873b598bf3f4d6c4b4f2103d75b..0000000000000000000000000000000000000000
--- a/debian/share/kelvindashboard.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Kelvin Dashboard
-Exec=/opt/kelvin-dashboard/bin/KelvinDashboard
-Icon=/opt/kelvin-dashboard/share/kelvindashboard.ico
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Network;Application;
-Name[en_US]=Kelvin Dashboard
diff --git a/debian/share/kelvindashboard.ico b/debian/share/kelvindashboard.ico
deleted file mode 100644
index 41230db92cb8101b8f24cf6f861082c6dfb827e1..0000000000000000000000000000000000000000
Binary files a/debian/share/kelvindashboard.ico and /dev/null differ
diff --git a/debian/stamp-makefile-build b/debian/stamp-makefile-build
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/debian/stamp-makefile-install b/debian/stamp-makefile-install
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/libKelvinDashboardCommon/DapChainWallet.cpp b/libCellFrameDashboardCommon/DapChainWallet.cpp
similarity index 100%
rename from libKelvinDashboardCommon/DapChainWallet.cpp
rename to libCellFrameDashboardCommon/DapChainWallet.cpp
diff --git a/libKelvinDashboardCommon/DapChainWallet.h b/libCellFrameDashboardCommon/DapChainWallet.h
similarity index 100%
rename from libKelvinDashboardCommon/DapChainWallet.h
rename to libCellFrameDashboardCommon/DapChainWallet.h
diff --git a/libKelvinDashboardCommon/DapHalper.cpp b/libCellFrameDashboardCommon/DapHalper.cpp
similarity index 100%
rename from libKelvinDashboardCommon/DapHalper.cpp
rename to libCellFrameDashboardCommon/DapHalper.cpp
diff --git a/libKelvinDashboardCommon/DapHalper.h b/libCellFrameDashboardCommon/DapHalper.h
similarity index 94%
rename from libKelvinDashboardCommon/DapHalper.h
rename to libCellFrameDashboardCommon/DapHalper.h
index 0932b27780eb2aa9a443d88ac5e74fa397c523da..1c96e87cc445f94b45401d0ff70596c3b6c4940b 100644
--- a/libKelvinDashboardCommon/DapHalper.h
+++ b/libCellFrameDashboardCommon/DapHalper.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** This file is part of the libKelvinDashboardClient library.
+** This file is part of the libCellFrameDashboardClient library.
**
** The class provides common functionality.
**
diff --git a/libKelvinDashboardCommon/DapHistoryType.cpp b/libCellFrameDashboardCommon/DapHistoryType.cpp
similarity index 100%
rename from libKelvinDashboardCommon/DapHistoryType.cpp
rename to libCellFrameDashboardCommon/DapHistoryType.cpp
diff --git a/libKelvinDashboardCommon/DapHistoryType.h b/libCellFrameDashboardCommon/DapHistoryType.h
similarity index 100%
rename from libKelvinDashboardCommon/DapHistoryType.h
rename to libCellFrameDashboardCommon/DapHistoryType.h
diff --git a/libKelvinDashboardCommon/DapLogMessage.cpp b/libCellFrameDashboardCommon/DapLogMessage.cpp
similarity index 94%
rename from libKelvinDashboardCommon/DapLogMessage.cpp
rename to libCellFrameDashboardCommon/DapLogMessage.cpp
index 00fd71df3c430ae0cf7bc107614340afe6a830fb..28fc7dfa46993e73d867beba1de9a1a58dfb748b 100644
--- a/libKelvinDashboardCommon/DapLogMessage.cpp
+++ b/libCellFrameDashboardCommon/DapLogMessage.cpp
@@ -1,57 +1,57 @@
-#include "DapLogMessage.h"
-
-DapLogMessage::DapLogMessage(const QString &type, const QString ×tamp, const QString &file, const QString &message, QObject *parent) : QObject(parent)
-{
- m_type = type;
- m_sTimeStamp = timestamp;
- m_sFile = file;
- m_sMessage = message;
-}
-
-QString DapLogMessage::getType() const
-{
- return m_type;
-}
-
-void DapLogMessage::setType(const QString &type)
-{
- m_type = type;
-
- emit typeChanged(m_type);
-}
-
-QString DapLogMessage::getTimeStamp() const
-{
- return m_sTimeStamp;
-}
-
-void DapLogMessage::setTimeStamp(const QString &sTimeStamp)
-{
- m_sTimeStamp = sTimeStamp;
-
- emit timeStampChanged(m_sTimeStamp);
-}
-
-QString DapLogMessage::getFile() const
-{
- return m_sFile;
-}
-
-void DapLogMessage::setFile(const QString &sFile)
-{
- m_sFile = sFile;
-
- emit fileChanged(m_sFile);
-}
-
-QString DapLogMessage::getMessage() const
-{
- return m_sMessage;
-}
-
-void DapLogMessage::setMessage(const QString &sMessage)
-{
- m_sMessage = sMessage;
-
- emit messageChanged(m_sMessage);
-}
+#include "DapLogMessage.h"
+
+DapLogMessage::DapLogMessage(const QString &type, const QString ×tamp, const QString &file, const QString &message, QObject *parent) : QObject(parent)
+{
+ m_type = type;
+ m_sTimeStamp = timestamp;
+ m_sFile = file;
+ m_sMessage = message;
+}
+
+QString DapLogMessage::getType() const
+{
+ return m_type;
+}
+
+void DapLogMessage::setType(const QString &type)
+{
+ m_type = type;
+
+ emit typeChanged(m_type);
+}
+
+QString DapLogMessage::getTimeStamp() const
+{
+ return m_sTimeStamp;
+}
+
+void DapLogMessage::setTimeStamp(const QString &sTimeStamp)
+{
+ m_sTimeStamp = sTimeStamp;
+
+ emit timeStampChanged(m_sTimeStamp);
+}
+
+QString DapLogMessage::getFile() const
+{
+ return m_sFile;
+}
+
+void DapLogMessage::setFile(const QString &sFile)
+{
+ m_sFile = sFile;
+
+ emit fileChanged(m_sFile);
+}
+
+QString DapLogMessage::getMessage() const
+{
+ return m_sMessage;
+}
+
+void DapLogMessage::setMessage(const QString &sMessage)
+{
+ m_sMessage = sMessage;
+
+ emit messageChanged(m_sMessage);
+}
diff --git a/libKelvinDashboardCommon/DapLogMessage.h b/libCellFrameDashboardCommon/DapLogMessage.h
similarity index 96%
rename from libKelvinDashboardCommon/DapLogMessage.h
rename to libCellFrameDashboardCommon/DapLogMessage.h
index 4867f50fc8b578e883c087e2426b6ae2a070481b..d277cb5c3093e3003a2ff17038458f47f3046bf0 100644
--- a/libKelvinDashboardCommon/DapLogMessage.h
+++ b/libCellFrameDashboardCommon/DapLogMessage.h
@@ -1,53 +1,53 @@
-#ifndef DAPLOGMESSAGE_H
-#define DAPLOGMESSAGE_H
-
-#include <QObject>
-
-enum Type
-{
- Info,
- Warning,
- Debug,
- Error
-};
-
-class DapLogMessage : public QObject
-{
- Q_OBJECT
-
- QString m_type;
- QString m_sTimeStamp;
- QString m_sFile;
- QString m_sMessage;
-
-public:
- explicit DapLogMessage(QObject *parent = nullptr) { Q_UNUSED(parent) }
- DapLogMessage(const QString &type, const QString ×tamp, const QString &file, const QString &message, QObject *parent = nullptr);
-
-
- Q_PROPERTY(QString type READ getType WRITE setType NOTIFY typeChanged)
- Q_PROPERTY(QString timestamp READ getTimeStamp WRITE setTimeStamp NOTIFY timeStampChanged)
- Q_PROPERTY(QString file READ getFile WRITE setFile NOTIFY fileChanged)
- Q_PROPERTY(QString message READ getMessage WRITE setMessage NOTIFY messageChanged)
-
- QString getType() const;
- void setType(const QString &type);
-
- QString getTimeStamp() const;
- void setTimeStamp(const QString &sTimeStamp);
-
- QString getFile() const;
- void setFile(const QString &sFile);
-
- QString getMessage() const;
- void setMessage(const QString &sMessage);
-
-signals:
- void typeChanged(QString aType);
- void timeStampChanged(const QString& aTimeStamp);
- void fileChanged(const QString& aFile);
- void messageChanged(const QString& aMessage);
-
-};
-
-#endif // DAPLOGMESSAGE_H
+#ifndef DAPLOGMESSAGE_H
+#define DAPLOGMESSAGE_H
+
+#include <QObject>
+
+enum Type
+{
+ Info,
+ Warning,
+ Debug,
+ Error
+};
+
+class DapLogMessage : public QObject
+{
+ Q_OBJECT
+
+ QString m_type;
+ QString m_sTimeStamp;
+ QString m_sFile;
+ QString m_sMessage;
+
+public:
+ explicit DapLogMessage(QObject *parent = nullptr) { Q_UNUSED(parent) }
+ DapLogMessage(const QString &type, const QString ×tamp, const QString &file, const QString &message, QObject *parent = nullptr);
+
+
+ Q_PROPERTY(QString type READ getType WRITE setType NOTIFY typeChanged)
+ Q_PROPERTY(QString timestamp READ getTimeStamp WRITE setTimeStamp NOTIFY timeStampChanged)
+ Q_PROPERTY(QString file READ getFile WRITE setFile NOTIFY fileChanged)
+ Q_PROPERTY(QString message READ getMessage WRITE setMessage NOTIFY messageChanged)
+
+ QString getType() const;
+ void setType(const QString &type);
+
+ QString getTimeStamp() const;
+ void setTimeStamp(const QString &sTimeStamp);
+
+ QString getFile() const;
+ void setFile(const QString &sFile);
+
+ QString getMessage() const;
+ void setMessage(const QString &sMessage);
+
+signals:
+ void typeChanged(QString aType);
+ void timeStampChanged(const QString& aTimeStamp);
+ void fileChanged(const QString& aFile);
+ void messageChanged(const QString& aMessage);
+
+};
+
+#endif // DAPLOGMESSAGE_H
diff --git a/libKelvinDashboardCommon/DapLogModel.cpp b/libCellFrameDashboardCommon/DapLogModel.cpp
similarity index 96%
rename from libKelvinDashboardCommon/DapLogModel.cpp
rename to libCellFrameDashboardCommon/DapLogModel.cpp
index be73100b336ba478eb051d809cc778398cd5fb2e..cadb983aa6bd05bba34845d420bde1e9a00c08b2 100644
--- a/libKelvinDashboardCommon/DapLogModel.cpp
+++ b/libCellFrameDashboardCommon/DapLogModel.cpp
@@ -1,115 +1,115 @@
-#include "DapLogModel.h"
-
-DapLogModel::DapLogModel(QObject *parent) : QAbstractListModel(parent)
-{
-
-}
-
-DapLogModel &DapLogModel::getInstance()
-{
- static DapLogModel instance;
- return instance;
-}
-
-int DapLogModel::rowCount(const QModelIndex &) const
-{
- return m_dapLogMessage.count();
-}
-
-QVariant DapLogModel::data(const QModelIndex &index, int role) const
-{
- if (index.row() < rowCount())
- switch (role) {
- case TypeRole:
- {
- QString s = m_dapLogMessage.at(index.row())->getType();
- return m_dapLogMessage.at(index.row())->getType();
- }
- case TimeStampRole: return m_dapLogMessage.at(index.row())->getTimeStamp();
- case FileRole: return m_dapLogMessage.at(index.row())->getFile();
- case MessageRole:
- {
- QString s1 = m_dapLogMessage.at(index.row())->getMessage();
-
- return m_dapLogMessage.at(index.row())->getMessage();
- }
- default:
- break;
- }
- return QVariant();
-}
-
-QHash<int, QByteArray> DapLogModel::roleNames() const
-{
- static const QHash<int, QByteArray> roles {
- { TypeRole, "type" },
- { TimeStampRole, "timestamp" },
- { FileRole, "file" },
- { MessageRole, "message" }
- };
-
- return roles;
-}
-
-QVariantMap DapLogModel::get(int row) const
-{
- const DapLogMessage *widget = m_dapLogMessage.value(row);
- return { {"type", widget->getType()}, {"timestamp", widget->getTimeStamp()}, {"file", widget->getFile()}, {"message", widget->getMessage()} };
-}
-
-void DapLogModel::append(const DapLogMessage &message)
-{
- this->append(message.getType(), message.getTimeStamp(), message.getFile(), message.getMessage());
-}
-
-void DapLogModel::append(const QString &type, const QString ×tamp, const QString &file, const QString &message)
-{
- beginInsertRows(QModelIndex(), m_dapLogMessage.count(), m_dapLogMessage.count());
- m_dapLogMessage.insert(m_dapLogMessage.count(), new DapLogMessage(type, timestamp, file, message));
- endInsertRows();
-}
-
-void DapLogModel::set(int row, const QString &type, const QString ×tamp, const QString &file, const QString &message)
-{
- if (row < 0 || row >= m_dapLogMessage.count())
- return;
-
- DapLogMessage *widget = m_dapLogMessage.value(row);
- widget->setType(type);
- widget->setTimeStamp(timestamp);
- widget->setFile(file);
- widget->setMessage(message);
- dataChanged(index(row, 0), index(row, 0), { TypeRole, TimeStampRole, FileRole, MessageRole });
-}
-
-void DapLogModel::remove(int row)
-{
- if (row < 0 || row >= m_dapLogMessage.count())
- return;
-
- beginRemoveRows(QModelIndex(), row, row);
- m_dapLogMessage.removeAt(row);
- endRemoveRows();
-}
-
-void DapLogModel::clear()
-{
- for(auto it = m_dapLogMessage.begin(); it != m_dapLogMessage.end(); ++it)
- {
- delete *it;
- }
-
- m_dapLogMessage.clear();
-}
-
-
-/// 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 *DapLogModel::singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
- Q_UNUSED(engine)
- Q_UNUSED(scriptEngine)
-
- return &getInstance();
-}
+#include "DapLogModel.h"
+
+DapLogModel::DapLogModel(QObject *parent) : QAbstractListModel(parent)
+{
+
+}
+
+DapLogModel &DapLogModel::getInstance()
+{
+ static DapLogModel instance;
+ return instance;
+}
+
+int DapLogModel::rowCount(const QModelIndex &) const
+{
+ return m_dapLogMessage.count();
+}
+
+QVariant DapLogModel::data(const QModelIndex &index, int role) const
+{
+ if (index.row() < rowCount())
+ switch (role) {
+ case TypeRole:
+ {
+ QString s = m_dapLogMessage.at(index.row())->getType();
+ return m_dapLogMessage.at(index.row())->getType();
+ }
+ case TimeStampRole: return m_dapLogMessage.at(index.row())->getTimeStamp();
+ case FileRole: return m_dapLogMessage.at(index.row())->getFile();
+ case MessageRole:
+ {
+ QString s1 = m_dapLogMessage.at(index.row())->getMessage();
+
+ return m_dapLogMessage.at(index.row())->getMessage();
+ }
+ default:
+ break;
+ }
+ return QVariant();
+}
+
+QHash<int, QByteArray> DapLogModel::roleNames() const
+{
+ static const QHash<int, QByteArray> roles {
+ { TypeRole, "type" },
+ { TimeStampRole, "timestamp" },
+ { FileRole, "file" },
+ { MessageRole, "message" }
+ };
+
+ return roles;
+}
+
+QVariantMap DapLogModel::get(int row) const
+{
+ const DapLogMessage *widget = m_dapLogMessage.value(row);
+ return { {"type", widget->getType()}, {"timestamp", widget->getTimeStamp()}, {"file", widget->getFile()}, {"message", widget->getMessage()} };
+}
+
+void DapLogModel::append(const DapLogMessage &message)
+{
+ this->append(message.getType(), message.getTimeStamp(), message.getFile(), message.getMessage());
+}
+
+void DapLogModel::append(const QString &type, const QString ×tamp, const QString &file, const QString &message)
+{
+ beginInsertRows(QModelIndex(), m_dapLogMessage.count(), m_dapLogMessage.count());
+ m_dapLogMessage.insert(m_dapLogMessage.count(), new DapLogMessage(type, timestamp, file, message));
+ endInsertRows();
+}
+
+void DapLogModel::set(int row, const QString &type, const QString ×tamp, const QString &file, const QString &message)
+{
+ if (row < 0 || row >= m_dapLogMessage.count())
+ return;
+
+ DapLogMessage *widget = m_dapLogMessage.value(row);
+ widget->setType(type);
+ widget->setTimeStamp(timestamp);
+ widget->setFile(file);
+ widget->setMessage(message);
+ dataChanged(index(row, 0), index(row, 0), { TypeRole, TimeStampRole, FileRole, MessageRole });
+}
+
+void DapLogModel::remove(int row)
+{
+ if (row < 0 || row >= m_dapLogMessage.count())
+ return;
+
+ beginRemoveRows(QModelIndex(), row, row);
+ m_dapLogMessage.removeAt(row);
+ endRemoveRows();
+}
+
+void DapLogModel::clear()
+{
+ for(auto it = m_dapLogMessage.begin(); it != m_dapLogMessage.end(); ++it)
+ {
+ delete *it;
+ }
+
+ m_dapLogMessage.clear();
+}
+
+
+/// 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 *DapLogModel::singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+ Q_UNUSED(engine)
+ Q_UNUSED(scriptEngine)
+
+ return &getInstance();
+}
diff --git a/libKelvinDashboardCommon/DapLogModel.h b/libCellFrameDashboardCommon/DapLogModel.h
similarity index 96%
rename from libKelvinDashboardCommon/DapLogModel.h
rename to libCellFrameDashboardCommon/DapLogModel.h
index 114ee1091307c038ecc906491a5939e25ea340ec..becb2845f762549105a2abefc28be1990430d2df 100644
--- a/libKelvinDashboardCommon/DapLogModel.h
+++ b/libCellFrameDashboardCommon/DapLogModel.h
@@ -1,57 +1,57 @@
-#ifndef DAPLOGMODEL_H
-#define DAPLOGMODEL_H
-
-#include <QObject>
-#include <QAbstractListModel>
-#include <QList>
-#include <QQmlEngine>
-#include <QJSEngine>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QXmlStreamAttribute>
-
-#include "DapLogMessage.h"
-
-enum DapLogRole {
- TypeRole = Qt::DisplayRole,
- TimeStampRole = Qt::UserRole,
- FileRole,
- MessageRole
- };
-
-/// Class model for log screen
-class DapLogModel : public QAbstractListModel
-{
- Q_OBJECT
-
- QList<DapLogMessage*> m_dapLogMessage;
-
- DapLogModel(QObject *parent = nullptr);
-public:
-
- /// Get an instance of a class.
- /// @return Instance of a class.
- Q_INVOKABLE static DapLogModel &getInstance();
-
-
- Q_ENUM(DapLogRole)
-
- 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 DapLogMessage &message);
- Q_INVOKABLE void append(const QString &type, const QString ×tamp, const QString &file, const QString &message);
- Q_INVOKABLE void set(int row, const QString &type, const QString ×tamp, const QString &file, const QString &message);
- Q_INVOKABLE void remove(int row);
- Q_INVOKABLE void clear();
-
-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 // DAPLOGMODEL_H
+#ifndef DAPLOGMODEL_H
+#define DAPLOGMODEL_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QList>
+#include <QQmlEngine>
+#include <QJSEngine>
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QXmlStreamAttribute>
+
+#include "DapLogMessage.h"
+
+enum DapLogRole {
+ TypeRole = Qt::DisplayRole,
+ TimeStampRole = Qt::UserRole,
+ FileRole,
+ MessageRole
+ };
+
+/// Class model for log screen
+class DapLogModel : public QAbstractListModel
+{
+ Q_OBJECT
+
+ QList<DapLogMessage*> m_dapLogMessage;
+
+ DapLogModel(QObject *parent = nullptr);
+public:
+
+ /// Get an instance of a class.
+ /// @return Instance of a class.
+ Q_INVOKABLE static DapLogModel &getInstance();
+
+
+ Q_ENUM(DapLogRole)
+
+ 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 DapLogMessage &message);
+ Q_INVOKABLE void append(const QString &type, const QString ×tamp, const QString &file, const QString &message);
+ Q_INVOKABLE void set(int row, const QString &type, const QString ×tamp, const QString &file, const QString &message);
+ Q_INVOKABLE void remove(int row);
+ Q_INVOKABLE void clear();
+
+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 // DAPLOGMODEL_H
diff --git a/libKelvinDashboardCommon/DapNodeType.h b/libCellFrameDashboardCommon/DapNodeType.h
similarity index 100%
rename from libKelvinDashboardCommon/DapNodeType.h
rename to libCellFrameDashboardCommon/DapNodeType.h
diff --git a/libKelvinDashboardCommon/DapSettings.cpp b/libCellFrameDashboardCommon/DapSettings.cpp
similarity index 100%
rename from libKelvinDashboardCommon/DapSettings.cpp
rename to libCellFrameDashboardCommon/DapSettings.cpp
diff --git a/libKelvinDashboardCommon/DapSettings.h b/libCellFrameDashboardCommon/DapSettings.h
similarity index 99%
rename from libKelvinDashboardCommon/DapSettings.h
rename to libCellFrameDashboardCommon/DapSettings.h
index d4c23431a4fc2a0f11d65a764634380b085e9de1..4983bf890cf884874411741b155c2df8564a8877 100644
--- a/libKelvinDashboardCommon/DapSettings.h
+++ b/libCellFrameDashboardCommon/DapSettings.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** This file is part of the KelvinDashboardGUI application.
+** This file is part of the CellFrameDashboardGUI application.
**
** The class provides an interface for managing application settings.
** Record format - Json.
diff --git a/libKelvinDashboardCommon/DapSettingsCipher.cpp b/libCellFrameDashboardCommon/DapSettingsCipher.cpp
similarity index 100%
rename from libKelvinDashboardCommon/DapSettingsCipher.cpp
rename to libCellFrameDashboardCommon/DapSettingsCipher.cpp
diff --git a/libKelvinDashboardCommon/DapSettingsCipher.h b/libCellFrameDashboardCommon/DapSettingsCipher.h
similarity index 100%
rename from libKelvinDashboardCommon/DapSettingsCipher.h
rename to libCellFrameDashboardCommon/DapSettingsCipher.h
diff --git a/libKelvinDashboardCommon/libKelvinDashboardCommon.pri b/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
similarity index 100%
rename from libKelvinDashboardCommon/libKelvinDashboardCommon.pri
rename to libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index e163862577c00f1d22ab3fc7cfd42109a9c0e450..fc638ab642564dbe3136fe9c5ad573d6428099fc 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit e163862577c00f1d22ab3fc7cfd42109a9c0e450
+Subproject commit fc638ab642564dbe3136fe9c5ad573d6428099fc