diff --git a/ScStwMonitorSrc/ScStwMonitor.desktop b/ScStwMonitor.desktop similarity index 100% rename from ScStwMonitorSrc/ScStwMonitor.desktop rename to ScStwMonitor.desktop diff --git a/ScStwMonitor.pro b/ScStwMonitor.pro old mode 100644 new mode 100755 index 52a6a7d..df11048 --- a/ScStwMonitor.pro +++ b/ScStwMonitor.pro @@ -1,16 +1,72 @@ -TEMPLATE = subdirs -CONFIG += ordered console +QT += quick multimedia -SUBDIRS += \ - ScStwLibraries \ - ScStwStyling \ - ScStwMonitorSrc +CONFIG += c++11 +CONFIG -= app_bundle -ScStwMonitorSrc.depends = Qt-Secret -ScStwLibraries.file = shared-libraries/ScStwLibraries/ScStwLibraries.pro -ScStwStyling.file = shared-libraries/ScStwStyling/ScStwStyling.pro +TARGET = ScStwMonitor +VERSION = 1.1 -contains(QMAKE_CXX, .*raspbian.*arm.*):{ - GLOBAL_TARGET_PATH = "/home/pi/ScStwMonitor" - cache(GLOBAL_TARGET_PATH, set) +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as 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 you use 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/main.cpp \ + sources/scstwmonitorbackend.cpp + +RESOURCES += \ + resources/qml/qml.qrc \ + resources/shared/shared.qrc + + +# include submodules +CONFIG += ScStwLibraries_QML ScStwLibraries_Styling ScStwLibraries_ClientLibs +include($$PWD/shared-libraries/ScStwLibraries/ScStwLibraries.pri) + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +# target path for raspi +else: unix:!android: target.path = /usr/share/ScStwMonitor +!isEmpty(target.path): INSTALLS += target + +HEADERS += \ + headers/scstwmonitorbackend.h + +DISTFILES += \ + android/AndroidManifest.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew \ + android/gradlew.bat \ + android/res/values/libs.xml \ + android/src/MainActivity.java + +android { + ANDROID_PACKAGE_SOURCE_DIR = \ + $$PWD/android } + +ios { + QMAKE_ASSET_CATALOGS += icon/Assets.xcassets + xcode_product_bundle_identifier_setting.value = "de.itsblue.ScStwMonitor" + + OBJECTIVE_SOURCES += \ + sources/sleepprevent.mm + OBJECTIVE_HEADERS += \ + headers/sleepprevent.h +} + diff --git a/ScStwMonitorSrc/.gitignore b/ScStwMonitorSrc/.gitignore deleted file mode 100644 index 39f809d..0000000 --- a/ScStwMonitorSrc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.pro.user -*.pro.user* diff --git a/ScStwMonitorSrc/ScStwMonitorSrc.pro b/ScStwMonitorSrc/ScStwMonitorSrc.pro deleted file mode 100755 index 21d5802..0000000 --- a/ScStwMonitorSrc/ScStwMonitorSrc.pro +++ /dev/null @@ -1,72 +0,0 @@ -QT += quick multimedia - -CONFIG += c++11 -CONFIG -= app_bundle - -TARGET = ScStwMonitor -VERSION = 1.1 - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as 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 you use 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/main.cpp \ - sources/scstwmonitorbackend.cpp - -RESOURCES += \ - resources/qml/qml.qrc \ - resources/shared/shared.qrc - - -# include submodules -include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri) -include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri) - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH = - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -# target path for raspi -else: unix:!android: target.path = /usr/share/ScStwMonitor -!isEmpty(target.path): INSTALLS += target - -HEADERS += \ - headers/scstwmonitorbackend.h - -DISTFILES += \ - android/AndroidManifest.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew \ - android/gradlew.bat \ - android/res/values/libs.xml \ - android/src/MainActivity.java - -android { - ANDROID_PACKAGE_SOURCE_DIR = \ - $$PWD/android -} - -ios { - QMAKE_ASSET_CATALOGS += icon/Assets.xcassets - xcode_product_bundle_identifier_setting.value = "de.itsblue.ScStwMonitor" - - OBJECTIVE_SOURCES += \ - sources/sleepprevent.mm - OBJECTIVE_HEADERS += \ - headers/sleepprevent.h -} - diff --git a/ScStwMonitorSrc/android/AndroidManifest.xml b/android/AndroidManifest.xml similarity index 100% rename from ScStwMonitorSrc/android/AndroidManifest.xml rename to android/AndroidManifest.xml diff --git a/ScStwMonitorSrc/android/build.gradle b/android/build.gradle similarity index 100% rename from ScStwMonitorSrc/android/build.gradle rename to android/build.gradle diff --git a/ScStwMonitorSrc/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from ScStwMonitorSrc/android/gradle/wrapper/gradle-wrapper.jar rename to android/gradle/wrapper/gradle-wrapper.jar diff --git a/ScStwMonitorSrc/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from ScStwMonitorSrc/android/gradle/wrapper/gradle-wrapper.properties rename to android/gradle/wrapper/gradle-wrapper.properties diff --git a/ScStwMonitorSrc/android/gradlew b/android/gradlew similarity index 100% rename from ScStwMonitorSrc/android/gradlew rename to android/gradlew diff --git a/ScStwMonitorSrc/android/gradlew.bat b/android/gradlew.bat similarity index 100% rename from ScStwMonitorSrc/android/gradlew.bat rename to android/gradlew.bat diff --git a/ScStwMonitorSrc/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png similarity index 100% rename from ScStwMonitorSrc/android/res/drawable-hdpi/icon.png rename to android/res/drawable-hdpi/icon.png diff --git a/ScStwMonitorSrc/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png similarity index 100% rename from ScStwMonitorSrc/android/res/drawable-ldpi/icon.png rename to android/res/drawable-ldpi/icon.png diff --git a/ScStwMonitorSrc/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png similarity index 100% rename from ScStwMonitorSrc/android/res/drawable-mdpi/icon.png rename to android/res/drawable-mdpi/icon.png diff --git a/ScStwMonitorSrc/android/res/values/libs.xml b/android/res/values/libs.xml similarity index 100% rename from ScStwMonitorSrc/android/res/values/libs.xml rename to android/res/values/libs.xml diff --git a/ScStwMonitorSrc/android/src/MainActivity.java b/android/src/MainActivity.java similarity index 100% rename from ScStwMonitorSrc/android/src/MainActivity.java rename to android/src/MainActivity.java diff --git a/ScStwMonitorSrc/headers/scstwmonitorbackend.h b/headers/scstwmonitorbackend.h similarity index 100% rename from ScStwMonitorSrc/headers/scstwmonitorbackend.h rename to headers/scstwmonitorbackend.h diff --git a/ScStwMonitorSrc/headers/sleepprevent.h b/headers/sleepprevent.h similarity index 100% rename from ScStwMonitorSrc/headers/sleepprevent.h rename to headers/sleepprevent.h diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/100.png b/icon/Assets.xcassets/AppIcon.appiconset/100.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/100.png rename to icon/Assets.xcassets/AppIcon.appiconset/100.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/1024.png b/icon/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/1024.png rename to icon/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/114.png b/icon/Assets.xcassets/AppIcon.appiconset/114.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/114.png rename to icon/Assets.xcassets/AppIcon.appiconset/114.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/120.png b/icon/Assets.xcassets/AppIcon.appiconset/120.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/120.png rename to icon/Assets.xcassets/AppIcon.appiconset/120.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/128.png b/icon/Assets.xcassets/AppIcon.appiconset/128.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/128.png rename to icon/Assets.xcassets/AppIcon.appiconset/128.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/144.png b/icon/Assets.xcassets/AppIcon.appiconset/144.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/144.png rename to icon/Assets.xcassets/AppIcon.appiconset/144.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/152.png b/icon/Assets.xcassets/AppIcon.appiconset/152.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/152.png rename to icon/Assets.xcassets/AppIcon.appiconset/152.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/16.png b/icon/Assets.xcassets/AppIcon.appiconset/16.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/16.png rename to icon/Assets.xcassets/AppIcon.appiconset/16.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/167.png b/icon/Assets.xcassets/AppIcon.appiconset/167.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/167.png rename to icon/Assets.xcassets/AppIcon.appiconset/167.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/172.png b/icon/Assets.xcassets/AppIcon.appiconset/172.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/172.png rename to icon/Assets.xcassets/AppIcon.appiconset/172.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/180.png b/icon/Assets.xcassets/AppIcon.appiconset/180.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/180.png rename to icon/Assets.xcassets/AppIcon.appiconset/180.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/196.png b/icon/Assets.xcassets/AppIcon.appiconset/196.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/196.png rename to icon/Assets.xcassets/AppIcon.appiconset/196.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/20.png b/icon/Assets.xcassets/AppIcon.appiconset/20.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/20.png rename to icon/Assets.xcassets/AppIcon.appiconset/20.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/216.png b/icon/Assets.xcassets/AppIcon.appiconset/216.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/216.png rename to icon/Assets.xcassets/AppIcon.appiconset/216.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/256.png b/icon/Assets.xcassets/AppIcon.appiconset/256.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/256.png rename to icon/Assets.xcassets/AppIcon.appiconset/256.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/29.png b/icon/Assets.xcassets/AppIcon.appiconset/29.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/29.png rename to icon/Assets.xcassets/AppIcon.appiconset/29.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/32.png b/icon/Assets.xcassets/AppIcon.appiconset/32.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/32.png rename to icon/Assets.xcassets/AppIcon.appiconset/32.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/40.png b/icon/Assets.xcassets/AppIcon.appiconset/40.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/40.png rename to icon/Assets.xcassets/AppIcon.appiconset/40.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/48.png b/icon/Assets.xcassets/AppIcon.appiconset/48.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/48.png rename to icon/Assets.xcassets/AppIcon.appiconset/48.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/50.png b/icon/Assets.xcassets/AppIcon.appiconset/50.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/50.png rename to icon/Assets.xcassets/AppIcon.appiconset/50.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/512.png b/icon/Assets.xcassets/AppIcon.appiconset/512.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/512.png rename to icon/Assets.xcassets/AppIcon.appiconset/512.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/55.png b/icon/Assets.xcassets/AppIcon.appiconset/55.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/55.png rename to icon/Assets.xcassets/AppIcon.appiconset/55.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/57.png b/icon/Assets.xcassets/AppIcon.appiconset/57.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/57.png rename to icon/Assets.xcassets/AppIcon.appiconset/57.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/58.png b/icon/Assets.xcassets/AppIcon.appiconset/58.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/58.png rename to icon/Assets.xcassets/AppIcon.appiconset/58.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/60.png b/icon/Assets.xcassets/AppIcon.appiconset/60.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/60.png rename to icon/Assets.xcassets/AppIcon.appiconset/60.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/64.png b/icon/Assets.xcassets/AppIcon.appiconset/64.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/64.png rename to icon/Assets.xcassets/AppIcon.appiconset/64.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/72.png b/icon/Assets.xcassets/AppIcon.appiconset/72.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/72.png rename to icon/Assets.xcassets/AppIcon.appiconset/72.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/76.png b/icon/Assets.xcassets/AppIcon.appiconset/76.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/76.png rename to icon/Assets.xcassets/AppIcon.appiconset/76.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/80.png b/icon/Assets.xcassets/AppIcon.appiconset/80.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/80.png rename to icon/Assets.xcassets/AppIcon.appiconset/80.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/87.png b/icon/Assets.xcassets/AppIcon.appiconset/87.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/87.png rename to icon/Assets.xcassets/AppIcon.appiconset/87.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/88.png b/icon/Assets.xcassets/AppIcon.appiconset/88.png similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/88.png rename to icon/Assets.xcassets/AppIcon.appiconset/88.png diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/Contents.json b/icon/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/AppIcon.appiconset/Contents.json rename to icon/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ScStwMonitorSrc/icon/Assets.xcassets/Contents.json b/icon/Assets.xcassets/Contents.json similarity index 100% rename from ScStwMonitorSrc/icon/Assets.xcassets/Contents.json rename to icon/Assets.xcassets/Contents.json diff --git a/icon/favicon.png.old b/icon/favicon.png.old deleted file mode 100644 index a26d006..0000000 Binary files a/icon/favicon.png.old and /dev/null differ diff --git a/icon/favicon.xcf b/icon/favicon.xcf deleted file mode 100644 index 4b00375..0000000 Binary files a/icon/favicon.xcf and /dev/null differ diff --git a/icon/faviconNoOutline.png.old b/icon/faviconNoOutline.png.old deleted file mode 100644 index e75c63a..0000000 Binary files a/icon/faviconNoOutline.png.old and /dev/null differ diff --git a/icon/icons8-monitor-96.png b/icon/icons8-monitor-96.png deleted file mode 100644 index e6c9434..0000000 Binary files a/icon/icons8-monitor-96.png and /dev/null differ diff --git a/release/ScStwMonitor.deb b/release/ScStwMonitor.deb index 6d96e06..48c95ca 100644 Binary files a/release/ScStwMonitor.deb and b/release/ScStwMonitor.deb differ diff --git a/release/debian/usr/share/ScStwMonitor/ScStwMonitor b/release/debian/usr/share/ScStwMonitor/ScStwMonitor index c3108f2..8292902 100755 Binary files a/release/debian/usr/share/ScStwMonitor/ScStwMonitor and b/release/debian/usr/share/ScStwMonitor/ScStwMonitor differ diff --git a/ScStwMonitorSrc/resources/qml/main.qml b/resources/qml/main.qml similarity index 100% rename from ScStwMonitorSrc/resources/qml/main.qml rename to resources/qml/main.qml diff --git a/ScStwMonitorSrc/resources/qml/qml.qrc b/resources/qml/qml.qrc similarity index 100% rename from ScStwMonitorSrc/resources/qml/qml.qrc rename to resources/qml/qml.qrc diff --git a/ScStwMonitorSrc/resources/shared/Banner.png b/resources/shared/Banner.png similarity index 100% rename from ScStwMonitorSrc/resources/shared/Banner.png rename to resources/shared/Banner.png diff --git a/ScStwMonitorSrc/resources/shared/SpeedHold.png b/resources/shared/SpeedHold.png similarity index 100% rename from ScStwMonitorSrc/resources/shared/SpeedHold.png rename to resources/shared/SpeedHold.png diff --git a/ScStwMonitorSrc/resources/shared/fonts/PTMono-Regular.ttf b/resources/shared/fonts/PTMono-Regular.ttf similarity index 100% rename from ScStwMonitorSrc/resources/shared/fonts/PTMono-Regular.ttf rename to resources/shared/fonts/PTMono-Regular.ttf diff --git a/ScStwMonitorSrc/resources/shared/shared.qrc b/resources/shared/shared.qrc similarity index 100% rename from ScStwMonitorSrc/resources/shared/shared.qrc rename to resources/shared/shared.qrc diff --git a/shared-libraries b/shared-libraries index eb13286..ae9e639 160000 --- a/shared-libraries +++ b/shared-libraries @@ -1 +1 @@ -Subproject commit eb1328642db8fb194659e1ff4b53d45c1dcbc56d +Subproject commit ae9e6398ac233217ac89ef009fd84d8ce19f4159 diff --git a/ScStwMonitorSrc/sources/main.cpp b/sources/main.cpp similarity index 97% rename from ScStwMonitorSrc/sources/main.cpp rename to sources/main.cpp index a961688..c0eeb64 100755 --- a/ScStwMonitorSrc/sources/main.cpp +++ b/sources/main.cpp @@ -24,7 +24,6 @@ #include #include -#include #include "headers/scstwmonitorbackend.h" #if defined(Q_OS_IOS) @@ -45,7 +44,7 @@ int main(int argc, char *argv[]) QQmlApplicationEngine engine; ScStwLibraries::init(); - ScStwStyling::init(&engine); + ScStwLibraries::initStyling(&engine); QSize size = app.screens().first()->size(); engine.rootContext()->setContextProperty("XscreenHeight", size.height()); diff --git a/ScStwMonitorSrc/sources/scstwmonitorbackend.cpp b/sources/scstwmonitorbackend.cpp similarity index 100% rename from ScStwMonitorSrc/sources/scstwmonitorbackend.cpp rename to sources/scstwmonitorbackend.cpp diff --git a/ScStwMonitorSrc/sources/sleepprevent.mm b/sources/sleepprevent.mm similarity index 100% rename from ScStwMonitorSrc/sources/sleepprevent.mm rename to sources/sleepprevent.mm