mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 03:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/release/6.0'

Browse source
This commit is contained in:
Sylvain Berfini 2025-04-29 11:35:27 +02:00
commit 9b9994b358
5 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/data/languages/en.ts
View file

@ -1232,7 +1232,7 @@
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
<source>call_paused_by_remote</source>
<extracomment>Call paused by remote</extracomment>
<translation type="unfinished">Call paused by remote</translation>
<translation>Call paused by remote</translation>
</message>
<message>
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>

4
Linphone/data/languages/fr_FR.ts
View file

@ -1024,7 +1024,7 @@
<location filename="../../view/Page/Main/Call/CallPage.qml" line="566"/>
<source>sip_address_copied_to_clipboard_message</source>
<extracomment>L&apos;adresse a été copié dans le presse_papiers</extracomment>
<translation>L&apos;adresse a été copié dans le presse_papiers</translation>
<translation>L&apos;adresse a été copié dans le presse-papiers</translation>
</message>
<message>
<location filename="../../view/Page/Main/Call/CallPage.qml" line="572"/>
@ -1232,7 +1232,7 @@
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
<source>call_paused_by_remote</source>
<extracomment>Call paused by remote</extracomment>
<translation type="unfinished">Appel mis en pause par votre correspondant</translation>
<translation>Appel mis en pause par votre correspondant</translation>
</message>
<message>
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>

17
Linphone/view/Control/Button/IconLabelButton.qml
View file

@ -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}

3
Linphone/view/Control/Display/Contact/ContactListItem.qml
View file

@ -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)

1
Linphone/view/Page/Main/Contact/ContactPage.qml
View file

@ -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)