From 74d6207417ae8ff597ecec6c852ffed4f6668650 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 28 Aug 2020 16:14:09 -0400
Subject: [PATCH] advancedsettings: make the text of file dialog open buttons
synchronous with file change
Gitlab: #34
Change-Id: Ib8814bdc917411a3e07b98779f5463d18ae314fb
---
src/settingsview/components/AdvancedSIPSettingsView.qml | 8 ++++----
src/settingsview/components/AdvancedSettingsView.qml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/settingsview/components/AdvancedSIPSettingsView.qml b/src/settingsview/components/AdvancedSIPSettingsView.qml
index b552ca3bd..7c76b2d0b 100644
--- a/src/settingsview/components/AdvancedSIPSettingsView.qml
+++ b/src/settingsview/components/AdvancedSIPSettingsView.qml
@@ -200,7 +200,7 @@ ColumnLayout {
function changeRingtonePath(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_RingtonePath(url)
- btnRingtoneSIP.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_Ringtone_RingtonePath())
+ btnRingtoneSIP.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
} else if (ClientWrapper.settingsAdaptor.getAccountConfig_Ringtone_RingtonePath().length === 0){
btnRingtoneSIP.text = qsTr("Add a custom ringtone")
}
@@ -209,21 +209,21 @@ ColumnLayout {
function changeFileCACert(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FileCACert(url)
- btnSIPCACert.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_CertificateListFile())
+ btnSIPCACert.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
function changeFileUserCert(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FileUserCert(url)
- btnSIPUserCert.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_CertificateFile())
+ btnSIPUserCert.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
function changeFilePrivateKey(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FilePrivateKey(url)
- btnSIPPrivateKey.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_PrivateKeyFile())
+ btnSIPPrivateKey.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
diff --git a/src/settingsview/components/AdvancedSettingsView.qml b/src/settingsview/components/AdvancedSettingsView.qml
index 0268bf388..fd5773bba 100644
--- a/src/settingsview/components/AdvancedSettingsView.qml
+++ b/src/settingsview/components/AdvancedSettingsView.qml
@@ -131,7 +131,7 @@ ColumnLayout {
function changeRingtonePath(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_RingtonePath(url)
- btnRingtone.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_Ringtone_RingtonePath())
+ btnRingtone.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
} else if (ClientWrapper.settingsAdaptor.getAccountConfig_Ringtone_RingtonePath().length === 0){
btnRingtone.text = qsTr("Add a custom ringtone")
}
@@ -140,21 +140,21 @@ ColumnLayout {
function changeFileCACert(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FileCACert(url)
- btnCACert.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_CertificateListFile())
+ btnCACert.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
function changeFileUserCert(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FileUserCert(url)
- btnUserCert.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_CertificateFile())
+ btnUserCert.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
function changeFilePrivateKey(url){
if(url.length !== 0) {
ClientWrapper.settingsAdaptor.set_FilePrivateKey(url)
- btnPrivateKey.text = ClientWrapper.utilsAdaptor.toFileInfoName(ClientWrapper.settingsAdaptor.getAccountConfig_TLS_PrivateKeyFile())
+ btnPrivateKey.text = ClientWrapper.utilsAdaptor.toFileInfoName(url)
}
}
--
GitLab