diff --git a/Qt-Secret/GMP/GMP.pro b/Qt-Secret/GMP/GMP.pro deleted file mode 100644 index 12cb6d2..0000000 --- a/Qt-Secret/GMP/GMP.pro +++ /dev/null @@ -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 diff --git a/Qt-Secret/Qt-Secret.pro b/Qt-Secret/Qt-Secret.pro deleted file mode 100644 index f62c07f..0000000 --- a/Qt-Secret/Qt-Secret.pro +++ /dev/null @@ -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 diff --git a/ScStwLibraries/ScStwLibraries.pri b/ScStwLibraries/ScStwLibraries.pri index e34d9f9..1c8b0cf 100644 --- a/ScStwLibraries/ScStwLibraries.pri +++ b/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 { @@ -28,14 +33,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 diff --git a/ScStwLibraries/headers/scstwclient.h b/ScStwLibraries/headers/client/scstwclient.h similarity index 100% rename from ScStwLibraries/headers/scstwclient.h rename to ScStwLibraries/headers/client/scstwclient.h diff --git a/ScStwLibraries/headers/scstwremotemonitorrace.h b/ScStwLibraries/headers/client/scstwremotemonitorrace.h similarity index 100% rename from ScStwLibraries/headers/scstwremotemonitorrace.h rename to ScStwLibraries/headers/client/scstwremotemonitorrace.h diff --git a/ScStwLibraries/headers/scstwlibraries.h b/ScStwLibraries/headers/scstwlibraries.h index f6b1857..47d5f84 100644 --- a/ScStwLibraries/headers/scstwlibraries.h +++ b/ScStwLibraries/headers/scstwlibraries.h @@ -22,6 +22,12 @@ #include #ifdef ScStwLibraries_QML #include + +#ifdef ScStwLibraries_Styling +#include "scstwappthememanager.h" +#include "scstwapptheme.h" +#endif + #endif #include "scstwtimer.h" #include "scstwrace.h" @@ -37,6 +43,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); diff --git a/ScStwStyling/headers/scstwapptheme.h b/ScStwLibraries/headers/styling/scstwapptheme.h similarity index 100% rename from ScStwStyling/headers/scstwapptheme.h rename to ScStwLibraries/headers/styling/scstwapptheme.h diff --git a/ScStwStyling/headers/scstwappthememanager.h b/ScStwLibraries/headers/styling/scstwappthememanager.h similarity index 100% rename from ScStwStyling/headers/scstwappthememanager.h rename to ScStwLibraries/headers/styling/scstwappthememanager.h diff --git a/ScStwStyling/resources/qml/ScStwStylingQml.qrc b/ScStwLibraries/resources/qml/ScStwStylingQml.qrc similarity index 100% rename from ScStwStyling/resources/qml/ScStwStylingQml.qrc rename to ScStwLibraries/resources/qml/ScStwStylingQml.qrc diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/BusyIndicator.qml diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/FadeAnimation.qml diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Icon.qml diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/Test.qml diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/TimerColumn.qml diff --git a/ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir b/ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir similarity index 100% rename from ScStwStyling/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir rename to ScStwLibraries/resources/qml/lib/de/itsblue/ScStw/Styling/Components/qmldir diff --git a/ScStwLibraries/resources/ScStwLibrariesShared.qrc b/ScStwLibraries/resources/shared/ScStwLibrariesShared.qrc similarity index 100% rename from ScStwLibraries/resources/ScStwLibrariesShared.qrc rename to ScStwLibraries/resources/shared/ScStwLibrariesShared.qrc diff --git a/ScStwStyling/resources/shared/ScStwStylingShared.qrc b/ScStwLibraries/resources/shared/ScStwStylingShared.qrc similarity index 100% rename from ScStwStyling/resources/shared/ScStwStylingShared.qrc rename to ScStwLibraries/resources/shared/ScStwStylingShared.qrc diff --git a/ScStwStyling/resources/shared/fonts/PTMono-Regular.ttf b/ScStwLibraries/resources/shared/fonts/PTMono-Regular.ttf similarity index 100% rename from ScStwStyling/resources/shared/fonts/PTMono-Regular.ttf rename to ScStwLibraries/resources/shared/fonts/PTMono-Regular.ttf diff --git a/ScStwStyling/resources/shared/fonts/fa5brands.woff b/ScStwLibraries/resources/shared/fonts/fa5brands.woff similarity index 100% rename from ScStwStyling/resources/shared/fonts/fa5brands.woff rename to ScStwLibraries/resources/shared/fonts/fa5brands.woff diff --git a/ScStwStyling/resources/shared/fonts/fa5regular.woff b/ScStwLibraries/resources/shared/fonts/fa5regular.woff similarity index 100% rename from ScStwStyling/resources/shared/fonts/fa5regular.woff rename to ScStwLibraries/resources/shared/fonts/fa5regular.woff diff --git a/ScStwStyling/resources/shared/fonts/fa5solid.woff b/ScStwLibraries/resources/shared/fonts/fa5solid.woff similarity index 100% rename from ScStwStyling/resources/shared/fonts/fa5solid.woff rename to ScStwLibraries/resources/shared/fonts/fa5solid.woff diff --git a/ScStwStyling/resources/shared/images/BaseStationBlack.png b/ScStwLibraries/resources/shared/images/BaseStationBlack.png similarity index 100% rename from ScStwStyling/resources/shared/images/BaseStationBlack.png rename to ScStwLibraries/resources/shared/images/BaseStationBlack.png diff --git a/ScStwStyling/resources/shared/images/BaseStationWhite.png b/ScStwLibraries/resources/shared/images/BaseStationWhite.png similarity index 100% rename from ScStwStyling/resources/shared/images/BaseStationWhite.png rename to ScStwLibraries/resources/shared/images/BaseStationWhite.png diff --git a/ScStwStyling/resources/shared/images/SpeedHoldBlack.png b/ScStwLibraries/resources/shared/images/SpeedHoldBlack.png similarity index 100% rename from ScStwStyling/resources/shared/images/SpeedHoldBlack.png rename to ScStwLibraries/resources/shared/images/SpeedHoldBlack.png diff --git a/ScStwStyling/resources/shared/images/SpeedHoldWhite.png b/ScStwLibraries/resources/shared/images/SpeedHoldWhite.png similarity index 100% rename from ScStwStyling/resources/shared/images/SpeedHoldWhite.png rename to ScStwLibraries/resources/shared/images/SpeedHoldWhite.png diff --git a/ScStwLibraries/resources/sound/AtYourMarksSound.wav b/ScStwLibraries/resources/shared/sound/AtYourMarksSound.wav similarity index 100% rename from ScStwLibraries/resources/sound/AtYourMarksSound.wav rename to ScStwLibraries/resources/shared/sound/AtYourMarksSound.wav diff --git a/ScStwLibraries/resources/sound/FalseStartSound.wav b/ScStwLibraries/resources/shared/sound/FalseStartSound.wav similarity index 100% rename from ScStwLibraries/resources/sound/FalseStartSound.wav rename to ScStwLibraries/resources/shared/sound/FalseStartSound.wav diff --git a/ScStwLibraries/resources/sound/IFSC frequenzy and duration conform false start sound.wav b/ScStwLibraries/resources/shared/sound/IFSC frequenzy and duration conform false start sound.wav similarity index 100% rename from ScStwLibraries/resources/sound/IFSC frequenzy and duration conform false start sound.wav rename to ScStwLibraries/resources/shared/sound/IFSC frequenzy and duration conform false start sound.wav diff --git a/ScStwLibraries/resources/sound/ReadySound.wav b/ScStwLibraries/resources/shared/sound/ReadySound.wav similarity index 100% rename from ScStwLibraries/resources/sound/ReadySound.wav rename to ScStwLibraries/resources/shared/sound/ReadySound.wav diff --git a/ScStwLibraries/resources/sound/StartsignalSound.wav b/ScStwLibraries/resources/shared/sound/StartsignalSound.wav similarity index 100% rename from ScStwLibraries/resources/sound/StartsignalSound.wav rename to ScStwLibraries/resources/shared/sound/StartsignalSound.wav diff --git a/ScStwLibraries/resources/sound/StartsignalSoundExtended.wav b/ScStwLibraries/resources/shared/sound/StartsignalSoundExtended.wav similarity index 100% rename from ScStwLibraries/resources/sound/StartsignalSoundExtended.wav rename to ScStwLibraries/resources/shared/sound/StartsignalSoundExtended.wav diff --git a/ScStwLibraries/sources/scstwclient.cpp b/ScStwLibraries/sources/client/scstwclient.cpp similarity index 99% rename from ScStwLibraries/sources/scstwclient.cpp rename to ScStwLibraries/sources/client/scstwclient.cpp index bc5b077..e6eaaf8 100644 --- a/ScStwLibraries/sources/scstwclient.cpp +++ b/ScStwLibraries/sources/client/scstwclient.cpp @@ -16,7 +16,7 @@ ** along with this program. If not, see . ****************************************************************************/ -#include "../headers/scstwclient.h" +#include "scstwclient.h" ScStwClient * pGlobalScStwClient = nullptr; diff --git a/ScStwLibraries/sources/scstwremotemonitorrace.cpp b/ScStwLibraries/sources/client/scstwremotemonitorrace.cpp similarity index 99% rename from ScStwLibraries/sources/scstwremotemonitorrace.cpp rename to ScStwLibraries/sources/client/scstwremotemonitorrace.cpp index 56d6f4e..553598f 100644 --- a/ScStwLibraries/sources/scstwremotemonitorrace.cpp +++ b/ScStwLibraries/sources/client/scstwremotemonitorrace.cpp @@ -16,7 +16,7 @@ ** along with this program. If not, see . ****************************************************************************/ -#include "../headers/scstwremotemonitorrace.h" +#include "scstwremotemonitorrace.h" ScStwRemoteMonitorRace::ScStwRemoteMonitorRace(ScStwClient *monitorClient, QObject *parent) : ScStwRace(parent) { diff --git a/ScStwLibraries/sources/scstwlibraries.cpp b/ScStwLibraries/sources/scstwlibraries.cpp index 427078c..14068d2 100644 --- a/ScStwLibraries/sources/scstwlibraries.cpp +++ b/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("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppTheme", "The ScStwAppTheme has to be managed by a ScStwAppTheme manager and is therefore not creatable"); + qmlRegisterType("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppThemeManager"); + engine->addImportPath(":/lib"); +} +#endif +#endif diff --git a/ScStwStyling/sources/scstwapptheme.cpp b/ScStwLibraries/sources/styling/scstwapptheme.cpp similarity index 97% rename from ScStwStyling/sources/scstwapptheme.cpp rename to ScStwLibraries/sources/styling/scstwapptheme.cpp index 2e30539..49c79a2 100644 --- a/ScStwStyling/sources/scstwapptheme.cpp +++ b/ScStwLibraries/sources/styling/scstwapptheme.cpp @@ -16,7 +16,7 @@ ** along with this program. If not, see . ****************************************************************************/ -#include "headers/scstwapptheme.h" +#include "scstwapptheme.h" ScStwAppTheme::ScStwAppTheme(QString name, QVariantMap colors, QVariantMap icons, QVariantMap fonts, QVariantMap images, QObject *parent) : QObject(parent) { diff --git a/ScStwStyling/sources/scstwappthememanager.cpp b/ScStwLibraries/sources/styling/scstwappthememanager.cpp similarity index 99% rename from ScStwStyling/sources/scstwappthememanager.cpp rename to ScStwLibraries/sources/styling/scstwappthememanager.cpp index 00fef82..b8d3145 100644 --- a/ScStwStyling/sources/scstwappthememanager.cpp +++ b/ScStwLibraries/sources/styling/scstwappthememanager.cpp @@ -16,7 +16,7 @@ ** along with this program. If not, see . ****************************************************************************/ -#include "../headers/scstwappthememanager.h" +#include "scstwappthememanager.h" ScStwAppThemeManager::ScStwAppThemeManager(QObject *parent) : QObject(parent) { diff --git a/ScStwStyling/.gitignore b/ScStwStyling/.gitignore deleted file mode 100644 index 84c048a..0000000 --- a/ScStwStyling/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build/ diff --git a/ScStwStyling/ScStwStyling.pri b/ScStwStyling/ScStwStyling.pri deleted file mode 100644 index f15a69e..0000000 --- a/ScStwStyling/ScStwStyling.pri +++ /dev/null @@ -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 diff --git a/ScStwStyling/ScStwStyling.pro b/ScStwStyling/ScStwStyling.pro deleted file mode 100644 index 5e3704e..0000000 --- a/ScStwStyling/ScStwStyling.pro +++ /dev/null @@ -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 diff --git a/ScStwStyling/headers/scstwstyling.h b/ScStwStyling/headers/scstwstyling.h deleted file mode 100644 index 1902e0a..0000000 --- a/ScStwStyling/headers/scstwstyling.h +++ /dev/null @@ -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 . - ****************************************************************************/ - -#ifndef SCSTWSTYLING_H -#define SCSTWSTYLING_H - -#include -#include - -#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 diff --git a/ScStwStyling/sources/scstwstyling.cpp b/ScStwStyling/sources/scstwstyling.cpp deleted file mode 100644 index 05dff74..0000000 --- a/ScStwStyling/sources/scstwstyling.cpp +++ /dev/null @@ -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 . - ****************************************************************************/ - -#include "../headers/scstwstyling.h" - -ScStwStyling::ScStwStyling(QObject *parent) : QObject(parent) -{ - -} - -void ScStwStyling::init(QQmlApplicationEngine *engine) { - qmlRegisterUncreatableType("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppTheme", "The ScStwAppTheme has to be managed by a ScStwAppTheme manager and is therefore not creatable"); - qmlRegisterType("de.itsblue.ScStw.Styling", 2, 0, "ScStwAppThemeManager"); - engine->addImportPath(":/lib"); -}