From 2caab427453bc1851d55441034dcda7e51aec761 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sat, 28 Jul 2018 23:05:26 +0200 Subject: [PATCH] sorted everything --- appsettings.h => headers/appsettings.h | 0 buzzerconn.h => headers/buzzerconn.h | 0 .../sqlprofilemodel.h | 0 .../sqlstoragemodel.h | 0 FadeAnimation.qml => qml/FadeAnimation.qml | 0 ProgressCircle.qml => qml/ProgressCircle.qml | 0 SettingsDialog.qml => qml/SettingsDialog.qml | 0 main.qml => qml/main.qml | 2 +- qml.qrc => qml/qml.qrc | 0 shared.qrc | 2 +- .../OFFICAL_IFSC_STARTIGNAL.wav | Bin appsettings.cpp => sources/appsettings.cpp | 2 +- buzzerconn.cpp => sources/buzzerconn.cpp | 2 +- main.cpp => sources/main.cpp | 8 +++---- .../sqlprofilemodel.cpp | 2 +- .../sqlstoragemodel.cpp | 2 +- speedclimbing_stopwatch.pro | 20 +++++++++--------- 17 files changed, 20 insertions(+), 20 deletions(-) rename appsettings.h => headers/appsettings.h (100%) rename buzzerconn.h => headers/buzzerconn.h (100%) rename sqlprofilemodel.h => headers/sqlprofilemodel.h (100%) rename sqlstoragemodel.h => headers/sqlstoragemodel.h (100%) rename FadeAnimation.qml => qml/FadeAnimation.qml (100%) rename ProgressCircle.qml => qml/ProgressCircle.qml (100%) rename SettingsDialog.qml => qml/SettingsDialog.qml (100%) rename main.qml => qml/main.qml (99%) rename qml.qrc => qml/qml.qrc (100%) rename OFFICAL_IFSC_STARTIGNAL.wav => sounds/OFFICAL_IFSC_STARTIGNAL.wav (100%) rename appsettings.cpp => sources/appsettings.cpp (96%) rename buzzerconn.cpp => sources/buzzerconn.cpp (99%) rename main.cpp => sources/main.cpp (95%) rename sqlprofilemodel.cpp => sources/sqlprofilemodel.cpp (97%) rename sqlstoragemodel.cpp => sources/sqlstoragemodel.cpp (66%) diff --git a/appsettings.h b/headers/appsettings.h similarity index 100% rename from appsettings.h rename to headers/appsettings.h diff --git a/buzzerconn.h b/headers/buzzerconn.h similarity index 100% rename from buzzerconn.h rename to headers/buzzerconn.h diff --git a/sqlprofilemodel.h b/headers/sqlprofilemodel.h similarity index 100% rename from sqlprofilemodel.h rename to headers/sqlprofilemodel.h diff --git a/sqlstoragemodel.h b/headers/sqlstoragemodel.h similarity index 100% rename from sqlstoragemodel.h rename to headers/sqlstoragemodel.h diff --git a/FadeAnimation.qml b/qml/FadeAnimation.qml similarity index 100% rename from FadeAnimation.qml rename to qml/FadeAnimation.qml diff --git a/ProgressCircle.qml b/qml/ProgressCircle.qml similarity index 100% rename from ProgressCircle.qml rename to qml/ProgressCircle.qml diff --git a/SettingsDialog.qml b/qml/SettingsDialog.qml similarity index 100% rename from SettingsDialog.qml rename to qml/SettingsDialog.qml diff --git a/main.qml b/qml/main.qml similarity index 99% rename from main.qml rename to qml/main.qml index 717b853..59d4c6a 100644 --- a/main.qml +++ b/qml/main.qml @@ -145,7 +145,7 @@ Window { SoundEffect { //start sound id: startSound - source: "OFFICAL_IFSC_STARTIGNAL.wav" + source: "qrc:/sounds/OFFICAL_IFSC_STARTIGNAL.wav" onPlayingChanged: { if(!playing){ diff --git a/qml.qrc b/qml/qml.qrc similarity index 100% rename from qml.qrc rename to qml/qml.qrc diff --git a/shared.qrc b/shared.qrc index f77686e..20004de 100644 --- a/shared.qrc +++ b/shared.qrc @@ -1,6 +1,5 @@ - OFFICAL_IFSC_STARTIGNAL.wav graphics/icons/settings.png graphics/icons/user.png graphics/icons/menu_black.png @@ -9,6 +8,7 @@ graphics/icons/menu.png graphics/icons/drawer.png graphics/icons/back.png + sounds/OFFICAL_IFSC_STARTIGNAL.wav sounds/ready_1.wav sounds/at_marks_1.wav sounds/ready_2.wav diff --git a/OFFICAL_IFSC_STARTIGNAL.wav b/sounds/OFFICAL_IFSC_STARTIGNAL.wav similarity index 100% rename from OFFICAL_IFSC_STARTIGNAL.wav rename to sounds/OFFICAL_IFSC_STARTIGNAL.wav diff --git a/appsettings.cpp b/sources/appsettings.cpp similarity index 96% rename from appsettings.cpp rename to sources/appsettings.cpp index fb352d8..4ea3e9c 100644 --- a/appsettings.cpp +++ b/sources/appsettings.cpp @@ -1,4 +1,4 @@ -#include "appsettings.h" +#include "headers/appsettings.h" AppSettings::AppSettings(QObject* parent) :QObject(parent) diff --git a/buzzerconn.cpp b/sources/buzzerconn.cpp similarity index 99% rename from buzzerconn.cpp rename to sources/buzzerconn.cpp index 6856441..8927273 100644 --- a/buzzerconn.cpp +++ b/sources/buzzerconn.cpp @@ -1,4 +1,4 @@ -#include "buzzerconn.h" +#include "headers/buzzerconn.h" BuzzerConn::BuzzerConn(QObject *parent) : QObject(parent) { diff --git a/main.cpp b/sources/main.cpp similarity index 95% rename from main.cpp rename to sources/main.cpp index b8d1882..2f7ea29 100644 --- a/main.cpp +++ b/sources/main.cpp @@ -31,10 +31,10 @@ #ifdef Q_OS_ANDROID #include #endif -#include "sqlstoragemodel.h" -#include "sqlprofilemodel.h" -#include "buzzerconn.h" -#include "appsettings.h" +#include "headers/sqlstoragemodel.h" +#include "headers/sqlprofilemodel.h" +#include "headers/buzzerconn.h" +#include "headers/appsettings.h" static void connectToDatabase() { diff --git a/sqlprofilemodel.cpp b/sources/sqlprofilemodel.cpp similarity index 97% rename from sqlprofilemodel.cpp rename to sources/sqlprofilemodel.cpp index 19a1eb2..936a38b 100644 --- a/sqlprofilemodel.cpp +++ b/sources/sqlprofilemodel.cpp @@ -1,4 +1,4 @@ -#include "sqlprofilemodel.h" +#include "headers/sqlprofilemodel.h" static void createTable() { diff --git a/sqlstoragemodel.cpp b/sources/sqlstoragemodel.cpp similarity index 66% rename from sqlstoragemodel.cpp rename to sources/sqlstoragemodel.cpp index 6354d96..925713e 100644 --- a/sqlstoragemodel.cpp +++ b/sources/sqlstoragemodel.cpp @@ -1,4 +1,4 @@ -#include "sqlstoragemodel.h" +#include "headers/sqlstoragemodel.h" SqlStorageModel::SqlStorageModel(QObject *parent) : QObject(parent) { diff --git a/speedclimbing_stopwatch.pro b/speedclimbing_stopwatch.pro index d2b6220..e6ae4e9 100644 --- a/speedclimbing_stopwatch.pro +++ b/speedclimbing_stopwatch.pro @@ -19,13 +19,13 @@ DEFINES += QT_DEPRECATED_WARNINGS TARGET = speedclimbing_stw SOURCES += \ - main.cpp \ - sqlstoragemodel.cpp \ - sqlprofilemodel.cpp \ - buzzerconn.cpp \ - appsettings.cpp + sources/main.cpp \ + sources/sqlstoragemodel.cpp \ + sources/sqlprofilemodel.cpp \ + sources/buzzerconn.cpp \ + sources/appsettings.cpp -RESOURCES += qml.qrc \ +RESOURCES += qml/qml.qrc \ shared.qrc # Additional import path used to resolve QML modules in Qt Creator's code model @@ -51,7 +51,7 @@ android { } HEADERS += \ - sqlstoragemodel.h \ - sqlprofilemodel.h \ - buzzerconn.h \ - appsettings.h + headers/sqlstoragemodel.h \ + headers/sqlprofilemodel.h \ + headers/buzzerconn.h \ + headers/appsettings.h