Merge branch 'features-3819' into 'develop'

Features 3819

See merge request cellframe/cellframe-dashboard!161

.gitmodules

-[submodule "libdap-qt-ui-qml"]
-	path = libdap-qt-ui-qml
-	url = https://gitlab.demlabs.net/cellframe/libdap-qt-ui-qml.git
+[submodule "cellframe-sdk"]
+	path = cellframe-sdk
+	url = https://gitlab.demlabs.net/cellframe/cellframe-sdk.git
 	branch = master
-[submodule "libdap-qt"]
-	path = libdap-qt
-	url = https://gitlab.demlabs.net/cellframe/libdap-qt.git
+[submodule "cellframe-ui-sdk"]
+	path = cellframe-ui-sdk
+	url = https://gitlab.demlabs.net/cellframe/cellframe-ui-sdk.git
 	branch = master
-[submodule "libdap"]
-	path = libdap
-	url = https://gitlab.demlabs.net/cellframe/libdap.git
+[submodule "dap-ui-sdk"]
+	path = dap-ui-sdk
+	url = https://gitlab.demlabs.net/dap/dap-ui-sdk
 	branch = master
-[submodule "libdap-crypto"]
-	path = libdap-crypto
-	url = https://gitlab.demlabs.net/cellframe/libdap-crypto.git
-	branch = master
-[submodule "libdap-qt-ui-chain-wallet"]
-	path = libdap-qt-ui-chain-wallet
-	url = https://gitlab.demlabs.net/cellframe/libdap-qt-ui-chain-wallet.git

CellFrameDashboardGUI/CellFrameDashboardGUI.pro

@@ -76,11 +76,12 @@ else: unix:!android: target.path = /opt/cellframe-dashboard/bin
 HEADERS += \
     $$PWD/DapServiceController.h
 
-include (../libdap/libdap.pri)
-include (../libdap-crypto/libdap-crypto.pri)
-include (../libdap-qt/libdap-qt.pri)
-include (../libdap-qt-ui-qml/libdap-qt-ui-qml.pri)
-include (../libdap-qt-ui-chain-wallet/libdap-qt-ui-chain-wallet.pri)
+include (../dap-ui-sdk/qml/libdap-qt-ui-qml.pri)
+include (../dap-ui-sdk/core/libdap-qt.pri)
+include (../cellframe-sdk/dap-sdk/core/libdap.pri)
+include (../cellframe-sdk/dap-sdk/crypto/libdap-crypto.pri)
+include (../cellframe-ui-sdk/chain/wallet/libdap-qt-chain-wallet.pri)
+include (../cellframe-ui-sdk/ui/chain/wallet/libdap-qt-ui-chain-wallet.pri)
 
 unix: !mac : !android {
     gui_target.files = $${BRAND}

CellFrameDashboardGUI/main.cpp

@@ -8,7 +8,7 @@
 #include <QSharedMemory>
 #include <QScreen>
 
-#include "DapHalper.h"
+#include "DapHelper.h"
 #include "serviceClient/DapServiceClient.h"
 #include "DapServiceController.h"
 #include "DapLogger.h"

CellFrameDashboardService/CellFrameDashboardService.pro

@@ -48,10 +48,12 @@ HEADERS += \
     $$PWD/DapServiceController.h \
     $$PWD/DapToolTipWidget.h
 
-include (../libdap/libdap.pri)
-include (../libdap-crypto/libdap-crypto.pri)
-include (../libdap-qt/libdap-qt.pri)
-include (../libdap-qt-ui-chain-wallet/libdap-qt-ui-chain-wallet.pri)
+include (../dap-ui-sdk/qml/libdap-qt-ui-qml.pri)
+include (../dap-ui-sdk/core/libdap-qt.pri)
+include (../cellframe-sdk/dap-sdk/core/libdap.pri)
+include (../cellframe-sdk/dap-sdk/crypto/libdap-crypto.pri)
+include (../cellframe-ui-sdk/chain/wallet/libdap-qt-chain-wallet.pri)
+include (../cellframe-ui-sdk/ui/chain/wallet/libdap-qt-ui-chain-wallet.pri)
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../cellframe-node/
                $$_PRO_FILE_PWD_/../dapRPCProtocol/

CellFrameDashboardService/main.cpp

@@ -6,7 +6,7 @@
 
 #include <unistd.h>
 
-#include "DapHalper.h"
+#include "DapHelper.h"
 #include "DapServiceController.h"
 #include "DapLogger.h"
 
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 
     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);
+    bool isRunning = DapHelper::getInstance().checkExistenceRunningInstanceApp(systemSemaphore, memmoryApp, memmoryAppBagFix);
   
     if(isRunning)
     {

cellframe-sdk @ 9097840b

+Subproject commit 9097840b9c834e0a4c89d6dacdb55d005205becc

cellframe-ui-sdk @ e4c85059

+Subproject commit e4c850590ff54492d67b919f5c0dbe9bef7b9edb

dap-ui-sdk @ 8208c79c

+Subproject commit 8208c79c94a582a2d534a078b0c5b3192ebb3b56

libdap @ 202275ac

-Subproject commit 202275ac5c5389439cb003c0faaf3a4e68e503c8

libdap-crypto @ 77f0dd9d

-Subproject commit 77f0dd9d161ac902f28d5d64b3451d7ab50fe186

libdap-qt @ 257e9bec

-Subproject commit 257e9bec35db7607d1136231361d157d6d9d2c30

libdap-qt-ui-chain-wallet @ f6dd08a9

-Subproject commit f6dd08a966298a4b7346cda856ef0527b114b816

libdap-qt-ui-qml @ 84d71744

-Subproject commit 84d717447631b8c79b4b608302e628d213913735