diff options
Diffstat (limited to 'examples/tutorials/drumpad')
13 files changed, 11 insertions, 16 deletions
diff --git a/examples/tutorials/drumpad/final_project/Drumpad.qmlproject b/examples/tutorials/drumpad/final_project/Drumpad.qmlproject index 591606bce..d3105e3ca 100644 --- a/examples/tutorials/drumpad/final_project/Drumpad.qmlproject +++ b/examples/tutorials/drumpad/final_project/Drumpad.qmlproject @@ -43,7 +43,7 @@ Project { } Files { - directory: "../Sounds" + directory: "Sounds" filter: "*.mp3;*.wav" } diff --git a/examples/tutorials/drumpad/final_project/Drumpad.qrc b/examples/tutorials/drumpad/final_project/Drumpad.qrc index b856a46a9..678687255 100644 --- a/examples/tutorials/drumpad/final_project/Drumpad.qrc +++ b/examples/tutorials/drumpad/final_project/Drumpad.qrc @@ -13,11 +13,11 @@ <file>DrumpadContent/MainScreen.qml</file> <file>DrumpadContent/qmldir</file> <file>qtquickcontrols2.conf</file> - <file>../Sounds/Bongo Loop 125bpm.wav</file> - <file>../Sounds/Clap.wav</file> - <file>../Sounds/Closed Hat.wav</file> - <file>../Sounds/Kick Drum.wav</file> - <file>../Sounds/Open Hat.wav</file> - <file>../Sounds/Sine Bass Ebm.wav</file> + <file>Sounds/Bongo Loop 125bpm.wav</file> + <file>Sounds/Clap.wav</file> + <file>Sounds/Closed Hat.wav</file> + <file>Sounds/Kick Drum.wav</file> + <file>Sounds/Open Hat.wav</file> + <file>Sounds/Sine Bass Ebm.wav</file> </qresource> </RCC> diff --git a/examples/tutorials/drumpad/final_project/Drumpad/AvailableSoundsComboBox.qml b/examples/tutorials/drumpad/final_project/Drumpad/AvailableSoundsComboBox.qml index e0e6a72ba..2a3330d05 100644 --- a/examples/tutorials/drumpad/final_project/Drumpad/AvailableSoundsComboBox.qml +++ b/examples/tutorials/drumpad/final_project/Drumpad/AvailableSoundsComboBox.qml @@ -9,7 +9,7 @@ import Audio ComboBox { id: root - property string currentFile: currentText ? `../Sounds/${currentText}` : "" + property string currentFile: currentText ? `Sounds/${currentText}` : "" required property int initialIndex model: audioFilesModel.getModel() diff --git a/examples/tutorials/drumpad/final_project/Python/audio/audio_files_model.py b/examples/tutorials/drumpad/final_project/Python/audio/audio_files_model.py index bdf7cd61e..b92bc2473 100644 --- a/examples/tutorials/drumpad/final_project/Python/audio/audio_files_model.py +++ b/examples/tutorials/drumpad/final_project/Python/audio/audio_files_model.py @@ -26,4 +26,4 @@ class AudioFilesModel(QObject): audio_files.append(resource.split(resource_prefix)[-1]) return audio_files - return list(p.name for p in Path(project_root / ".." / "Sounds").glob("*.wav")) + return list(p.name for p in Path(project_root / "Sounds").glob("*.wav")) diff --git a/examples/tutorials/drumpad/Sounds/Bongo Loop 125bpm.wav b/examples/tutorials/drumpad/final_project/Sounds/Bongo Loop 125bpm.wav Binary files differindex b90bc45e8..b90bc45e8 100644 --- a/examples/tutorials/drumpad/Sounds/Bongo Loop 125bpm.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Bongo Loop 125bpm.wav diff --git a/examples/tutorials/drumpad/Sounds/Clap.wav b/examples/tutorials/drumpad/final_project/Sounds/Clap.wav Binary files differindex aceee331c..aceee331c 100644 --- a/examples/tutorials/drumpad/Sounds/Clap.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Clap.wav diff --git a/examples/tutorials/drumpad/Sounds/Closed Hat.wav b/examples/tutorials/drumpad/final_project/Sounds/Closed Hat.wav Binary files differindex d062e723a..d062e723a 100644 --- a/examples/tutorials/drumpad/Sounds/Closed Hat.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Closed Hat.wav diff --git a/examples/tutorials/drumpad/Sounds/Kick Drum.wav b/examples/tutorials/drumpad/final_project/Sounds/Kick Drum.wav Binary files differindex e28337136..e28337136 100644 --- a/examples/tutorials/drumpad/Sounds/Kick Drum.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Kick Drum.wav diff --git a/examples/tutorials/drumpad/Sounds/Open Hat.wav b/examples/tutorials/drumpad/final_project/Sounds/Open Hat.wav Binary files differindex e6fcb130c..e6fcb130c 100644 --- a/examples/tutorials/drumpad/Sounds/Open Hat.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Open Hat.wav diff --git a/examples/tutorials/drumpad/Sounds/Sine Bass Ebm.wav b/examples/tutorials/drumpad/final_project/Sounds/Sine Bass Ebm.wav Binary files differindex 5925d0fcf..5925d0fcf 100644 --- a/examples/tutorials/drumpad/Sounds/Sine Bass Ebm.wav +++ b/examples/tutorials/drumpad/final_project/Sounds/Sine Bass Ebm.wav diff --git a/examples/tutorials/drumpad/initial_project/Drumpad.qmlproject b/examples/tutorials/drumpad/initial_project/Drumpad.qmlproject index 5e5414ae2..b92c65cbb 100644 --- a/examples/tutorials/drumpad/initial_project/Drumpad.qmlproject +++ b/examples/tutorials/drumpad/initial_project/Drumpad.qmlproject @@ -43,7 +43,7 @@ Project { } Files { - directory: "../Sounds" + directory: "Sounds" filter: "*.mp3;*.wav" } diff --git a/examples/tutorials/drumpad/initial_project/Drumpad.qrc b/examples/tutorials/drumpad/initial_project/Drumpad.qrc index b856a46a9..7415635bc 100644 --- a/examples/tutorials/drumpad/initial_project/Drumpad.qrc +++ b/examples/tutorials/drumpad/initial_project/Drumpad.qrc @@ -13,11 +13,6 @@ <file>DrumpadContent/MainScreen.qml</file> <file>DrumpadContent/qmldir</file> <file>qtquickcontrols2.conf</file> - <file>../Sounds/Bongo Loop 125bpm.wav</file> - <file>../Sounds/Clap.wav</file> - <file>../Sounds/Closed Hat.wav</file> - <file>../Sounds/Kick Drum.wav</file> - <file>../Sounds/Open Hat.wav</file> - <file>../Sounds/Sine Bass Ebm.wav</file> + <file>Sounds/Clap.wav</file> </qresource> </RCC> diff --git a/examples/tutorials/drumpad/initial_project/Sounds/Clap.wav b/examples/tutorials/drumpad/initial_project/Sounds/Clap.wav Binary files differnew file mode 100644 index 000000000..aceee331c --- /dev/null +++ b/examples/tutorials/drumpad/initial_project/Sounds/Clap.wav |