Merge remote-tracking branch 'origin/master'

Qt-Secret/GMP/GMP.pro

@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2018-2019 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-
-QT       -= core gui
-
-TARGET = MiniGMP
-TEMPLATE = lib
-
-DEFINES += MINIGMP_LIBRARY
-DEFINES += QT_DEPRECATED_WARNINGS
-
-TARGET = QtBigInt
-
-CONFIG += static
-VERSION = 6.1.2
-
-CONFIG(release, debug|release): {
-    DESTDIR="$$PWD/build/release"
-} else {
-    DESTDIR="$$PWD/build/debug"
-}
-
-DISTFILES += \
-    README \
-
-HEADERS += \
-    bigint.h \
-    mini-gmp.h \
-    minigmp_global.h
-
-SOURCES += \
-    bigint.cpp \
-    mini-gmp.c

Qt-Secret/Qt-Secret.pro

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018-2019 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-QT -= gui
-CONFIG += c++11
-
-TARGET = Qt-Secret
-TEMPLATE = lib
-
-DEFINES += Qt_SECRET_LIBRARY
-DEFINES += QT_DEPRECATED_WARNINGS
-
-#DEPENDS
-CONFIG(release, debug|release): {
-    DESTDIR="$$PWD/build/release"
-} else {
-    DESTDIR="$$PWD/build/debug"
-}
-
-include($$PWD/GMP/GMP.pri)
-
-VERSION = 1.2.0
-
-HEADERS += \
-           qtsecret_global.h \
-           Qt-RSA/qrsaencryption.h
-
-SOURCES += \
-           Qt-RSA/qrsaencryption.cpp
-
-target.path = /usr/local/lib
-!isEmpty(target.path): INSTALLS += target

ScStwLibraries/ScStwLibraries.pri

@@ -4,6 +4,11 @@ SCSTWLIBRARIES_LIB = 1
 ScStwLibraries_QML {
     QT += qml quickcontrols2
     DEFINES += ScStwLibraries_QML
+
+    ScStwLibraries_Styling {
+        DEFINES += ScStwLibraries_Styling
+    }
+
 }
 
 ScStwLibraries_ClientLibs {
@@ -30,14 +35,34 @@ HEADERS += \
     $$PWD/headers/scstwtimer.h
 
 ScStwLibraries_ClientLibs {
-SOURCES += \
-    $$PWD/sources/scstwclient.cpp
-    $$PWD/sources/scstwremotemonitorrace.cpp
+    SOURCES += \
+        $$PWD/sources/client/scstwclient.cpp \
+        $$PWD/sources/client/scstwremotemonitorrace.cpp
 
-HEADERS += \
-    $$PWD/headers/scstwclient.h \
-    $$PWD/headers/scstwremotemonitorrace.h
+    HEADERS += \
+        $$PWD/headers/client/scstwclient.h \
+        $$PWD/headers/client/scstwremotemonitorrace.h
+
+    INCLUDEPATH += $$PWD/headers/client
+}
+
+ScStwLibraries_QML {
+    ScStwLibraries_Styling {
+        SOURCES += \
+            $$PWD/sources/styling/scstwapptheme.cpp \
+            $$PWD/sources/styling/scstwappthememanager.cpp
+
+        HEADERS += \
+            $$PWD/headers/styling/scstwapptheme.h \
+            $$PWD/headers/styling/scstwappthememanager.h
+
+        RESOURCES += \
+            $$PWD/resources/qml/ScStwStylingQml.qrc \
+            $$PWD/resources/shared/ScStwStylingShared.qrc \
+
+        INCLUDEPATH += $$PWD/headers/styling
+    }
 }
 
 RESOURCES += \
-    $$PWD/resources/ScStwLibrariesShared.qrc
+    $$PWD/resources/shared/ScStwLibrariesShared.qrc

ScStwLibraries/headers/ScStw.hpp

@@ -38,23 +38,9 @@
  * git submodule update --init --recursive
  * \endcode
  *
- * Add to the list of libraries for the Qt-Secret assembly. For an example you can create Main.Pro in which connect Qt-Secret and your project.pro files as subprojects.
- *
- * Main.pro:
- * \code{.pro}
- * TEMPLATE = subdirs
- * CONFIG += ordered
- *
- * SUBDIRS += \
- *          ScStwLibraries \
- *          MyProject
- *
- * ScStwLibraries.file =  shared-libraries/ScStwLibraries/ScStwLibraries.pro
- * \endcode
- *
  * And in your MyProject.pro include the .pri file:
  * \code{.pro}
- * include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri)
+ * include($$PWD/shared-libraries/ScStwLibraries/ScStwLibraries.pri)
  * \endcode
  */
 

