From 531a69739640525d3bbfa1bdd683c1ab2c788315 Mon Sep 17 00:00:00 2001 From: gaelle Date: Wed, 16 Apr 2025 17:46:20 +0200 Subject: [PATCH 1/3] fix macos package --- .gitlab-ci-files/macosx-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 9bb190517..73df055c4 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -71,14 +71,14 @@ macosx-ninja-novideo: - !reference [.rules-merge-request-manual, rules] - if: $NIGHTLY_MASTER variables: - CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_PQCRYPTO=OFF + CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_VIDEO=OFF -DENABLE_PQCRYPTO=OFF CMAKE_GENERATOR: Ninja extends: .macosx-desktop #macosx-xcode: # extends: .macosx-desktop # variables: -# XCODE_OPTIONS: -DLINPHONESDK_MACOS_BASE_URL=$MACOS_SNAPSHOTS_URL +# XCODE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DLINPHONESDK_MACOS_BASE_URL=$MACOS_SNAPSHOTS_URL # CMAKE_GENERATOR: Xcode # ADDITIONAL_BUILD_OPTIONS: -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=$MAX_NUMBER_TASK # only: From 40cb7f46b585547c81ce9b4f5fe2f69f7b8aa721 Mon Sep 17 00:00:00 2001 From: gaelle Date: Thu, 17 Apr 2025 10:23:09 +0200 Subject: [PATCH 2/3] try to fix ci update sdk --- .gitlab-ci-files/macosx-desktop.yml | 2 +- external/linphone-sdk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 73df055c4..206faf15d 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -102,7 +102,7 @@ macosx-ninja-package: - if: $PACKAGE_MACOSX - if: $DEPLOY_MACOSX variables: - CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON + CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$MACOSX_PLATFORM/$APP_FOLDER extends: macosx-ninja script: diff --git a/external/linphone-sdk b/external/linphone-sdk index 40804e3c8..96a6385bf 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit 40804e3c8d3059375397b396a45d9f128b766122 +Subproject commit 96a6385bfdb3e6c0ed85df42bda99467e8f6fc5f From 89811f73da3e883f3c57b7d2b25287fdc868a052 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Thu, 17 Apr 2025 17:05:19 +0200 Subject: [PATCH 3/3] force larger text metrics weight to guarantee correct width for button --- Linphone/data/languages/fr_FR.ts | 2 +- .../view/Control/Button/IconLabelButton.qml | 17 ++++++++++++----- .../Control/Display/Contact/ContactListItem.qml | 3 +++ Linphone/view/Page/Main/Contact/ContactPage.qml | 1 - 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Linphone/data/languages/fr_FR.ts b/Linphone/data/languages/fr_FR.ts index 816f0617d..1603be3f7 100644 --- a/Linphone/data/languages/fr_FR.ts +++ b/Linphone/data/languages/fr_FR.ts @@ -1024,7 +1024,7 @@ sip_address_copied_to_clipboard_message L'adresse a été copié dans le presse_papiers - L'adresse a été copié dans le presse_papiers + L'adresse a été copié dans le presse-papiers diff --git a/Linphone/view/Control/Button/IconLabelButton.qml b/Linphone/view/Control/Button/IconLabelButton.qml index dce064255..520928dee 100644 --- a/Linphone/view/Control/Button/IconLabelButton.qml +++ b/Linphone/view/Control/Button/IconLabelButton.qml @@ -47,12 +47,19 @@ Button { family: DefaultStyle.defaultFont capitalization: mainItem.capitalization underline: mainItem.underline - bold: mainItem.style === ButtonStyle.noBackground && (mainItem.hovered || mainItem.pressed) + bold: (mainItem.style === ButtonStyle.noBackground || mainItem.style === ButtonStyle.noBackgroundRed) && (mainItem.hovered || mainItem.pressed) } - TextMetrics { - id: textMetrics - text: mainItem.text - font: textItem.font + } + TextMetrics { + id: textMetrics + text: mainItem.text + font { + pixelSize: mainItem.textSize + weight: mainItem.textWeight * 2 + family: DefaultStyle.defaultFont + capitalization: mainItem.capitalization + underline: mainItem.underline + bold: true } } Item {Layout.fillWidth: true} diff --git a/Linphone/view/Control/Display/Contact/ContactListItem.qml b/Linphone/view/Control/Display/Contact/ContactListItem.qml index b98bbc7ab..73626327f 100644 --- a/Linphone/view/Control/Display/Contact/ContactListItem.qml +++ b/Linphone/view/Control/Display/Contact/ContactListItem.qml @@ -182,6 +182,7 @@ FocusScope { popup.contentItem: ColumnLayout { IconLabelButton { + Layout.fillWidth: true visible: searchResultItem.core.isStored && !searchResultItem.core.readOnly //: "Enlever des favoris" @@ -202,6 +203,7 @@ FocusScope { } IconLabelButton { text: qsTr("Partager") + Layout.fillWidth: true icon.source: AppIcons.shareNetwork spacing: Math.round(10 * DefaultStyle.dp) textColor: DefaultStyle.main2_500main @@ -233,6 +235,7 @@ FocusScope { icon.source: AppIcons.trashCan spacing: Math.round(10 * DefaultStyle.dp) visible: !searchResultItem.core.readOnly + Layout.fillWidth: true onClicked: { mainItem.contactDeletionRequested( searchResultItem) diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index 0809a4c31..73c580597 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -754,7 +754,6 @@ FriendGui{ //: "Autres actions" label: qsTr("contact_details_actions_title") content: ColumnLayout { - width: parent.width IconLabelButton { Layout.fillWidth: true Layout.preferredHeight: Math.round(50 * DefaultStyle.dp)