diff --git a/qml/Components/FadeAnimation.qml b/qml/Components/FadeAnimation.qml
index e73f35f..90a5980 100644
--- a/qml/Components/FadeAnimation.qml
+++ b/qml/Components/FadeAnimation.qml
@@ -30,21 +30,42 @@ SequentialAnimation {
property alias outEasingType: outAnimation.easing.type
property alias inEasingType: inAnimation.easing.type
property string easingType: "Quad"
+ ParallelAnimation {
NumberAnimation { // in the default case, fade scale to 0
id: outAnimation
target: root.target
- property: root.fadeProperty
+ property: "scale"
+ duration: root.fadeDuration_in
+ to: 0.9
+ easing.type: Easing["In"+root.easingType]
+ }
+ NumberAnimation { // in the default case, fade scale to 0
+ id: outAnimation2
+ target: root.target
+ property: "opacity"
duration: root.fadeDuration_in
to: 0
easing.type: Easing["In"+root.easingType]
}
- PropertyAction { } // actually change the property targeted by the Behavior between the 2 other animations
- NumberAnimation { // in the default case, fade scale back to 1
- id: inAnimation
- target: root.target
- property: root.fadeProperty
- duration: root.fadeDuration_out
- to: 1
- easing.type: Easing["Out"+root.easingType]
}
+ PropertyAction { } // actually change the property targeted by the Behavior between the 2 other animations
+ ParallelAnimation {
+ NumberAnimation { // in the default case, fade scale back to 1
+ id: inAnimation
+ target: root.target
+ property: root.fadeProperty
+ duration: root.fadeDuration_out
+ to: 1
+ easing.type: Easing["Out"+root.easingType]
+ }
+ NumberAnimation { // in the default case, fade scale to 0
+ id: inAnimation2
+ target: root.target
+ property: "opacity"
+ duration: root.fadeDuration_in
+ to: 1
+ easing.type: Easing["In"+root.easingType]
+ }
+ }
+
}
diff --git a/qml/main.qml b/qml/main.qml
index 310268e..7856f4d 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -31,7 +31,7 @@ Window {
visible: true
width: 640
height: 480
- title: qsTr("Hello World")
+ title: qsTr("Speed climbing reaction trainer")
Page {
id: app
@@ -75,7 +75,7 @@ Window {
SoundEffect {
id: startSe
- source: "qrc:/sounds/OFFICAL_IFSC_STARTIGNAL.wav"
+ source: "qrc:/sounds/IFSC_STARTSIGNAL_SINE.wav"
muted: app.state === "WAITING"
@@ -94,7 +94,7 @@ Window {
SoundEffect {
id: failedSe
- source: "qrc:/sounds/false.wav"
+ source: "qrc:/sounds/IFSC frequenzy conform false start sound.wav"
}
}
diff --git a/shared/shared.qrc b/shared/shared.qrc
index 96d201d..f780bf6 100644
--- a/shared/shared.qrc
+++ b/shared/shared.qrc
@@ -1,8 +1,7 @@
- sounds/at_marks_1.wav
- sounds/OFFICAL_IFSC_STARTIGNAL.wav
sounds/ready_1.wav
- sounds/false.wav
+ sounds/IFSC_STARTSIGNAL_SINE.wav
+ sounds/IFSC frequenzy conform false start sound.wav
diff --git a/shared/sounds/IFSC frequenzy conform false start sound.wav b/shared/sounds/IFSC frequenzy conform false start sound.wav
new file mode 100644
index 0000000..d65ac46
Binary files /dev/null and b/shared/sounds/IFSC frequenzy conform false start sound.wav differ
diff --git a/shared/sounds/IFSC_STARTSIGNAL_SINE.wav b/shared/sounds/IFSC_STARTSIGNAL_SINE.wav
new file mode 100644
index 0000000..c04ad24
Binary files /dev/null and b/shared/sounds/IFSC_STARTSIGNAL_SINE.wav differ
diff --git a/shared/sounds/OFFICAL_IFSC_STARTIGNAL.wav b/shared/sounds/OFFICAL_IFSC_STARTIGNAL.wav
deleted file mode 100644
index b3aa454..0000000
Binary files a/shared/sounds/OFFICAL_IFSC_STARTIGNAL.wav and /dev/null differ
diff --git a/shared/sounds/at_marks_1.wav b/shared/sounds/at_marks_1.wav
deleted file mode 100644
index f73c703..0000000
Binary files a/shared/sounds/at_marks_1.wav and /dev/null differ
diff --git a/shared/sounds/at_marks_2.wav b/shared/sounds/at_marks_2.wav
deleted file mode 100644
index 54494c0..0000000
Binary files a/shared/sounds/at_marks_2.wav and /dev/null differ
diff --git a/shared/sounds/false.wav b/shared/sounds/false.wav
deleted file mode 100644
index ae4daa7..0000000
Binary files a/shared/sounds/false.wav and /dev/null differ
diff --git a/shared/sounds/ready_2.wav b/shared/sounds/ready_2.wav
deleted file mode 100644
index abe5032..0000000
Binary files a/shared/sounds/ready_2.wav and /dev/null differ
diff --git a/shared/sounds/sounds.aup b/shared/sounds/sounds.aup
deleted file mode 100644
index 65a9068..0000000
--- a/shared/sounds/sounds.aup
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/shared/sounds/sounds_data/e00/d00/e0000260.au b/shared/sounds/sounds_data/e00/d00/e0000260.au
deleted file mode 100644
index 2a99728..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000260.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000290.au b/shared/sounds/sounds_data/e00/d00/e0000290.au
deleted file mode 100644
index ecea0e6..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000290.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000457.au b/shared/sounds/sounds_data/e00/d00/e0000457.au
deleted file mode 100644
index 2a99728..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000457.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000542.au b/shared/sounds/sounds_data/e00/d00/e0000542.au
deleted file mode 100644
index fbc4417..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000542.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000714.au b/shared/sounds/sounds_data/e00/d00/e0000714.au
deleted file mode 100644
index 9ed3dfc..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000714.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000996.au b/shared/sounds/sounds_data/e00/d00/e0000996.au
deleted file mode 100644
index ecea0e6..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000996.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e00009d0.au b/shared/sounds/sounds_data/e00/d00/e00009d0.au
deleted file mode 100644
index 9ed3dfc..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e00009d0.au and /dev/null differ
diff --git a/shared/sounds/sounds_data/e00/d00/e0000ce4.au b/shared/sounds/sounds_data/e00/d00/e0000ce4.au
deleted file mode 100644
index fbc4417..0000000
Binary files a/shared/sounds/sounds_data/e00/d00/e0000ce4.au and /dev/null differ