ScStwLibraries/headers/scstwlibraries.h

@@ -22,6 +22,12 @@
 #include <QObject>
 #ifdef ScStwLibraries_QML
 #include <QQmlApplicationEngine>
+
+#ifdef ScStwLibraries_Styling
+#include "scstwappthememanager.h"
+#include "scstwapptheme.h"
+#endif
+
 #endif
 #include "scstwtimer.h"
 #include "scstwrace.h"
@@ -38,6 +44,12 @@ class ScStwLibraries : public QObject
 public:
     static void init();
 
+#ifdef ScStwLibraries_QML
+#ifdef ScStwLibraries_Styling
+    static void initStyling(QQmlApplicationEngine *engine);
+#endif
+#endif
+
 private:
     explicit ScStwLibraries(QObject *parent = nullptr);
 

ScStwLibraries/sources/client/scstwclient.cpp

@@ -16,7 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include "../headers/scstwclient.h"
+#include "scstwclient.h"
 
 ScStwClient * pGlobalScStwClient = nullptr;
 

ScStwLibraries/sources/client/scstwremotemonitorrace.cpp

@@ -16,7 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include "../headers/scstwremotemonitorrace.h"
+#include "scstwremotemonitorrace.h"
 
 ScStwRemoteMonitorRace::ScStwRemoteMonitorRace(ScStwClient *monitorClient, QObject *parent) : ScStwRace(parent)
 {

ScStwLibraries/sources/scstwlibraries.cpp

@@ -37,3 +37,14 @@ void ScStwLibraries::init() {
 #endif
 #endif
 }
+
+
+#ifdef ScStwLibraries_QML
+#ifdef ScStwLibraries_Styling
+void ScStwLibraries::initStyling(QQmlApplicationEngine *engine) {
+    qmlRegisterUncreatableType<ScStwAppTheme>("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppTheme", "The ScStwAppTheme has to be managed by a ScStwAppTheme manager and is therefore not creatable");
+    qmlRegisterType<ScStwAppThemeManager>("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppThemeManager");
+    engine->addImportPath(":/lib");
+}
+#endif
+#endif

ScStwLibraries/sources/styling/scstwapptheme.cpp

@@ -16,7 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include "headers/scstwapptheme.h"
+#include "scstwapptheme.h"
 
 ScStwAppTheme::ScStwAppTheme(QString name, QVariantMap colors, QVariantMap icons, QVariantMap fonts, QVariantMap images, QObject *parent) : QObject(parent)
 {

ScStwLibraries/sources/styling/scstwappthememanager.cpp

@@ -16,7 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include "../headers/scstwappthememanager.h"
+#include "scstwappthememanager.h"
 
 ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent)
 {

ScStwStyling/.gitignore

@@ -1 +0,0 @@
-/build/

ScStwStyling/ScStwStyling.pri

@@ -1,21 +0,0 @@
-!isEmpty(SCSTWSTYLING_LIB):error("ScStwLibraries.pri already included")
-SCSTWSTYLING_LIB = 1
-
-#DEPENDS
-CONFIG(release, debug|release): {
-    SCSTWSTYLING_LIB_OUTPUT_DIR="$$PWD/build/release"
-} else {
-    SCSTWSTYLING_LIB_OUTPUT_DIR="$$PWD/build/debug"
-}
-
-unix:LIBS += -L$$SCSTWSTYLING_LIB_OUTPUT_DIR -lScStwStyling
-
-win32:LIBS += -L$$SCSTWSTYLING_LIB_OUTPUT_DIR -lScStwStyling1
-
-android {
-    ANDROID_EXTRA_LIBS += $$SCSTWSTYLING_LIB_OUTPUT_DIR/libScStwStyling.so
-}
-
-QML_IMPORT_PATH = "$$PWD/resources/qml/lib"
-INCLUDEPATH += "$$PWD"
-INCLUDEPATH += "$$PWD"/headers

ScStwStyling/ScStwStyling.pro

@@ -1,42 +0,0 @@
-QT += gui qml
-
-TEMPLATE = lib
-DEFINES += SCSTWSTYLING_LIBRARY
-
-CONFIG += c++11
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    sources/scstwapptheme.cpp \
-    sources/scstwappthememanager.cpp \
-    sources/scstwstyling.cpp
-
-HEADERS += \
-    headers/scstwapptheme.h \
-    headers/scstwappthememanager.h \
-    headers/scstwstyling.h
-
-RESOURCES += \
-    resources/qml/ScStwStylingQml.qrc \
-    resources/shared/ScStwStylingShared.qrc \
-
-#DEPENDS
-CONFIG(release, debug|release): {
-    DESTDIR="$$PWD/build/release"
-} else {
-    DESTDIR="$$PWD/build/debug"
-}
-
-# Default rules for deployment.
-target.path = /usr/local/lib
-!isEmpty(target.path): INSTALLS += target

ScStwStyling/headers/scstwstyling.h

@@ -1,43 +0,0 @@
-/****************************************************************************
- ** ScStw Styling
- ** Copyright (C) 2020  Itsblue development
- **
- ** This program is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ****************************************************************************/
-
-#ifndef SCSTWSTYLING_H
-#define SCSTWSTYLING_H
-
-#include <QObject>
-#include <QQmlApplicationEngine>
-
-#include "scstwapptheme.h"
-#include "scstwappthememanager.h"
-
-
-class ScStwStyling : public QObject
-{
-    Q_OBJECT
-
-public:
-    static void init(QQmlApplicationEngine *engine);
-
-private:
-    explicit ScStwStyling(QObject *parent = nullptr);
-
-signals:
-
-};
-
-#endif // SCSTWSTYLING_H

ScStwStyling/sources/scstwstyling.cpp

@@ -1,30 +0,0 @@
-/****************************************************************************
- ** ScStw Styling
- ** Copyright (C) 2020  Itsblue development
- **
- ** This program is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ****************************************************************************/
-
-#include "../headers/scstwstyling.h"
-
-ScStwStyling::ScStwStyling(QObject *parent) : QObject(parent)
-{
-
-}
-
-void ScStwStyling::init(QQmlApplicationEngine *engine) {
-    qmlRegisterUncreatableType<ScStwAppTheme>("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppTheme", "The ScStwAppTheme has to be managed by a ScStwAppTheme manager and is therefore not creatable");
-    qmlRegisterType<ScStwAppThemeManager>("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppThemeManager");
-    engine->addImportPath(":/lib");
-}

release/build.sh

@@ -1,2 +0,0 @@
-dpkg-deb --build debian
-mv debian.deb libScStwSharedLibraries.deb

release/debian/DEBIAN/control

@@ -1,9 +0,0 @@
-Package: libScStwSharedLibraries
-Version: 1.1.0
-Section: base
-Priority: optional
-Architecture: armhf
-Depends: libqt5raspi-5.12.5 (>=1.0)
-Maintainer: Dorian Zedler <dorian@itsblue.de>
-Description: ScStwSharedLibraries
- This package contains all libraries used in the ScStw Project

release/debian/DEBIAN/postinst

@@ -1,3 +0,0 @@
-#!/bin/sh
-# reload ld path
-ldconfig

release/debian/usr/local/lib/libQt-Secret.so

@@ -1 +0,0 @@
-libQt-Secret.so.1.2.0

release/debian/usr/local/lib/libQt-Secret.so.1

@@ -1 +0,0 @@
-libQt-Secret.so.1.2.0

release/debian/usr/local/lib/libQt-Secret.so.1.2

@@ -1 +0,0 @@
-libQt-Secret.so.1.2.0

release/debian/usr/local/lib/libScStwLibraries.so

@@ -1 +0,0 @@
-libScStwLibraries.so.1.0.0

release/debian/usr/local/lib/libScStwLibraries.so.1

@@ -1 +0,0 @@
-libScStwLibraries.so.1.0.0

release/debian/usr/local/lib/libScStwLibraries.so.1.0

@@ -1 +0,0 @@
-libScStwLibraries.so.1.0.0

release/debian/usr/local/lib/libScStwStyling.so

@@ -1 +0,0 @@
-libScStwStyling.so.1.0.0

release/debian/usr/local/lib/libScStwStyling.so.1

@@ -1 +0,0 @@
-libScStwStyling.so.1.0.0

release/debian/usr/local/lib/libScStwStyling.so.1.0

@@ -1 +0,0 @@
-libScStwStyling.so.1.0.0

test

@@ -1,3 +0,0 @@
-test for submodule
-test2
-test3