ImportFromDevicePage: allow confirm for all cases

Change-Id: Id4848a5d8f87a5d0321e7b13870bb717341db041
3rdparty: bump md4c
2025-10-30 07:53:33 +08:00 · 2025-09-10 12:18:51 -04:00 · 2025-09-09 09:53:54 -04:00 · 2025-09-08 17:01:56 -04:00 · 2025-09-08 12:58:59 -04:00
7 changed files with 12 additions and 12 deletions
--- a/3rdparty/md4c
+++ b/3rdparty/md4c
--- a/2
+++ b/2
--- a/src/app/settingsview/components/AdvancedJamiSecuritySettings.qml
+++ b/src/app/settingsview/components/AdvancedJamiSecuritySettings.qml
@ -65,7 +65,7 @@ ColumnLayout {
            titleField: JamiStrings.caCertificate
            itemWidth: root.itemWidth

-            onClick: openFileDialog(JamiStrings.selectCACert, CurrentAccount.certificateListFile_TLS, JamiStrings.certificateFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectCACert, CurrentAccount.certificateListFile_TLS, JamiStrings.certificateFile, function (file) {
                    CurrentAccount.certificateListFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
@ -80,7 +80,7 @@ ColumnLayout {
            titleField: JamiStrings.userCertificate
            itemWidth: root.itemWidth

-            onClick: openFileDialog(JamiStrings.selectUserCert, CurrentAccount.certificateFile_TLS, JamiStrings.certificateFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectUserCert, CurrentAccount.certificateFile_TLS, JamiStrings.certificateFile, function (file) {
                    CurrentAccount.certificateFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
@ -95,7 +95,7 @@ ColumnLayout {
            titleField: JamiStrings.privateKey
            itemWidth: root.itemWidth

-            onClick: openFileDialog(JamiStrings.selectPrivateKey, CurrentAccount.privateKeyFile_TLS, JamiStrings.keyFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectPrivateKey, CurrentAccount.privateKeyFile_TLS, JamiStrings.keyFile, function (file) {
                    CurrentAccount.privateKeyFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
--- a/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
+++ b/src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
@ -84,7 +84,7 @@ ColumnLayout {
            textField: UtilsAdapter.toFileInfoName(CurrentAccount.certificateListFile_TLS) !== "" ? UtilsAdapter.toFileInfoName(CurrentAccount.certificateListFile_TLS) : JamiStrings.selectCACertDefault
            itemWidth: root.itemWidth

-            onClick: openFileDialog(JamiStrings.selectCACert, CurrentAccount.certificateListFile_TLS, JamiStrings.certificateFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectCACert, CurrentAccount.certificateListFile_TLS, JamiStrings.certificateFile, function (file) {
                    CurrentAccount.certificateListFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
@ -99,7 +99,7 @@ ColumnLayout {
            itemWidth: root.itemWidth
            textField: UtilsAdapter.toFileInfoName(CurrentAccount.certificateFile_TLS) !== "" ? UtilsAdapter.toFileInfoName(CurrentAccount.certificateFile_TLS) : JamiStrings.selectCACertDefault

-            onClick: openFileDialog(JamiStrings.selectUserCert, CurrentAccount.certificateFile_TLS, JamiStrings.certificateFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectUserCert, CurrentAccount.certificateFile_TLS, JamiStrings.certificateFile, function (file) {
                    CurrentAccount.certificateFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
@ -114,7 +114,7 @@ ColumnLayout {
            itemWidth: root.itemWidth
            textField: UtilsAdapter.toFileInfoName(CurrentAccount.privateKeyFile_TLS) !== "" ? UtilsAdapter.toFileInfoName(CurrentAccount.privateKeyFile_TLS) : JamiStrings.selectCACertDefault

-            onClick: openFileDialog(JamiStrings.selectPrivateKey, CurrentAccount.privateKeyFile_TLS, JamiStrings.keyFile, function (file) {
+            onSettingMaterialButtonClicked: openFileDialog(JamiStrings.selectPrivateKey, CurrentAccount.privateKeyFile_TLS, JamiStrings.keyFile, function (file) {
                    CurrentAccount.privateKeyFile_TLS = UtilsAdapter.getAbsPath(file.toString());
                })
        }
--- a/src/app/settingsview/components/CallSettingsPage.qml
+++ b/src/app/settingsview/components/CallSettingsPage.qml
@ -154,7 +154,7 @@ SettingsPageBase {
                titleField: JamiStrings.selectCustomRingtone
                itemWidth: root.itemWidth

-                onClick: {
+                onSettingMaterialButtonClicked: {
                    var dlg = viewCoordinator.presentDialog(appWindow, "commoncomponents/JamiFileDialog.qml", {
                            "title": JamiStrings.selectNewRingtone,
                            "fileMode": JamiFileDialog.OpenFile,
--- a/src/app/settingsview/components/SettingMaterialButton.qml
+++ b/src/app/settingsview/components/SettingMaterialButton.qml
@ -31,7 +31,7 @@ RowLayout {
    property string source
    property int itemWidth

-    signal click
+    signal settingMaterialButtonClicked

    Text {
        id: title
@ -59,6 +59,6 @@ RowLayout {
        iconSource: root.source
        secondary: true

-        onClicked: click()
+        onClicked: settingMaterialButtonClicked()
    }
 }
--- a/src/app/wizardview/components/ImportFromDevicePage.qml
+++ b/src/app/wizardview/components/ImportFromDevicePage.qml
@ -291,7 +291,7 @@ Rectangle {
                    id: confirmButton
                    text: JamiStrings.optionConfirm
                    primary: true
-                    enabled: !passwordField.visible || passwordField.dynamicText.length > 0
+                    enabled: true
                    onClicked: {
                        AccountAdapter.provideAccountAuthentication(passwordField.visible ? passwordField.dynamicText : "");
                    }
Author	SHA1	Message	Date
Ilyas Erdogan	ca02cf172a	ImportFromDevicePage: allow confirm for all cases Change-Id: Id4848a5d8f87a5d0321e7b13870bb717341db041	2025-09-10 12:18:51 -04:00
François-Simon Fauteux-Chapleau	ba44b70f97	3rdparty: bump md4c This reverts the change that was accidentally made in commit `22be4be864`. Change-Id: Id51fe4b8edafa57c1152872460a2f60ace222826	2025-09-09 09:53:54 -04:00
François-Simon Fauteux-Chapleau	87e38c2bf5	misc: bump daemon This fixes an issue where Jami was looking for ringtones in the wrong directory and was therefore forced to fall back on the default one. Change-Id: Iba64e839e75b7e6bf4210b6398dd5002dd4adf99	2025-09-08 17:01:56 -04:00
François-Simon Fauteux-Chapleau	98a300d36f	SettingMaterialButton: fix method name conflict The call to click() in SettingMaterialButton used to send a custom signal, but now that we are on Qt 6.8, it calls the underlying button's click method, thus resulting in an infinite loop of clicks (which eventually gets interrupted by the QML engine with a "Maximum call stack exceeded" error). GitLab: #2091 Change-Id: Id56c7f1b9d7cb302c7d3363d3b11dbd01cf938db	2025-09-08 12:58:59 -04:00