diff --git a/ui/app/AppLayouts/Profile/Sections/SoundsContainer.qml b/ui/app/AppLayouts/Profile/Sections/SoundsContainer.qml index a674dbb81a..7c030dfd13 100644 --- a/ui/app/AppLayouts/Profile/Sections/SoundsContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/SoundsContainer.qml @@ -24,7 +24,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 24 //% "Sound volume" - text: qsTrId("sound-volume") + " " + volume.value + text: qsTrId("sound-volume") + " " + volume.value.toPrecision(1) font.pixelSize: 15 } diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml index 5f5f0dc9f4..19d3586663 100644 --- a/ui/app/AppMain.qml +++ b/ui/app/AppMain.qml @@ -4,7 +4,6 @@ import QtQuick.Layouts 1.13 import QtMultimedia 5.13 import utils 1.0 -import "../sounds" import "../shared" import "../shared/status" import "../shared/popups" @@ -151,24 +150,19 @@ Item { } } - ErrorSound { + Audio { id: errorSound + track: "error.mp3" } Audio { id: sendMessageSound - audioRole: Audio.NotificationRole - source: "../../../../sounds/send_message.wav" - volume: appSettings.volume - muted: !appSettings.notificationSoundsEnabled + track: "send_message.wav" } Audio { id: notificationSound - audioRole: Audio.NotificationRole - source: "../../../../sounds/notification.wav" - volume: appSettings.volume - muted: !appSettings.notificationSoundsEnabled + track: "notification.wav" } ModuleWarning { diff --git a/ui/sounds/error.mp3 b/ui/imports/assets/audio/error.mp3 similarity index 100% rename from ui/sounds/error.mp3 rename to ui/imports/assets/audio/error.mp3 diff --git a/ui/sounds/notification.wav b/ui/imports/assets/audio/notification.wav similarity index 100% rename from ui/sounds/notification.wav rename to ui/imports/assets/audio/notification.wav diff --git a/ui/sounds/send_message.wav b/ui/imports/assets/audio/send_message.wav similarity index 100% rename from ui/sounds/send_message.wav rename to ui/imports/assets/audio/send_message.wav diff --git a/ui/sounds/ErrorSound.qml b/ui/imports/utils/Audio.qml similarity index 58% rename from ui/sounds/ErrorSound.qml rename to ui/imports/utils/Audio.qml index d381907bf5..676a11ea74 100644 --- a/ui/sounds/ErrorSound.qml +++ b/ui/imports/utils/Audio.qml @@ -2,15 +2,12 @@ import QtQuick 2.13 import QtMultimedia 5.13 Audio { - id: errorSound - source: "./error.mp3" + id: audio + + property string track: "error.mp3" + + source: Qt.resolvedUrl("./../assets/audio" + track) audioRole: Audio.NotificationRole volume: appSettings.volume muted: !appSettings.notificationSoundsEnabled -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ +} \ No newline at end of file diff --git a/ui/imports/utils/qmldir b/ui/imports/utils/qmldir index fefb75e68d..84a3aacf94 100644 --- a/ui/imports/utils/qmldir +++ b/ui/imports/utils/qmldir @@ -5,3 +5,4 @@ singleton Config 1.0 Config.qml singleton Constants 1.0 Constants.qml singleton SelectedMessage 1.0 SelectedMessage.qml singleton Backpressure 1.0 Backpressure/Backpressure.qml +Audio 1.0 Audio.qml diff --git a/ui/main.qml b/ui/main.qml index ffe4be2307..f5e864aaf8 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -13,7 +13,6 @@ import DotherSide 0.1 import "./app/AppLayouts/Onboarding/views" import "./app" -import "./sounds" import "./shared" import utils 1.0 diff --git a/ui/sounds/qmldir b/ui/sounds/qmldir deleted file mode 100644 index b164a19b21..0000000000 --- a/ui/sounds/qmldir +++ /dev/null @@ -1 +0,0 @@ -ErrorSound 1.0 ErrorSound.qml