From 1f05363fd413f48b449039cb0ccdc78d4ba4f60a Mon Sep 17 00:00:00 2001 From: gaelle Date: Wed, 26 Mar 2025 15:53:47 +0100 Subject: [PATCH] use utils formatDate function close #LINQT-1704 remove video conference factory uri for 6.0 linphone accounts --- .../data/assistant/use-app-sip-account.rc | 2 +- Linphone/tool/Utils.cpp | 4 ++-- Linphone/tool/Utils.hpp | 2 +- Linphone/view/Control/Button/Button.qml | 2 +- .../view/Control/Button/CalendarComboBox.qml | 3 ++- .../Form/Settings/MultimediaSettings.qml | 2 +- .../Settings/AbstractSettingsLayout.qml | 4 ++-- .../Settings/AccountSettingsGeneralLayout.qml | 2 +- .../Settings/AdvancedSettingsLayout.qml | 24 +++++++++---------- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Linphone/data/assistant/use-app-sip-account.rc b/Linphone/data/assistant/use-app-sip-account.rc index 61e6ec7ee..9ff54ebfa 100644 --- a/Linphone/data/assistant/use-app-sip-account.rc +++ b/Linphone/data/assistant/use-app-sip-account.rc @@ -20,7 +20,7 @@ sip.linphone.org message-expires=2419200 sip:conference-factory@sip.linphone.org - sip:videoconference-factory@sip.linphone.org + 1 1 https://lime.linphone.org/lime-server/lime-server.php diff --git a/Linphone/tool/Utils.cpp b/Linphone/tool/Utils.cpp index 1163bc620..bba126760 100644 --- a/Linphone/tool/Utils.cpp +++ b/Linphone/tool/Utils.cpp @@ -297,14 +297,14 @@ QString Utils::formatElapsedTime(int seconds, bool dotsSeparator) { else return (h == 0 ? "" : hours + "h ") + (m == 0 ? "" : min + "min ") + sec + "s"; } -QString Utils::formatDate(const QDateTime &date, bool includeTime) { +QString Utils::formatDate(const QDateTime &date, bool includeTime, QString format) { QString dateDay; //: "Aujourd'hui" if (date.date() == QDate::currentDate()) dateDay = tr("today"); //: "Hier else if (date.date() == QDate::currentDate().addDays(-1)) dateDay = tr("yesterday"); else { - QString format = date.date().year() == QDateTime::currentDateTime(date.timeZone()).date().year() + if(format.isEmpty()) format = date.date().year() == QDateTime::currentDateTime(date.timeZone()).date().year() ? "dd MMMM" : "dd MMMM yyyy"; dateDay = App::getInstance()->getLocale().toString(date.date(), format); diff --git a/Linphone/tool/Utils.hpp b/Linphone/tool/Utils.hpp index 648b76f42..000f31e08 100644 --- a/Linphone/tool/Utils.hpp +++ b/Linphone/tool/Utils.hpp @@ -87,7 +87,7 @@ public: Q_INVOKABLE static QString createAvatar(const QUrl &fileUrl); // Return the avatar path Q_INVOKABLE static QString formatElapsedTime(int seconds, bool dotsSeparator = true); // Return the elapsed time formated - Q_INVOKABLE static QString formatDate(const QDateTime &date, bool includeTime = true); // Return the date formated + Q_INVOKABLE static QString formatDate(const QDateTime &date, bool includeTime = true, QString format = ""); // Return the date formated Q_INVOKABLE static QString formatDateElapsedTime(const QDateTime &date); Q_INVOKABLE static QString formatTime(const QDateTime &date); // Return the time formated Q_INVOKABLE static QStringList generateSecurityLettersArray(int arraySize, int correctIndex, QString correctCode); diff --git a/Linphone/view/Control/Button/Button.qml b/Linphone/view/Control/Button/Button.qml index 8ce120ba3..2a152b1a8 100644 --- a/Linphone/view/Control/Button/Button.qml +++ b/Linphone/view/Control/Button/Button.qml @@ -32,7 +32,7 @@ Control.Button { property var contentImageColor: style?.image?.normal || DefaultStyle.main2_600 property var hoveredImageColor: style?.image?.pressed || Qt.darker(contentImageColor, 1.05) property var pressedImageColor: style?.image?.pressed || Qt.darker(contentImageColor, 1.1) - property bool asynchronous: true + property bool asynchronous: false spacing: Math.round(5 * DefaultStyle.dp) hoverEnabled: enabled activeFocusOnTab: true diff --git a/Linphone/view/Control/Button/CalendarComboBox.qml b/Linphone/view/Control/Button/CalendarComboBox.qml index 7fb71c9d7..765b54675 100644 --- a/Linphone/view/Control/Button/CalendarComboBox.qml +++ b/Linphone/view/Control/Button/CalendarComboBox.qml @@ -3,6 +3,7 @@ import QtQuick.Controls.Basic as Control import QtQuick.Effects import QtQuick.Layouts import Linphone +import UtilsCpp ComboBox { id: mainItem @@ -12,7 +13,7 @@ ComboBox { property alias contentText: contentText contentItem: Text { id: contentText - text: Qt.formatDate(calendar.selectedDate, "ddd d, MMMM") + text: UtilsCpp.formatDate(calendar.selectedDate, false, "ddd d, MMMM") anchors.fill: parent anchors.leftMargin: Math.round(15 * DefaultStyle.dp) anchors.verticalCenter: parent.verticalCenter diff --git a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml index e2f005d3a..c2483a89e 100644 --- a/Linphone/view/Control/Form/Settings/MultimediaSettings.qml +++ b/Linphone/view/Control/Form/Settings/MultimediaSettings.qml @@ -40,7 +40,7 @@ ColumnLayout { imageHeight: Math.round(24 * DefaultStyle.dp) } Text { - //: "Sonnerie - Appels entrants" + //: Ringtone - Incoming calls text: qsTr("multimedia_settings_ringer_title") font: Typography.p2l color: DefaultStyle.main2_600 diff --git a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml index 7f7a11ba7..ccd744fbc 100644 --- a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml @@ -131,10 +131,10 @@ Rectangle { height: contentHeight spacing: Math.round(10 * DefaultStyle.dp) delegate: ColumnLayout { - visible: modelData?.visible + visible: modelData.visible != undefined ? modelData.visible: true + Component.onCompleted: if (!visible) height = 0 spacing: Math.round(16 * DefaultStyle.dp) width: contentListView.width - height: visible ? childrenRect.height: 0 Rectangle { visible: index !== 0 Layout.topMargin: Math.round((modelData.hideTopSeparator ? 0 : 16) * DefaultStyle.dp) diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml index 0ef14bdfc..86b596464 100644 --- a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml @@ -150,7 +150,7 @@ AbstractSettingsLayout { toValidate: true } Text { - //: "Indicatif international*" + //: Indicatif international* text: qsTr("manage_account_international_prefix") color: DefaultStyle.main2_600 font: Typography.p2l diff --git a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml index 0f8cc5e63..cb5a9fb74 100644 --- a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml @@ -12,32 +12,32 @@ AbstractSettingsLayout { width: parent?.width contentModel: [ { - //: "Système" + //: System title: qsTr("settings_system_title"), subTitle: "", contentComponent: systemComponent }, { - //: "Configuration distante" + //: Remote provisioning title: qsTr("settings_remote_provisioning_title"), subTitle: "", contentComponent: remoteProvisioningComponent, hideTopSeparator: true }, { - //: "Sécurité / Chiffrement" + //: Security / Encryption title: qsTr("settings_security_title"), subTitle: "", contentComponent: securityComponent, }, { - //: "Codecs audio" + //: Audio codecs title: qsTr("settings_advanced_audio_codecs_title"), subTitle: "", contentComponent: audioCodecsComponent, }, { - //: "Codecs vidéo" + //: Video codecs title: qsTr("settings_advanced_video_codecs_title"), subTitle: "", contentComponent: videoCodecsComponent @@ -63,7 +63,7 @@ AbstractSettingsLayout { spacing: Math.round(40 * DefaultStyle.dp) SwitchSetting { Layout.fillWidth: true - //: "Démarrer automatiquement %1" + //: Auto start %1 titleText: qsTr("settings_advanced_auto_start_title").arg(applicationName) propertyName: "autoStart" propertyOwner: SettingsCpp @@ -81,14 +81,14 @@ AbstractSettingsLayout { DecoratedTextField { Layout.fillWidth: true id: configUri - //: "URL de configuration distante" + //: Remote provisioning URL title: qsTr("settings_advanced_remote_provisioning_url") toValidate: true } SmallButton { Layout.topMargin: -Math.round(20 * DefaultStyle.dp) Layout.alignment: Qt.AlignRight - //: "Télécharger et appliquer" + //: Download and apply text: qsTr("settings_advanced_download_apply_remote_provisioning") style: ButtonStyle.tertiary onClicked: { @@ -96,7 +96,7 @@ AbstractSettingsLayout { if (UtilsCpp.isValidURL(url)) UtilsCpp.useFetchConfig(configUri.value()) else - //: "Format d'url invalide" + //: Invalid URL format UtilsCpp.showInformationPopup(qsTr("information_popup_error_title"), qsTr("settings_advanced_invalid_url_message"), false, UtilsCpp.getMainWindow()) } } @@ -110,7 +110,7 @@ AbstractSettingsLayout { ColumnLayout { spacing: Math.round(5 * DefaultStyle.dp) Text { - //: "Chiffrement du média" + //: Media encryption text: qsTr("settings_advanced_media_encryption_title") font { pixelSize: Typography.p2l.pixelSize @@ -123,12 +123,12 @@ AbstractSettingsLayout { entries: SettingsCpp.mediaEncryptions propertyName: "mediaEncryption" textRole: 'display_name' - propertyOwner: SettingsCpp + propertyOwner: SettingsCpp } } SwitchSetting { Layout.fillWidth: true - //: "Chiffrement du média obligatoire" + //: Media encryption mandatory titleText: qsTr("settings_advanced_media_encryption_mandatory_title") propertyName: "mediaEncryptionMandatory" propertyOwner: SettingsCpp