Skip to content
Snippets Groups Projects
Commit f1023b78 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] Refactoring

parent 075e8750
No related branches found
No related tags found
No related merge requests found
Pipeline #808 passed with stage
Showing
with 31 additions and 14 deletions
......@@ -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
TEMPLATE = subdirs
SUBDIRS = KelvinDashboardGUI KelvinDashboardService
SUBDIRS = CellFrameDashboardGUI CellFrameDashboardService
KelvinDashboardGUI.subdir = KelvinDashboardGUI
KelvinDashboardService.subdir = KelvinDashboardService
KelvinDashboardGUI.depends = KelvinDashboardService
CellFrameDashboardGUI.subdir = CellFrameDashboardGUI
CellFrameDashboardService.subdir = CellFrameDashboardService
CellFrameDashboardGUI.depends = CellFrameDashboardService
!defined(BRAND, var)
{
BRAND = KelvinDashboard
BRAND = CellFrameDashboard
}
unix: !mac : !android {
share_target.files = debian/share/*
share_target.path = /opt/kelvin-dashboard/share/
share_target.path = /opt/cellframe-dashboard/share/
INSTALLS += share_target
}
......@@ -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.
......@@ -72,7 +72,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 += \
......@@ -102,16 +102,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
}
......
......@@ -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
{
......
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")
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment