diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index ee02e0b..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,52 +0,0 @@ -# Changelog -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - -## [1.1] -### Added -- connecting to and controlling a ScStw Basestation is now possible -- creating profiles and saving times is now possible (only when connected to a ScStw Basestation) -- dark mode -### Changed -- new, more modern style -- new start tone which is compliant with the IFSC norm -- new and improved codebase - - -## [0.04] - 2018-08-11 -### Added -- buzzer icon in the upper left corner indicating that the buzzer is connected -### Fixed -- start seqnece continues in a buggy way when cancel is being pressed while 'at your marks' or 'ready' -- bug that made the start sequence freeze if a delay of zero or lower or a non valid number was set as delay -### Changed -- increased the size of the back buttons in settings / profiles dialog - -## [0.03 - BETA] - 2018-07-29 -### Added -- cancel button during start sequence -- new screen in landscape mode -- buttons for settings and profiles -- the screen stays on now -- the volume csontrols control the media volume directly -- settings dialog -- capabilitie to connect to a Buzzer via Wifi -- it is now possible to setup an automatic start sequence that spells the command -'at your marks' and 'ready' with a customizable delay before them -### Fixed -- bug that made a Button freeze when it was pressed and the screen rotated at the same time - -## [0.02] - 2018-07-18 -### Fixed -- negative time when the stopping starts -- removed delay between the end of the startton an the begin of the stopping -### Changed -- slowed down animations -### Added -- animation for the text "click start to start" between STOPPED and IDLE to - prevent it from getting out of the screen - -## [0.01] -### Initial Release diff --git a/ScStwApp.pro b/ScStwApp.pro index ad328a6..6955561 100644 --- a/ScStwApp.pro +++ b/ScStwApp.pro @@ -1,68 +1,8 @@ -QT += quick qml quickcontrols2 sql multimedia +TEMPLATE = subdirs +CONFIG += ordered -android { - QT += androidextras -} -VERSION = 0.04 -DEFINES += APP_VERSION=$$VERSION -CONFIG += c++11 +SUBDIRS += \ + shared-libraries/ScStwClient \ + ScStwApp -# 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 - -SOURCES += \ - sources/main.cpp \ - sources/sqlstoragemodel.cpp \ - sources/sqlprofilemodel.cpp \ - sources/appsettings.cpp \ - sources/baseconn.cpp \ - sources/speedtimer.cpp \ - sources/climbingrace.cpp \ - sources/apptheme.cpp - -HEADERS += \ - headers/sqlstoragemodel.h \ - headers/sqlprofilemodel.h \ - headers/appsettings.h \ - headers/baseconn.h \ - headers/speedtimer.h \ - headers/climbingrace.h \ - headers/apptheme.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 -} +ScStwApp.file = ScStwSrc/ScStwApp.pro diff --git a/ScStwSrc/ScStwApp.pro b/ScStwSrc/ScStwApp.pro new file mode 100644 index 0000000..15ddd3e --- /dev/null +++ b/ScStwSrc/ScStwApp.pro @@ -0,0 +1,71 @@ +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/ScStwClient/ScStwClient.pri) + +SOURCES += \ + sources/main.cpp \ + sources/sqlstoragemodel.cpp \ + sources/sqlprofilemodel.cpp \ + sources/appsettings.cpp \ + sources/baseconn.cpp \ + sources/speedtimer.cpp \ + sources/climbingrace.cpp \ + sources/apptheme.cpp + +HEADERS += \ + headers/sqlstoragemodel.h \ + headers/sqlprofilemodel.h \ + headers/appsettings.h \ + headers/baseconn.h \ + headers/speedtimer.h \ + headers/climbingrace.h \ + headers/apptheme.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/android-sources/AndroidManifest.xml b/ScStwSrc/android-sources/AndroidManifest.xml similarity index 100% rename from android-sources/AndroidManifest.xml rename to ScStwSrc/android-sources/AndroidManifest.xml diff --git a/android-sources/AndroidManifest_old.xml b/ScStwSrc/android-sources/AndroidManifest_old.xml similarity index 100% rename from android-sources/AndroidManifest_old.xml rename to ScStwSrc/android-sources/AndroidManifest_old.xml diff --git a/android-sources/res/drawable-hdpi/icon.png b/ScStwSrc/android-sources/res/drawable-hdpi/icon.png similarity index 100% rename from android-sources/res/drawable-hdpi/icon.png rename to ScStwSrc/android-sources/res/drawable-hdpi/icon.png diff --git a/android-sources/res/drawable-ldpi/icon.png b/ScStwSrc/android-sources/res/drawable-ldpi/icon.png similarity index 100% rename from android-sources/res/drawable-ldpi/icon.png rename to ScStwSrc/android-sources/res/drawable-ldpi/icon.png diff --git a/android-sources/res/drawable-mdpi/icon.png b/ScStwSrc/android-sources/res/drawable-mdpi/icon.png similarity index 100% rename from android-sources/res/drawable-mdpi/icon.png rename to ScStwSrc/android-sources/res/drawable-mdpi/icon.png diff --git a/android-sources/src/MainActivity.java b/ScStwSrc/android-sources/src/MainActivity.java similarity index 100% rename from android-sources/src/MainActivity.java rename to ScStwSrc/android-sources/src/MainActivity.java diff --git a/headers/appsettings.h b/ScStwSrc/headers/appsettings.h similarity index 100% rename from headers/appsettings.h rename to ScStwSrc/headers/appsettings.h diff --git a/headers/apptheme.h b/ScStwSrc/headers/apptheme.h similarity index 100% rename from headers/apptheme.h rename to ScStwSrc/headers/apptheme.h diff --git a/headers/baseconn.h b/ScStwSrc/headers/baseconn.h similarity index 100% rename from headers/baseconn.h rename to ScStwSrc/headers/baseconn.h diff --git a/headers/buzzerconn.h b/ScStwSrc/headers/buzzerconn.h similarity index 100% rename from headers/buzzerconn.h rename to ScStwSrc/headers/buzzerconn.h diff --git a/headers/climbingrace.h b/ScStwSrc/headers/climbingrace.h similarity index 100% rename from headers/climbingrace.h rename to ScStwSrc/headers/climbingrace.h diff --git a/headers/speedtimer.h b/ScStwSrc/headers/speedtimer.h similarity index 100% rename from headers/speedtimer.h rename to ScStwSrc/headers/speedtimer.h diff --git a/headers/sqlprofilemodel.h b/ScStwSrc/headers/sqlprofilemodel.h similarity index 100% rename from headers/sqlprofilemodel.h rename to ScStwSrc/headers/sqlprofilemodel.h diff --git a/headers/sqlstoragemodel.h b/ScStwSrc/headers/sqlstoragemodel.h similarity index 100% rename from headers/sqlstoragemodel.h rename to ScStwSrc/headers/sqlstoragemodel.h diff --git a/resources/qml/ProfilesDialog.qml b/ScStwSrc/resources/qml/ProfilesDialog.qml similarity index 100% rename from resources/qml/ProfilesDialog.qml rename to ScStwSrc/resources/qml/ProfilesDialog.qml diff --git a/resources/qml/ProfilesDialog/AddProfilePage.qml b/ScStwSrc/resources/qml/ProfilesDialog/AddProfilePage.qml similarity index 100% rename from resources/qml/ProfilesDialog/AddProfilePage.qml rename to ScStwSrc/resources/qml/ProfilesDialog/AddProfilePage.qml diff --git a/resources/qml/ProfilesDialog/ProfileListPage.qml b/ScStwSrc/resources/qml/ProfilesDialog/ProfileListPage.qml similarity index 100% rename from resources/qml/ProfilesDialog/ProfileListPage.qml rename to ScStwSrc/resources/qml/ProfilesDialog/ProfileListPage.qml diff --git a/resources/qml/ProfilesDialog/ProfilesDialog.qml b/ScStwSrc/resources/qml/ProfilesDialog/ProfilesDialog.qml similarity index 100% rename from resources/qml/ProfilesDialog/ProfilesDialog.qml rename to ScStwSrc/resources/qml/ProfilesDialog/ProfilesDialog.qml diff --git a/resources/qml/ProfilesDialog/ProfilesStack.qml b/ScStwSrc/resources/qml/ProfilesDialog/ProfilesStack.qml similarity index 100% rename from resources/qml/ProfilesDialog/ProfilesStack.qml rename to ScStwSrc/resources/qml/ProfilesDialog/ProfilesStack.qml diff --git a/resources/qml/ProfilesDialog/ResultListPage.qml b/ScStwSrc/resources/qml/ProfilesDialog/ResultListPage.qml similarity index 100% rename from resources/qml/ProfilesDialog/ResultListPage.qml rename to ScStwSrc/resources/qml/ProfilesDialog/ResultListPage.qml diff --git a/resources/qml/SettingsDialog/SettingsBaseStationConnectionsPage.qml b/ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationConnectionsPage.qml similarity index 100% rename from resources/qml/SettingsDialog/SettingsBaseStationConnectionsPage.qml rename to ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationConnectionsPage.qml diff --git a/resources/qml/SettingsDialog/SettingsBaseStationPage.qml b/ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationPage.qml similarity index 100% rename from resources/qml/SettingsDialog/SettingsBaseStationPage.qml rename to ScStwSrc/resources/qml/SettingsDialog/SettingsBaseStationPage.qml diff --git a/resources/qml/SettingsDialog/SettingsDialog.qml b/ScStwSrc/resources/qml/SettingsDialog/SettingsDialog.qml similarity index 100% rename from resources/qml/SettingsDialog/SettingsDialog.qml rename to ScStwSrc/resources/qml/SettingsDialog/SettingsDialog.qml diff --git a/resources/qml/SettingsDialog/SettingsStack.qml b/ScStwSrc/resources/qml/SettingsDialog/SettingsStack.qml similarity index 100% rename from resources/qml/SettingsDialog/SettingsStack.qml rename to ScStwSrc/resources/qml/SettingsDialog/SettingsStack.qml diff --git a/resources/qml/SettingsDialog/SettingsStartSequencePage.qml b/ScStwSrc/resources/qml/SettingsDialog/SettingsStartSequencePage.qml similarity index 100% rename from resources/qml/SettingsDialog/SettingsStartSequencePage.qml rename to ScStwSrc/resources/qml/SettingsDialog/SettingsStartSequencePage.qml diff --git a/resources/qml/SettingsDialog/StartPage.qml b/ScStwSrc/resources/qml/SettingsDialog/StartPage.qml similarity index 100% rename from resources/qml/SettingsDialog/StartPage.qml rename to ScStwSrc/resources/qml/SettingsDialog/StartPage.qml diff --git a/resources/qml/components/ConnectionDelegate.qml b/ScStwSrc/resources/qml/components/ConnectionDelegate.qml similarity index 100% rename from resources/qml/components/ConnectionDelegate.qml rename to ScStwSrc/resources/qml/components/ConnectionDelegate.qml diff --git a/resources/qml/components/ConnectionIcon.qml b/ScStwSrc/resources/qml/components/ConnectionIcon.qml similarity index 100% rename from resources/qml/components/ConnectionIcon.qml rename to ScStwSrc/resources/qml/components/ConnectionIcon.qml diff --git a/resources/qml/components/FadeAnimation.qml b/ScStwSrc/resources/qml/components/FadeAnimation.qml similarity index 100% rename from resources/qml/components/FadeAnimation.qml rename to ScStwSrc/resources/qml/components/FadeAnimation.qml diff --git a/resources/qml/components/FancyBusyIndicator.qml b/ScStwSrc/resources/qml/components/FancyBusyIndicator.qml similarity index 100% rename from resources/qml/components/FancyBusyIndicator.qml rename to ScStwSrc/resources/qml/components/FancyBusyIndicator.qml diff --git a/resources/qml/components/FancyButton.qml b/ScStwSrc/resources/qml/components/FancyButton.qml similarity index 100% rename from resources/qml/components/FancyButton.qml rename to ScStwSrc/resources/qml/components/FancyButton.qml diff --git a/resources/qml/components/InputDelegate.qml b/ScStwSrc/resources/qml/components/InputDelegate.qml similarity index 100% rename from resources/qml/components/InputDelegate.qml rename to ScStwSrc/resources/qml/components/InputDelegate.qml diff --git a/resources/qml/components/NextPageDelegate.qml b/ScStwSrc/resources/qml/components/NextPageDelegate.qml similarity index 100% rename from resources/qml/components/NextPageDelegate.qml rename to ScStwSrc/resources/qml/components/NextPageDelegate.qml diff --git a/resources/qml/components/ProgressCircle.qml b/ScStwSrc/resources/qml/components/ProgressCircle.qml similarity index 100% rename from resources/qml/components/ProgressCircle.qml rename to ScStwSrc/resources/qml/components/ProgressCircle.qml diff --git a/resources/qml/components/RemoteDataListView.qml b/ScStwSrc/resources/qml/components/RemoteDataListView.qml similarity index 100% rename from resources/qml/components/RemoteDataListView.qml rename to ScStwSrc/resources/qml/components/RemoteDataListView.qml diff --git a/resources/qml/components/SimpleIndicator.qml b/ScStwSrc/resources/qml/components/SimpleIndicator.qml similarity index 100% rename from resources/qml/components/SimpleIndicator.qml rename to ScStwSrc/resources/qml/components/SimpleIndicator.qml diff --git a/resources/qml/components/SmoothItemDelegate.qml b/ScStwSrc/resources/qml/components/SmoothItemDelegate.qml similarity index 100% rename from resources/qml/components/SmoothItemDelegate.qml rename to ScStwSrc/resources/qml/components/SmoothItemDelegate.qml diff --git a/resources/qml/components/SmoothSliderDelegate.qml b/ScStwSrc/resources/qml/components/SmoothSliderDelegate.qml similarity index 100% rename from resources/qml/components/SmoothSliderDelegate.qml rename to ScStwSrc/resources/qml/components/SmoothSliderDelegate.qml diff --git a/resources/qml/components/SmoothSwitchDelegate.qml b/ScStwSrc/resources/qml/components/SmoothSwitchDelegate.qml similarity index 100% rename from resources/qml/components/SmoothSwitchDelegate.qml rename to ScStwSrc/resources/qml/components/SmoothSwitchDelegate.qml diff --git a/resources/qml/connections/BuzzerConn.qml b/ScStwSrc/resources/qml/connections/BuzzerConn.qml similarity index 100% rename from resources/qml/connections/BuzzerConn.qml rename to ScStwSrc/resources/qml/connections/BuzzerConn.qml diff --git a/resources/qml/connections/StartpadConn.qml b/ScStwSrc/resources/qml/connections/StartpadConn.qml similarity index 100% rename from resources/qml/connections/StartpadConn.qml rename to ScStwSrc/resources/qml/connections/StartpadConn.qml diff --git a/resources/qml/main.qml b/ScStwSrc/resources/qml/main.qml similarity index 100% rename from resources/qml/main.qml rename to ScStwSrc/resources/qml/main.qml diff --git a/resources/qml/qml.qrc b/ScStwSrc/resources/qml/qml.qrc similarity index 100% rename from resources/qml/qml.qrc rename to ScStwSrc/resources/qml/qml.qrc diff --git a/resources/qml/styles/Dark.js b/ScStwSrc/resources/qml/styles/Dark.js similarity index 100% rename from resources/qml/styles/Dark.js rename to ScStwSrc/resources/qml/styles/Dark.js diff --git a/resources/qml/styles/Default.js b/ScStwSrc/resources/qml/styles/Default.js similarity index 100% rename from resources/qml/styles/Default.js rename to ScStwSrc/resources/qml/styles/Default.js diff --git a/resources/qml/styles/Light.js b/ScStwSrc/resources/qml/styles/Light.js similarity index 100% rename from resources/qml/styles/Light.js rename to ScStwSrc/resources/qml/styles/Light.js diff --git a/resources/qml/styles/StyleSettings.qml b/ScStwSrc/resources/qml/styles/StyleSettings.qml similarity index 100% rename from resources/qml/styles/StyleSettings.qml rename to ScStwSrc/resources/qml/styles/StyleSettings.qml diff --git a/resources/qml/styles/qmldir b/ScStwSrc/resources/qml/styles/qmldir similarity index 100% rename from resources/qml/styles/qmldir rename to ScStwSrc/resources/qml/styles/qmldir diff --git a/resources/shared/ScStwBasestation.sb64 b/ScStwSrc/resources/shared/ScStwBasestation.sb64 similarity index 100% rename from resources/shared/ScStwBasestation.sb64 rename to ScStwSrc/resources/shared/ScStwBasestation.sb64 diff --git a/resources/shared/graphics/Banner.png b/ScStwSrc/resources/shared/graphics/Banner.png similarity index 100% rename from resources/shared/graphics/Banner.png rename to ScStwSrc/resources/shared/graphics/Banner.png diff --git a/resources/shared/graphics/Banner.xcf b/ScStwSrc/resources/shared/graphics/Banner.xcf similarity index 100% rename from resources/shared/graphics/Banner.xcf rename to ScStwSrc/resources/shared/graphics/Banner.xcf diff --git a/resources/shared/graphics/BaseStation.xcf b/ScStwSrc/resources/shared/graphics/BaseStation.xcf similarity index 100% rename from resources/shared/graphics/BaseStation.xcf rename to ScStwSrc/resources/shared/graphics/BaseStation.xcf diff --git a/resources/shared/graphics/Buzzer.xcf b/ScStwSrc/resources/shared/graphics/Buzzer.xcf similarity index 100% rename from resources/shared/graphics/Buzzer.xcf rename to ScStwSrc/resources/shared/graphics/Buzzer.xcf diff --git a/resources/shared/graphics/favicon.png b/ScStwSrc/resources/shared/graphics/favicon.png similarity index 100% rename from resources/shared/graphics/favicon.png rename to ScStwSrc/resources/shared/graphics/favicon.png diff --git a/resources/shared/graphics/favicon.xcf b/ScStwSrc/resources/shared/graphics/favicon.xcf similarity index 100% rename from resources/shared/graphics/favicon.xcf rename to ScStwSrc/resources/shared/graphics/favicon.xcf diff --git a/resources/shared/graphics/faviconNoOutline.png b/ScStwSrc/resources/shared/graphics/faviconNoOutline.png similarity index 100% rename from resources/shared/graphics/faviconNoOutline.png rename to ScStwSrc/resources/shared/graphics/faviconNoOutline.png diff --git a/resources/shared/graphics/icons/BaseStation.png b/ScStwSrc/resources/shared/graphics/icons/BaseStation.png similarity index 100% rename from resources/shared/graphics/icons/BaseStation.png rename to ScStwSrc/resources/shared/graphics/icons/BaseStation.png diff --git a/resources/shared/graphics/icons/BaseStation_black.png b/ScStwSrc/resources/shared/graphics/icons/BaseStation_black.png similarity index 100% rename from resources/shared/graphics/icons/BaseStation_black.png rename to ScStwSrc/resources/shared/graphics/icons/BaseStation_black.png diff --git a/resources/shared/graphics/icons/back.png b/ScStwSrc/resources/shared/graphics/icons/back.png similarity index 100% rename from resources/shared/graphics/icons/back.png rename to ScStwSrc/resources/shared/graphics/icons/back.png diff --git a/resources/shared/graphics/icons/back_black.png b/ScStwSrc/resources/shared/graphics/icons/back_black.png similarity index 100% rename from resources/shared/graphics/icons/back_black.png rename to ScStwSrc/resources/shared/graphics/icons/back_black.png diff --git a/resources/shared/graphics/icons/buzzer.png b/ScStwSrc/resources/shared/graphics/icons/buzzer.png similarity index 100% rename from resources/shared/graphics/icons/buzzer.png rename to ScStwSrc/resources/shared/graphics/icons/buzzer.png diff --git a/resources/shared/graphics/icons/buzzer_black.png b/ScStwSrc/resources/shared/graphics/icons/buzzer_black.png similarity index 100% rename from resources/shared/graphics/icons/buzzer_black.png rename to ScStwSrc/resources/shared/graphics/icons/buzzer_black.png diff --git a/resources/shared/graphics/icons/drawer.png b/ScStwSrc/resources/shared/graphics/icons/drawer.png similarity index 100% rename from resources/shared/graphics/icons/drawer.png rename to ScStwSrc/resources/shared/graphics/icons/drawer.png diff --git a/resources/shared/graphics/icons/drawer_black.png b/ScStwSrc/resources/shared/graphics/icons/drawer_black.png similarity index 100% rename from resources/shared/graphics/icons/drawer_black.png rename to ScStwSrc/resources/shared/graphics/icons/drawer_black.png diff --git a/resources/shared/graphics/icons/error.png b/ScStwSrc/resources/shared/graphics/icons/error.png similarity index 100% rename from resources/shared/graphics/icons/error.png rename to ScStwSrc/resources/shared/graphics/icons/error.png diff --git a/resources/shared/graphics/icons/menu.png b/ScStwSrc/resources/shared/graphics/icons/menu.png similarity index 100% rename from resources/shared/graphics/icons/menu.png rename to ScStwSrc/resources/shared/graphics/icons/menu.png diff --git a/resources/shared/graphics/icons/menu_black.png b/ScStwSrc/resources/shared/graphics/icons/menu_black.png similarity index 100% rename from resources/shared/graphics/icons/menu_black.png rename to ScStwSrc/resources/shared/graphics/icons/menu_black.png diff --git a/resources/shared/graphics/icons/ok.png b/ScStwSrc/resources/shared/graphics/icons/ok.png similarity index 100% rename from resources/shared/graphics/icons/ok.png rename to ScStwSrc/resources/shared/graphics/icons/ok.png diff --git a/resources/shared/graphics/icons/ok_black.png b/ScStwSrc/resources/shared/graphics/icons/ok_black.png similarity index 100% rename from resources/shared/graphics/icons/ok_black.png rename to ScStwSrc/resources/shared/graphics/icons/ok_black.png diff --git a/resources/shared/graphics/icons/settings.png b/ScStwSrc/resources/shared/graphics/icons/settings.png similarity index 100% rename from resources/shared/graphics/icons/settings.png rename to ScStwSrc/resources/shared/graphics/icons/settings.png diff --git a/resources/shared/graphics/icons/settings_black.png b/ScStwSrc/resources/shared/graphics/icons/settings_black.png similarity index 100% rename from resources/shared/graphics/icons/settings_black.png rename to ScStwSrc/resources/shared/graphics/icons/settings_black.png diff --git a/resources/shared/graphics/icons/startpad.png b/ScStwSrc/resources/shared/graphics/icons/startpad.png similarity index 100% rename from resources/shared/graphics/icons/startpad.png rename to ScStwSrc/resources/shared/graphics/icons/startpad.png diff --git a/resources/shared/graphics/icons/startpad_black.png b/ScStwSrc/resources/shared/graphics/icons/startpad_black.png similarity index 100% rename from resources/shared/graphics/icons/startpad_black.png rename to ScStwSrc/resources/shared/graphics/icons/startpad_black.png diff --git a/resources/shared/graphics/icons/user.png b/ScStwSrc/resources/shared/graphics/icons/user.png similarity index 100% rename from resources/shared/graphics/icons/user.png rename to ScStwSrc/resources/shared/graphics/icons/user.png diff --git a/resources/shared/graphics/icons/user_black.png b/ScStwSrc/resources/shared/graphics/icons/user_black.png similarity index 100% rename from resources/shared/graphics/icons/user_black.png rename to ScStwSrc/resources/shared/graphics/icons/user_black.png diff --git a/resources/shared/graphics/poster.png b/ScStwSrc/resources/shared/graphics/poster.png similarity index 100% rename from resources/shared/graphics/poster.png rename to ScStwSrc/resources/shared/graphics/poster.png diff --git a/resources/shared/graphics/poster.xcf b/ScStwSrc/resources/shared/graphics/poster.xcf similarity index 100% rename from resources/shared/graphics/poster.xcf rename to ScStwSrc/resources/shared/graphics/poster.xcf diff --git a/resources/shared/graphics/screenshots/1.png b/ScStwSrc/resources/shared/graphics/screenshots/1.png similarity index 100% rename from resources/shared/graphics/screenshots/1.png rename to ScStwSrc/resources/shared/graphics/screenshots/1.png diff --git a/resources/shared/graphics/screenshots/2.png b/ScStwSrc/resources/shared/graphics/screenshots/2.png similarity index 100% rename from resources/shared/graphics/screenshots/2.png rename to ScStwSrc/resources/shared/graphics/screenshots/2.png diff --git a/resources/shared/graphics/screenshots/3.png b/ScStwSrc/resources/shared/graphics/screenshots/3.png similarity index 100% rename from resources/shared/graphics/screenshots/3.png rename to ScStwSrc/resources/shared/graphics/screenshots/3.png diff --git a/resources/shared/graphics/screenshots/4.png b/ScStwSrc/resources/shared/graphics/screenshots/4.png similarity index 100% rename from resources/shared/graphics/screenshots/4.png rename to ScStwSrc/resources/shared/graphics/screenshots/4.png diff --git a/resources/shared/graphics/screenshots/5.png b/ScStwSrc/resources/shared/graphics/screenshots/5.png similarity index 100% rename from resources/shared/graphics/screenshots/5.png rename to ScStwSrc/resources/shared/graphics/screenshots/5.png diff --git a/resources/shared/graphics/screenshots/6.png b/ScStwSrc/resources/shared/graphics/screenshots/6.png similarity index 100% rename from resources/shared/graphics/screenshots/6.png rename to ScStwSrc/resources/shared/graphics/screenshots/6.png diff --git a/resources/shared/graphics/screenshots/7.png b/ScStwSrc/resources/shared/graphics/screenshots/7.png similarity index 100% rename from resources/shared/graphics/screenshots/7.png rename to ScStwSrc/resources/shared/graphics/screenshots/7.png diff --git a/resources/shared/graphics/startpad.xcf b/ScStwSrc/resources/shared/graphics/startpad.xcf similarity index 100% rename from resources/shared/graphics/startpad.xcf rename to ScStwSrc/resources/shared/graphics/startpad.xcf diff --git a/resources/shared/shared.qrc b/ScStwSrc/resources/shared/shared.qrc similarity index 100% rename from resources/shared/shared.qrc rename to ScStwSrc/resources/shared/shared.qrc diff --git a/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav b/ScStwSrc/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav similarity index 100% rename from resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav rename to ScStwSrc/resources/shared/sounds/IFSC_STARTSIGNAL_SINE.wav diff --git a/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav b/ScStwSrc/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav similarity index 100% rename from resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav rename to ScStwSrc/resources/shared/sounds/OLD_IFSC_STARTIGNAL.wav diff --git a/resources/shared/sounds/at_marks_1.wav b/ScStwSrc/resources/shared/sounds/at_marks_1.wav similarity index 100% rename from resources/shared/sounds/at_marks_1.wav rename to ScStwSrc/resources/shared/sounds/at_marks_1.wav diff --git a/resources/shared/sounds/at_marks_2.wav b/ScStwSrc/resources/shared/sounds/at_marks_2.wav similarity index 100% rename from resources/shared/sounds/at_marks_2.wav rename to ScStwSrc/resources/shared/sounds/at_marks_2.wav diff --git a/resources/shared/sounds/false.wav b/ScStwSrc/resources/shared/sounds/false.wav similarity index 100% rename from resources/shared/sounds/false.wav rename to ScStwSrc/resources/shared/sounds/false.wav diff --git a/resources/shared/sounds/ready_1.wav b/ScStwSrc/resources/shared/sounds/ready_1.wav similarity index 100% rename from resources/shared/sounds/ready_1.wav rename to ScStwSrc/resources/shared/sounds/ready_1.wav diff --git a/resources/shared/sounds/ready_2.wav b/ScStwSrc/resources/shared/sounds/ready_2.wav similarity index 100% rename from resources/shared/sounds/ready_2.wav rename to ScStwSrc/resources/shared/sounds/ready_2.wav diff --git a/resources/shared/sounds/sounds.aup b/ScStwSrc/resources/shared/sounds/sounds.aup similarity index 100% rename from resources/shared/sounds/sounds.aup rename to ScStwSrc/resources/shared/sounds/sounds.aup diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000260.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000260.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000260.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000260.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000290.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000290.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000290.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000290.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000457.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000457.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000457.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000457.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000542.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000542.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000542.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000542.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000714.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000714.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000714.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000714.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000996.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000996.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000996.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000996.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e00009d0.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e00009d0.au diff --git a/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au b/ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au similarity index 100% rename from resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au rename to ScStwSrc/resources/shared/sounds/sounds_data/e00/d00/e0000ce4.au diff --git a/resources/shared/speedclimbing_stopwatch.png b/ScStwSrc/resources/shared/speedclimbing_stopwatch.png similarity index 100% rename from resources/shared/speedclimbing_stopwatch.png rename to ScStwSrc/resources/shared/speedclimbing_stopwatch.png diff --git a/sources/appsettings.cpp b/ScStwSrc/sources/appsettings.cpp similarity index 100% rename from sources/appsettings.cpp rename to ScStwSrc/sources/appsettings.cpp diff --git a/sources/apptheme.cpp b/ScStwSrc/sources/apptheme.cpp similarity index 100% rename from sources/apptheme.cpp rename to ScStwSrc/sources/apptheme.cpp diff --git a/sources/baseconn.cpp b/ScStwSrc/sources/baseconn.cpp similarity index 100% rename from sources/baseconn.cpp rename to ScStwSrc/sources/baseconn.cpp diff --git a/sources/buzzerconn.cpp b/ScStwSrc/sources/buzzerconn.cpp similarity index 100% rename from sources/buzzerconn.cpp rename to ScStwSrc/sources/buzzerconn.cpp diff --git a/sources/climbingrace.cpp b/ScStwSrc/sources/climbingrace.cpp similarity index 100% rename from sources/climbingrace.cpp rename to ScStwSrc/sources/climbingrace.cpp diff --git a/sources/main.cpp b/ScStwSrc/sources/main.cpp similarity index 100% rename from sources/main.cpp rename to ScStwSrc/sources/main.cpp diff --git a/sources/speedtimer.cpp b/ScStwSrc/sources/speedtimer.cpp similarity index 100% rename from sources/speedtimer.cpp rename to ScStwSrc/sources/speedtimer.cpp diff --git a/sources/sqlprofilemodel.cpp b/ScStwSrc/sources/sqlprofilemodel.cpp similarity index 100% rename from sources/sqlprofilemodel.cpp rename to ScStwSrc/sources/sqlprofilemodel.cpp diff --git a/sources/sqlstoragemodel.cpp b/ScStwSrc/sources/sqlstoragemodel.cpp similarity index 100% rename from sources/sqlstoragemodel.cpp rename to ScStwSrc/sources/sqlstoragemodel.cpp