From 7657de1176d712fb456184b905f95714cad91447 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 28 Jul 2021 15:06:08 -0400
Subject: [PATCH] ringtones: use correct default ringtone folder for FileDialog
Change-Id: I95c4713ffdb8e772dcea3edc5cdeb0eaa1080c75
---
src/settingsview/components/AdvancedCallSettings.qml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/settingsview/components/AdvancedCallSettings.qml b/src/settingsview/components/AdvancedCallSettings.qml
index db9c69c0b..5e1eb0611 100644
--- a/src/settingsview/components/AdvancedCallSettings.qml
+++ b/src/settingsview/components/AdvancedCallSettings.qml
@@ -77,12 +77,10 @@ ColumnLayout {
JamiFileDialog {
id: ringtonePath_Dialog
- property string oldPath : SettingsAdapter.getAccountConfig_Ringtone_RingtonePath()
- property string openPath : oldPath === "" ? (UtilsAdapter.getCurrentPath() + "/ringtones/") : (UtilsAdapter.toFileAbsolutepath(oldPath))
-
mode: JamiFileDialog.OpenFile
title: JamiStrings.selectNewRingtone
- folder: openPath
+ folder: JamiQmlUtils.qmlFilePrefix + UtilsAdapter.toFileAbsolutepath(
+ SettingsAdapter.getAccountConfig_Ringtone_RingtonePath())
nameFilters: [qsTr("Audio Files") + " (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)", qsTr(
"All files") + " (*)"]
--
GitLab