diff --git a/ScStwApp.pro b/ScStwApp.pro index 7adfb72..c05eabc 100644 --- a/ScStwApp.pro +++ b/ScStwApp.pro @@ -1,11 +1,62 @@ -TEMPLATE = subdirs -CONFIG += ordered +QT += quick qml quickcontrols2 sql multimedia -SUBDIRS += \ - ScStwLibraries \ - ScStwStyling \ - ScStwApp +android { + QT += androidextras +} +VERSION = 0.04 +DEFINES += APP_VERSION=$$VERSION +CONFIG += c++11 -ScStwApp.file = ScStwSrc/ScStwApp.pro -ScStwLibraries.file = shared-libraries/ScStwLibraries/ScStwLibraries.pro -ScStwStyling.file = shared-libraries/ScStwStyling/ScStwStyling.pro +# 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 + +TARGET = speedclimbing_stw + +# include submodules +CONFIG += ScStwLibraries_QML ScStwLibraries_Styling ScStwLibraries_ClientLibs +include($$PWD/shared-libraries/ScStwLibraries/ScStwLibraries.pri) + +SOURCES += \ + sources/scstwappbackend.cpp \ + sources/main.cpp \ + sources/appsettings.cpp + +HEADERS += \ + headers/appsettings.h \ + headers/scstwappbackend.h + +RESOURCES += \ + resources/shared/shared.qrc \ + resources/qml/qml.qrc + +# 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 = + +#Plugins +QTPLUGIN += qtaudio_coreaudio + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +#else: unix:!android: target.path = /opt/$${TARGET}/bin +else: unix:!android: target.path = /home/pi/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target + +DISTFILES += \ + android-sources/AndroidManifest.xml \ + CHANGELOG \ + android-sources/src/MainActivity.java + +android { + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources +} diff --git a/ScStwSrc/ScStwApp.pro b/ScStwSrc/ScStwApp.pro deleted file mode 100644 index 96110f0..0000000 --- a/ScStwSrc/ScStwApp.pro +++ /dev/null @@ -1,62 +0,0 @@ -QT += quick qml quickcontrols2 sql multimedia - -android { - QT += androidextras -} -VERSION = 0.04 -DEFINES += APP_VERSION=$$VERSION -CONFIG += c++11 - -# 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 - -TARGET = speedclimbing_stw - -# include submodules -include($$PWD/../shared-libraries/ScStwLibraries/ScStwLibraries.pri) -include($$PWD/../shared-libraries/ScStwStyling/ScStwStyling.pri) - -SOURCES += \ - sources/scstwappbackend.cpp \ - sources/main.cpp \ - sources/appsettings.cpp - -HEADERS += \ - headers/appsettings.h \ - headers/scstwappbackend.h - -RESOURCES += \ - resources/shared/shared.qrc \ - resources/qml/qml.qrc - -# 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 = - -#Plugins -QTPLUGIN += qtaudio_coreaudio - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -#else: unix:!android: target.path = /opt/$${TARGET}/bin -else: unix:!android: target.path = /home/pi/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target - -DISTFILES += \ - android-sources/AndroidManifest.xml \ - CHANGELOG \ - android-sources/src/MainActivity.java - -android { - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources -} diff --git a/ScStwSrc/resources/shared/graphics/Buzzer.xcf b/ScStwSrc/resources/shared/graphics/Buzzer.xcf deleted file mode 100644 index 2cac802..0000000 Binary files a/ScStwSrc/resources/shared/graphics/Buzzer.xcf and /dev/null differ diff --git a/ScStwSrc/resources/shared/graphics/favicon.xcf b/ScStwSrc/resources/shared/graphics/favicon.xcf deleted file mode 100644 index a901dd4..0000000 Binary files a/ScStwSrc/resources/shared/graphics/favicon.xcf and /dev/null differ diff --git a/ScStwSrc/resources/shared/graphics/startpad.xcf b/ScStwSrc/resources/shared/graphics/startpad.xcf deleted file mode 100644 index 518add8..0000000 Binary files a/ScStwSrc/resources/shared/graphics/startpad.xcf and /dev/null differ diff --git a/ScStwSrc/resources/shared/speedclimbing_stopwatch.png b/ScStwSrc/resources/shared/speedclimbing_stopwatch.png deleted file mode 100644 index ec4b891..0000000 Binary files a/ScStwSrc/resources/shared/speedclimbing_stopwatch.png and /dev/null differ diff --git a/ScStwSrc/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml similarity index 100% rename from ScStwSrc/android-sources/AndroidManifest.xml rename to android-sources/AndroidManifest.xml diff --git a/ScStwSrc/android-sources/AndroidManifest_old.xml b/android-sources/AndroidManifest_old.xml similarity index 100% rename from ScStwSrc/android-sources/AndroidManifest_old.xml rename to android-sources/AndroidManifest_old.xml diff --git a/ScStwSrc/android-sources/res/drawable-hdpi/icon.png b/android-sources/res/drawable-hdpi/icon.png similarity index 100% rename from ScStwSrc/android-sources/res/drawable-hdpi/icon.png rename to android-sources/res/drawable-hdpi/icon.png diff --git a/ScStwSrc/android-sources/res/drawable-ldpi/icon.png b/android-sources/res/drawable-ldpi/icon.png similarity index 100% rename from ScStwSrc/android-sources/res/drawable-ldpi/icon.png rename to android-sources/res/drawable-ldpi/icon.png diff --git a/ScStwSrc/android-sources/res/drawable-mdpi/icon.png b/android-sources/res/drawable-mdpi/icon.png similarity index 100% rename from ScStwSrc/android-sources/res/drawable-mdpi/icon.png rename to android-sources/res/drawable-mdpi/icon.png diff --git a/ScStwSrc/android-sources/src/MainActivity.java b/android-sources/src/MainActivity.java similarity index 100% rename from ScStwSrc/android-sources/src/MainActivity.java rename to android-sources/src/MainActivity.java diff --git a/ScStwSrc/headers/appsettings.h b/headers/appsettings.h similarity index 100% rename from ScStwSrc/headers/appsettings.h rename to headers/appsettings.h diff --git a/ScStwSrc/headers/scstwappbackend.h b/headers/scstwappbackend.h similarity index 100% rename from ScStwSrc/headers/scstwappbackend.h rename to headers/scstwappbackend.h diff --git a/ScStwSrc/resources/qml/ProfilesDialog.qml b/resources/qml/ProfilesDialog.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog.qml rename to resources/qml/ProfilesDialog.qml diff --git a/ScStwSrc/resources/qml/ProfilesDialog/AddProfilePage.qml b/resources/qml/ProfilesDialog/AddProfilePage.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog/AddProfilePage.qml rename to resources/qml/ProfilesDialog/AddProfilePage.qml diff --git a/ScStwSrc/resources/qml/ProfilesDialog/ProfileListPage.qml b/resources/qml/ProfilesDialog/ProfileListPage.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog/ProfileListPage.qml rename to resources/qml/ProfilesDialog/ProfileListPage.qml diff --git a/ScStwSrc/resources/qml/ProfilesDialog/ProfilesDialog.qml b/resources/qml/ProfilesDialog/ProfilesDialog.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog/ProfilesDialog.qml rename to resources/qml/ProfilesDialog/ProfilesDialog.qml diff --git a/ScStwSrc/resources/qml/ProfilesDialog/ProfilesStack.qml b/resources/qml/ProfilesDialog/ProfilesStack.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog/ProfilesStack.qml rename to resources/qml/ProfilesDialog/ProfilesStack.qml diff --git a/ScStwSrc/resources/qml/ProfilesDialog/ResultListPage.qml b/resources/qml/ProfilesDialog/ResultListPage.qml similarity index 100% rename from ScStwSrc/resources/qml/ProfilesDialog/ResultListPage.qml rename to resources/qml/ProfilesDialog/ResultListPage.qml diff --git a/ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationPage.qml b/resources/qml/SettingsDialog/SettingsBaseStationPage.qml similarity index 100% rename from ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationPage.qml rename to resources/qml/SettingsDialog/SettingsBaseStationPage.qml diff --git a/ScStwSrc/resources/qml/SettingsDialog/SettingsDialog.qml b/resources/qml/SettingsDialog/SettingsDialog.qml similarity index 100% rename from ScStwSrc/resources/qml/SettingsDialog/SettingsDialog.qml rename to resources/qml/SettingsDialog/SettingsDialog.qml diff --git a/ScStwSrc/resources/qml/SettingsDialog/SettingsStack.qml b/resources/qml/SettingsDialog/SettingsStack.qml similarity index 100% rename from ScStwSrc/resources/qml/SettingsDialog/SettingsStack.qml rename to resources/qml/SettingsDialog/SettingsStack.qml diff --git a/ScStwSrc/resources/qml/SettingsDialog/SettingsStartSequencePage.qml b/resources/qml/SettingsDialog/SettingsStartSequencePage.qml similarity index 100% rename from ScStwSrc/resources/qml/SettingsDialog/SettingsStartSequencePage.qml rename to resources/qml/SettingsDialog/SettingsStartSequencePage.qml diff --git a/ScStwSrc/resources/qml/SettingsDialog/StartPage.qml b/resources/qml/SettingsDialog/StartPage.qml similarity index 100% rename from ScStwSrc/resources/qml/SettingsDialog/StartPage.qml rename to resources/qml/SettingsDialog/StartPage.qml diff --git a/ScStwSrc/resources/qml/components/ConnectionDelegate.qml b/resources/qml/components/ConnectionDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/ConnectionDelegate.qml rename to resources/qml/components/ConnectionDelegate.qml diff --git a/ScStwSrc/resources/qml/components/ConnectionIcon.qml b/resources/qml/components/ConnectionIcon.qml similarity index 100% rename from ScStwSrc/resources/qml/components/ConnectionIcon.qml rename to resources/qml/components/ConnectionIcon.qml diff --git a/ScStwSrc/resources/qml/components/FancyButton.qml b/resources/qml/components/FancyButton.qml similarity index 100% rename from ScStwSrc/resources/qml/components/FancyButton.qml rename to resources/qml/components/FancyButton.qml diff --git a/ScStwSrc/resources/qml/components/InputDelegate.qml b/resources/qml/components/InputDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/InputDelegate.qml rename to resources/qml/components/InputDelegate.qml diff --git a/ScStwSrc/resources/qml/components/NextPageDelegate.qml b/resources/qml/components/NextPageDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/NextPageDelegate.qml rename to resources/qml/components/NextPageDelegate.qml diff --git a/ScStwSrc/resources/qml/components/ProgressCircle.qml b/resources/qml/components/ProgressCircle.qml similarity index 100% rename from ScStwSrc/resources/qml/components/ProgressCircle.qml rename to resources/qml/components/ProgressCircle.qml diff --git a/ScStwSrc/resources/qml/components/RemoteDataListView.qml b/resources/qml/components/RemoteDataListView.qml similarity index 100% rename from ScStwSrc/resources/qml/components/RemoteDataListView.qml rename to resources/qml/components/RemoteDataListView.qml diff --git a/ScStwSrc/resources/qml/components/SimpleIndicator.qml b/resources/qml/components/SimpleIndicator.qml similarity index 100% rename from ScStwSrc/resources/qml/components/SimpleIndicator.qml rename to resources/qml/components/SimpleIndicator.qml diff --git a/ScStwSrc/resources/qml/components/SmoothItemDelegate.qml b/resources/qml/components/SmoothItemDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/SmoothItemDelegate.qml rename to resources/qml/components/SmoothItemDelegate.qml diff --git a/ScStwSrc/resources/qml/components/SmoothSliderDelegate.qml b/resources/qml/components/SmoothSliderDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/SmoothSliderDelegate.qml rename to resources/qml/components/SmoothSliderDelegate.qml diff --git a/ScStwSrc/resources/qml/components/SmoothSwitchDelegate.qml b/resources/qml/components/SmoothSwitchDelegate.qml similarity index 100% rename from ScStwSrc/resources/qml/components/SmoothSwitchDelegate.qml rename to resources/qml/components/SmoothSwitchDelegate.qml diff --git a/ScStwSrc/resources/qml/connections/BuzzerConn.qml b/resources/qml/connections/BuzzerConn.qml similarity index 100% rename from ScStwSrc/resources/qml/connections/BuzzerConn.qml rename to resources/qml/connections/BuzzerConn.qml diff --git a/ScStwSrc/resources/qml/connections/StartpadConn.qml b/resources/qml/connections/StartpadConn.qml similarity index 100% rename from ScStwSrc/resources/qml/connections/StartpadConn.qml rename to resources/qml/connections/StartpadConn.qml diff --git a/ScStwSrc/resources/qml/main.qml b/resources/qml/main.qml similarity index 100% rename from ScStwSrc/resources/qml/main.qml rename to resources/qml/main.qml diff --git a/ScStwSrc/resources/qml/qml.qrc b/resources/qml/qml.qrc similarity index 100% rename from ScStwSrc/resources/qml/qml.qrc rename to resources/qml/qml.qrc diff --git a/ScStwSrc/resources/qml/styles/Dark.js b/resources/qml/styles/Dark.js similarity index 100% rename from ScStwSrc/resources/qml/styles/Dark.js rename to resources/qml/styles/Dark.js diff --git a/ScStwSrc/resources/qml/styles/Default.js b/resources/qml/styles/Default.js similarity index 100% rename from ScStwSrc/resources/qml/styles/Default.js rename to resources/qml/styles/Default.js diff --git a/ScStwSrc/resources/qml/styles/Light.js b/resources/qml/styles/Light.js similarity index 100% rename from ScStwSrc/resources/qml/styles/Light.js rename to resources/qml/styles/Light.js diff --git a/ScStwSrc/resources/qml/styles/StyleSettings.qml b/resources/qml/styles/StyleSettings.qml similarity index 100% rename from ScStwSrc/resources/qml/styles/StyleSettings.qml rename to resources/qml/styles/StyleSettings.qml diff --git a/ScStwSrc/resources/qml/styles/qmldir b/resources/qml/styles/qmldir similarity index 100% rename from ScStwSrc/resources/qml/styles/qmldir rename to resources/qml/styles/qmldir diff --git a/ScStwSrc/resources/shared/graphics/favicon.png b/resources/shared/graphics/favicon.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/favicon.png rename to resources/shared/graphics/favicon.png diff --git a/ScStwSrc/resources/shared/graphics/faviconNoOutline.png b/resources/shared/graphics/faviconNoOutline.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/faviconNoOutline.png rename to resources/shared/graphics/faviconNoOutline.png diff --git a/ScStwSrc/resources/shared/graphics/icons/BaseStation.png b/resources/shared/graphics/icons/BaseStation.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/BaseStation.png rename to resources/shared/graphics/icons/BaseStation.png diff --git a/ScStwSrc/resources/shared/graphics/icons/BaseStation_black.png b/resources/shared/graphics/icons/BaseStation_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/BaseStation_black.png rename to resources/shared/graphics/icons/BaseStation_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/back.png b/resources/shared/graphics/icons/back.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/back.png rename to resources/shared/graphics/icons/back.png diff --git a/ScStwSrc/resources/shared/graphics/icons/back_black.png b/resources/shared/graphics/icons/back_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/back_black.png rename to resources/shared/graphics/icons/back_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/buzzer.png b/resources/shared/graphics/icons/buzzer.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/buzzer.png rename to resources/shared/graphics/icons/buzzer.png diff --git a/ScStwSrc/resources/shared/graphics/icons/buzzer_black.png b/resources/shared/graphics/icons/buzzer_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/buzzer_black.png rename to resources/shared/graphics/icons/buzzer_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/drawer.png b/resources/shared/graphics/icons/drawer.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/drawer.png rename to resources/shared/graphics/icons/drawer.png diff --git a/ScStwSrc/resources/shared/graphics/icons/drawer_black.png b/resources/shared/graphics/icons/drawer_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/drawer_black.png rename to resources/shared/graphics/icons/drawer_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/error.png b/resources/shared/graphics/icons/error.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/error.png rename to resources/shared/graphics/icons/error.png diff --git a/ScStwSrc/resources/shared/graphics/icons/menu.png b/resources/shared/graphics/icons/menu.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/menu.png rename to resources/shared/graphics/icons/menu.png diff --git a/ScStwSrc/resources/shared/graphics/icons/menu_black.png b/resources/shared/graphics/icons/menu_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/menu_black.png rename to resources/shared/graphics/icons/menu_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/ok.png b/resources/shared/graphics/icons/ok.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/ok.png rename to resources/shared/graphics/icons/ok.png diff --git a/ScStwSrc/resources/shared/graphics/icons/ok_black.png b/resources/shared/graphics/icons/ok_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/ok_black.png rename to resources/shared/graphics/icons/ok_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/settings.png b/resources/shared/graphics/icons/settings.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/settings.png rename to resources/shared/graphics/icons/settings.png diff --git a/ScStwSrc/resources/shared/graphics/icons/settings_black.png b/resources/shared/graphics/icons/settings_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/settings_black.png rename to resources/shared/graphics/icons/settings_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/startpad.png b/resources/shared/graphics/icons/startpad.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/startpad.png rename to resources/shared/graphics/icons/startpad.png diff --git a/ScStwSrc/resources/shared/graphics/icons/startpad_black.png b/resources/shared/graphics/icons/startpad_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/startpad_black.png rename to resources/shared/graphics/icons/startpad_black.png diff --git a/ScStwSrc/resources/shared/graphics/icons/user.png b/resources/shared/graphics/icons/user.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/user.png rename to resources/shared/graphics/icons/user.png diff --git a/ScStwSrc/resources/shared/graphics/icons/user_black.png b/resources/shared/graphics/icons/user_black.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/icons/user_black.png rename to resources/shared/graphics/icons/user_black.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/1.png b/resources/shared/graphics/screenshots/1.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/1.png rename to resources/shared/graphics/screenshots/1.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/2.png b/resources/shared/graphics/screenshots/2.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/2.png rename to resources/shared/graphics/screenshots/2.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/3.png b/resources/shared/graphics/screenshots/3.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/3.png rename to resources/shared/graphics/screenshots/3.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/4.png b/resources/shared/graphics/screenshots/4.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/4.png rename to resources/shared/graphics/screenshots/4.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/5.png b/resources/shared/graphics/screenshots/5.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/5.png rename to resources/shared/graphics/screenshots/5.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/6.png b/resources/shared/graphics/screenshots/6.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/6.png rename to resources/shared/graphics/screenshots/6.png diff --git a/ScStwSrc/resources/shared/graphics/screenshots/7.png b/resources/shared/graphics/screenshots/7.png similarity index 100% rename from ScStwSrc/resources/shared/graphics/screenshots/7.png rename to resources/shared/graphics/screenshots/7.png diff --git a/ScStwSrc/resources/shared/shared.qrc b/resources/shared/shared.qrc similarity index 100% rename from ScStwSrc/resources/shared/shared.qrc rename to resources/shared/shared.qrc diff --git a/ScStwSrc/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav b/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav rename to resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav diff --git a/ScStwSrc/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav b/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav rename to resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav diff --git a/ScStwSrc/resources/shared/sounds/at_marks_1.wav b/resources/shared/sounds/at_marks_1.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/at_marks_1.wav rename to resources/shared/sounds/at_marks_1.wav diff --git a/ScStwSrc/resources/shared/sounds/at_marks_2.wav b/resources/shared/sounds/at_marks_2.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/at_marks_2.wav rename to resources/shared/sounds/at_marks_2.wav diff --git a/ScStwSrc/resources/shared/sounds/false.wav b/resources/shared/sounds/false.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/false.wav rename to resources/shared/sounds/false.wav diff --git a/ScStwSrc/resources/shared/sounds/ready_1.wav b/resources/shared/sounds/ready_1.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/ready_1.wav rename to resources/shared/sounds/ready_1.wav diff --git a/ScStwSrc/resources/shared/sounds/ready_2.wav b/resources/shared/sounds/ready_2.wav similarity index 100% rename from ScStwSrc/resources/shared/sounds/ready_2.wav rename to resources/shared/sounds/ready_2.wav diff --git a/ScStwSrc/resources/shared/sounds/sounds.aup b/resources/shared/sounds/sounds.aup similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds.aup rename to resources/shared/sounds/sounds.aup diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000260.au b/resources/shared/sounds/sounds_data/e00/d00/e0000260.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000260.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000260.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000290.au b/resources/shared/sounds/sounds_data/e00/d00/e0000290.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000290.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000290.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000457.au b/resources/shared/sounds/sounds_data/e00/d00/e0000457.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000457.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000457.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000542.au b/resources/shared/sounds/sounds_data/e00/d00/e0000542.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000542.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000542.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000714.au b/resources/shared/sounds/sounds_data/e00/d00/e0000714.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000714.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000714.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000996.au b/resources/shared/sounds/sounds_data/e00/d00/e0000996.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000996.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000996.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au b/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au rename to resources/shared/sounds/sounds_data/e00/d00/e00009d0.au diff --git a/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au b/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au similarity index 100% rename from ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au rename to resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au diff --git a/shared-libraries b/shared-libraries index 549edda..ae9e639 160000 --- a/shared-libraries +++ b/shared-libraries @@ -1 +1 @@ -Subproject commit 549edda9b075faf900ee652f2836f27259753346 +Subproject commit ae9e6398ac233217ac89ef009fd84d8ce19f4159 diff --git a/ScStwSrc/sources/appsettings.cpp b/sources/appsettings.cpp similarity index 100% rename from ScStwSrc/sources/appsettings.cpp rename to sources/appsettings.cpp diff --git a/ScStwSrc/sources/main.cpp b/sources/main.cpp similarity index 98% rename from ScStwSrc/sources/main.cpp rename to sources/main.cpp index 602b423..860585d 100644 --- a/ScStwSrc/sources/main.cpp +++ b/sources/main.cpp @@ -55,7 +55,6 @@ //#include "headers/climbingrace.h" #include "headers/scstwappbackend.h" #include -#include #include int main(int argc, char *argv[]) @@ -89,7 +88,7 @@ int main(int argc, char *argv[]) QQmlApplicationEngine engine; ScStwLibraries::init(); - ScStwStyling::init(&engine); + ScStwLibraries::initStyling(&engine); engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/ScStwSrc/sources/scstwappbackend.cpp b/sources/scstwappbackend.cpp similarity index 100% rename from ScStwSrc/sources/scstwappbackend.cpp rename to sources/scstwappbackend.cpp