diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt index 72c237256..22c084ae6 100644 --- a/Linphone/CMakeLists.txt +++ b/Linphone/CMakeLists.txt @@ -98,19 +98,11 @@ endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") -if(${Qt6_VERSION} VERSION_LESS "6.9.0") - message( FATAL_ERROR "Linphone requires Qt6.9.0 or newer. Exiting CMake." ) +if(${Qt6_VERSION} VERSION_LESS "6.10.0") + message( FATAL_ERROR "Linphone requires Qt 6.10.0 or newer. Exiting CMake." ) endif() -if(${Qt6_VERSION} VERSION_LESS "6.3.0") - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - set(CMAKE_AUTOUIC ON) -else() - qt6_standard_project_setup() -endif() - - +qt6_standard_project_setup() ################################################################ diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 2f290f930..29533ab37 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -450,6 +450,7 @@ void App::setSelf(QSharedPointer(me)) { QString downloadLink = QStringLiteral("%2") .arg(url) + //: Download it ! .arg(tr("info_popup_new_version_download_label")); Utils::showInformationPopup( //: New version available ! diff --git a/Linphone/data/languages/de.ts b/Linphone/data/languages/de.ts index 045d4b8ab..a95da044e 100644 --- a/Linphone/data/languages/de.ts +++ b/Linphone/data/languages/de.ts @@ -599,13 +599,13 @@ Pflicht zur Medienverschlüsselung - + settings_advanced_create_endtoend_encrypted_meetings_title Create end to end encrypted meetings and group calls Erstelle Ende-zu-Ende verschlüsselte Konferenzen und Gruppenrufe - + settings_advanced_hide_fps_title FPS ausblenden @@ -634,141 +634,141 @@ App - + remote_provisioning_dialog Voulez-vous télécharger et appliquer la configuration depuis cette adresse ? Möchten Sie die Remote-Konfiguration von dieser Adresse herunterladen und anwenden? - - - + + + info_popup_error_title Error Fehler - - + + info_popup_configuration_failed_message Remote provisioning failed : %1 - + info_popup_error_checking_update An error occured while trying to check update. Please try again later or contact support team. - + info_popup_new_version_download_label - + info_popup_new_version_available_title New version available ! - + info_popup_new_version_available_message A new version of Linphone (%1) is available. %2 - + info_popup_version_up_to_date_title - + info_popup_version_up_to_date_message Your version is up to date - + configuration_error_detail not reachable - + application_description "A free and open source SIP video-phone." Ein kostenloses Open-Source SIP Video-Telefon. - + command_line_arg_order "Send an order to the application towards a command line" Kommandozeilen-Befehl an die Anwendung schicken - + command_line_option_show_help Zeige Hilfe - + command_line_option_show_app_version App-Version anzeigen - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, Pfad oder Datei - + command_line_option_minimized - + command_line_option_log_to_stdout Debug-Informationen auf der Standardausgabe ausgeben - + command_line_option_print_app_logs_only "Print only logs from the application" Nur Anwendungs-Logs ausgeben - + hide_action "Cacher" "Afficher" Ausblenden - + show_action Zeigen - + quit_action "Quitter" Beenden - + check_for_update Check for update - + mark_all_read_action @@ -2240,24 +2240,24 @@ ChatMessageContentCore - + download_file_default_error Error downloading file %1 - + info_popup_error_titile - + popup_error_title Error Fehler - + popup_open_file_error_does_not_exist_message Could not open file : unknown path %1 @@ -3569,7 +3569,7 @@ Error - + information_popup_error_title Une erreur est survenue. Ein Fehler ist aufgetreten. @@ -3605,19 +3605,25 @@ Error Hochladen der Logs … - + settings_debug_app_version_title "Version de l'application" App-Version - + settings_debug_sdk_version_title "Version du SDK" SDK-Version - + + settings_debug_qt_version_title + "Qt Version" + + + + settings_debug_share_logs_error "Le téléversement des traces a échoué. Vous pouvez partager les fichiers de trace directement depuis le répertoire suivant : %1" Hochladen der Logs fehlgeschlagen. Sie können die Log-Dateien direkt aus folgendem Verzeichnis teilen: %1 @@ -3975,7 +3981,7 @@ Error Zur Übersetzung von %1 beitragen - + help_troubleshooting_title "Dépannage" Fehlerbehebung diff --git a/Linphone/data/languages/en.ts b/Linphone/data/languages/en.ts index 2eed5c476..df289fb95 100644 --- a/Linphone/data/languages/en.ts +++ b/Linphone/data/languages/en.ts @@ -594,13 +594,13 @@ Mandatory media encryption - + settings_advanced_create_endtoend_encrypted_meetings_title Create end to end encrypted meetings and group calls Create end to end encrypted meetings and group calls - + settings_advanced_hide_fps_title Hide FPS @@ -629,141 +629,141 @@ App - + remote_provisioning_dialog Voulez-vous télécharger et appliquer la configuration depuis cette adresse ? Do you want to download and apply remote provisioning from this address ? - - - + + + info_popup_error_title Error Error - - + + info_popup_configuration_failed_message Remote provisioning failed : %1 Remote provisioning failed : %1 - + info_popup_error_checking_update An error occured while trying to check update. Please try again later or contact support team. An error occured while trying to check update. Please try again later or contact support team. - + info_popup_new_version_download_label - + Download it ! - + info_popup_new_version_available_title New version available ! New version available ! - + info_popup_new_version_available_message A new version of Linphone (%1) is available. %2 A new version of Linphone (%1) is available at %1 - + info_popup_version_up_to_date_title Up to date - + info_popup_version_up_to_date_message Your version is up to date Up to date Your version is up to date - + configuration_error_detail not reachable not reachable - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version Show app version - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_minimized Minimize - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Hide - + show_action Show - + quit_action "Quitter" Quit - + check_for_update Check for update Check for update - + mark_all_read_action Marquer tout comme lu @@ -2217,24 +2217,24 @@ ChatMessageContentCore - + download_file_default_error Error downloading file %1 Error downloading file %1 - + info_popup_error_titile Error - + popup_error_title Error Error - + popup_open_file_error_does_not_exist_message Could not open file : unknown path %1 Could not open file : unknown path %1 @@ -3488,7 +3488,7 @@ Only your correspondent can decrypt them. - + information_popup_error_title Une erreur est survenue. An error has occurred. @@ -3524,19 +3524,25 @@ Only your correspondent can decrypt them. Uploading traces… - + settings_debug_app_version_title "Version de l'application" App version - + settings_debug_sdk_version_title "Version du SDK" SDK version - + + settings_debug_qt_version_title + "Qt Version" + Qt Version + + + settings_debug_share_logs_error "Le téléversement des traces a échoué. Vous pouvez partager les fichiers de trace directement depuis le répertoire suivant : %1" Uploading traces failed. You can share trace files directly from the following directory: %1 @@ -3891,7 +3897,7 @@ Expiration : %1 Contribute to the translation of %1 - + help_troubleshooting_title "Dépannage" Troubleshooting diff --git a/Linphone/data/languages/fr.ts b/Linphone/data/languages/fr.ts index 2e8180cc0..4a8db8600 100644 --- a/Linphone/data/languages/fr.ts +++ b/Linphone/data/languages/fr.ts @@ -594,13 +594,13 @@ Chiffrement du média obligatoire - + settings_advanced_create_endtoend_encrypted_meetings_title Create end to end encrypted meetings and group calls Créer des appels de groupe et conférences chiffré(e)s de bout en bout - + settings_advanced_hide_fps_title Cacher les FPS @@ -629,141 +629,141 @@ App - + remote_provisioning_dialog Voulez-vous télécharger et appliquer la configuration depuis cette adresse ? Voulez-vous télécharger et appliquer la configuration depuis cette adresse ? - - - + + + info_popup_error_title Error Erreur - - + + info_popup_configuration_failed_message Remote provisioning failed : %1 La configuration distante a échoué : %1 - + info_popup_error_checking_update An error occured while trying to check update. Please try again later or contact support team. Une erreur est survenue lors de la recherche de mise à jour. Merci de réessayer plus tard ou de contacter l'équipe de support. - + info_popup_new_version_download_label Téléchargez-là ! - + info_popup_new_version_available_title New version available ! Nouvelle version disponible ! - + info_popup_new_version_available_message A new version of Linphone (%1) is available. %2 Une nouvelle version de Linphone (%1) est disponible. %2 - + info_popup_version_up_to_date_title À jour - + info_popup_version_up_to_date_message Your version is up to date Votre version est à jour - + configuration_error_detail not reachable indisponible - + application_description "A free and open source SIP video-phone." A free and open source SIP video-phone. - + command_line_arg_order "Send an order to the application towards a command line" Send an order to the application towards a command line - + command_line_option_show_help Show this help - + command_line_option_show_app_version Afficher la version de l'application - + command_line_option_config_to_fetch "Specify the linphone configuration file to be fetched. It will be merged with the current configuration." Specify the linphone configuration file to be fetched. It will be merged with the current configuration. - + command_line_option_config_to_fetch_arg "URL, path or file" URL, path or file - + command_line_option_minimized Minimiser - + command_line_option_log_to_stdout Log to stdout some debug information while running - + command_line_option_print_app_logs_only "Print only logs from the application" Print only logs from the application - + hide_action "Cacher" "Afficher" Cacher - + show_action Afficher - + quit_action "Quitter" Quitter - + check_for_update Check for update Rechercher une mise à jour - + mark_all_read_action Marquer tout comme lu @@ -2217,24 +2217,24 @@ ChatMessageContentCore - + download_file_default_error Error downloading file %1 Erreur de téléchargement du fichier %1 - + info_popup_error_titile Erreur - + popup_error_title Error Erreur - + popup_open_file_error_does_not_exist_message Could not open file : unknown path %1 Impossible d'ouvrir le fichier : chemin inconnu (%1) @@ -3488,7 +3488,7 @@ en bout. Seul votre correspondant peut les déchiffrer. - + information_popup_error_title Une erreur est survenue. Une erreur est survenue. @@ -3524,19 +3524,25 @@ en bout. Seul votre correspondant peut les déchiffrer. Téléversement des traces en cours… - + settings_debug_app_version_title "Version de l'application" Version de l'application - + settings_debug_sdk_version_title "Version du SDK" Version du SDK - + + settings_debug_qt_version_title + "Qt Version" + Version de Qt + + + settings_debug_share_logs_error "Le téléversement des traces a échoué. Vous pouvez partager les fichiers de trace directement depuis le répertoire suivant : %1" Le téléversement des traces a échoué. Vous pouvez partager les fichiers de trace directement depuis le répertoire suivant : %1 @@ -3891,7 +3897,7 @@ Expiration : %1 Contribuer à la traduction de %1 - + help_troubleshooting_title "Dépannage" Dépannage diff --git a/Linphone/tool/Constants.hpp b/Linphone/tool/Constants.hpp index 0f81ba837..77ab36ebe 100644 --- a/Linphone/tool/Constants.hpp +++ b/Linphone/tool/Constants.hpp @@ -129,7 +129,7 @@ public: static constexpr char LinphoneDomain[] = "sip.linphone.org"; // Use for checking if config are a Linphone static constexpr char WindowIconPath[] = ":/data/image/logo.svg"; - static constexpr char ApplicationMinimalQtVersion[] = "6.9.0"; + static constexpr char ApplicationMinimalQtVersion[] = "6.10.0"; static constexpr char DefaultConferenceURI[] = "sip:conference-factory@sip.linphone.org"; // Default for a Linphone account static constexpr char DefaultVideoConferenceURI[] = diff --git a/Linphone/view/Control/Button/HelpIconLabelButton.qml b/Linphone/view/Control/Button/HelpIconLabelButton.qml index c51c8bd58..aa82aab57 100644 --- a/Linphone/view/Control/Button/HelpIconLabelButton.qml +++ b/Linphone/view/Control/Button/HelpIconLabelButton.qml @@ -3,6 +3,7 @@ import QtQuick.Effects import QtQuick.Layouts import Linphone import "qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js" as Utils +import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle MouseArea { id: mainItem @@ -11,6 +12,7 @@ MouseArea { property string subTitle property real iconSize: Utils.getSizeWithScreenRatio(32) property bool shadowEnabled: containsMouse || activeFocus + property bool arrowImageVisible: false property alias image: image hoverEnabled: true width: content.implicitWidth @@ -61,6 +63,13 @@ MouseArea { font: Typography.p1 } } + Item{Layout.fillWidth: true} + EffectImage { + id: arrowImage + visible: mainItem.arrowImageVisible + imageSource: AppIcons.rightArrow + colorizationColor: DefaultStyle.main2_600 + } } MultiEffect { enabled: mainItem.shadowEnabled diff --git a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml index ac0883c66..5b290f44b 100644 --- a/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml @@ -118,63 +118,35 @@ AbstractSettingsLayout { id: versionContent ColumnLayout { spacing: Utils.getSizeWithScreenRatio(20) - RowLayout { - EffectImage { - imageSource: AppIcons.appWindow - colorizationColor: DefaultStyle.main1_500_main - Layout.preferredWidth: Utils.getSizeWithScreenRatio(24) - Layout.preferredHeight: Utils.getSizeWithScreenRatio(24) - imageWidth: Utils.getSizeWithScreenRatio(24) - imageHeight: Utils.getSizeWithScreenRatio(24) - Layout.alignment: Qt.AlignTop - } - ColumnLayout { - Text { - //: "Version de l'application" - text: qsTr("settings_debug_app_version_title") - font: Typography.p2l - wrapMode: Text.WordWrap - color: DefaultStyle.main2_600 - Layout.fillWidth: true - } - TextEdit { - text: AppCpp.applicationVersion + ' ('+ AppCpp.gitBranchName + ')' - font: Typography.p1 - wrapMode: Text.WordWrap - color: DefaultStyle.main2_600 - Layout.fillWidth: true - readOnly: true - } - } + HelpIconLabelButton { + enabled: false + // Layout.preferredWidth: width + // Layout.minimumWidth: width + iconSize: Utils.getSizeWithScreenRatio(24) + //: "Version de l'application" + title: qsTr("settings_debug_app_version_title") + iconSource: AppIcons.appWindow + subTitle: AppCpp.applicationVersion + ' ('+ AppCpp.gitBranchName + ')' } - RowLayout { - EffectImage { - imageSource: AppIcons.resourcePackage - colorizationColor: DefaultStyle.main1_500_main - Layout.preferredWidth: Utils.getSizeWithScreenRatio(24) - Layout.preferredHeight: Utils.getSizeWithScreenRatio(24) - imageWidth: Utils.getSizeWithScreenRatio(24) - imageHeight: Utils.getSizeWithScreenRatio(24) - Layout.alignment: Qt.AlignTop - } - ColumnLayout { - Text { - //: "Version du SDK" - text: qsTr("settings_debug_sdk_version_title") - font: Typography.p2l - wrapMode: Text.WordWrap - color: DefaultStyle.main2_600 - Layout.fillWidth: true - } - TextEdit { - text: AppCpp.sdkVersion - font: Typography.p1 - wrapMode: Text.WordWrap - color: DefaultStyle.main2_600 - Layout.fillWidth: true - readOnly: true - } - } + HelpIconLabelButton { + enabled: false + // Layout.preferredWidth: width + // Layout.minimumWidth: width + iconSize: Utils.getSizeWithScreenRatio(24) + //: "Version du SDK" + title: qsTr("settings_debug_sdk_version_title") + iconSource: AppIcons.resourcePackage + subTitle: AppCpp.sdkVersion + } + HelpIconLabelButton { + enabled: false + // Layout.preferredWidth: width + // Layout.minimumWidth: width + iconSize: Utils.getSizeWithScreenRatio(24) + iconSource: AppIcons.qtLogo + //: "Qt Version" + title: qsTr("settings_debug_qt_version_title") + subTitle: AppCpp.qtVersion } } } diff --git a/Linphone/view/Page/Main/Help/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml index 4b4566a00..71ab04360 100644 --- a/Linphone/view/Page/Main/Help/HelpPage.qml +++ b/Linphone/view/Page/Main/Help/HelpPage.qml @@ -111,16 +111,6 @@ AbstractMainPage { onClicked: AppCpp.checkForUpdate(true) } } - HelpIconLabelButton { - id: qtVersionButton - Layout.preferredWidth: width - Layout.minimumWidth: width - iconSource: AppIcons.qtLogo - //: "Qt Version" - title: qsTr("help_about_qt_version_title") - subTitle: AppCpp.qtVersion - onClicked: {} - } HelpIconLabelButton { Layout.fillWidth: true iconSource: AppIcons.license @@ -160,6 +150,7 @@ AbstractMainPage { Layout.rightMargin: leftPanel.rightMargin Layout.topMargin: Utils.getSizeWithScreenRatio(24) iconSource: AppIcons.debug + arrowImageVisible: true //: "Dépannage" title: qsTr("help_troubleshooting_title") onClicked: {