data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #LINQT-1622 connection succeed popup

Browse source 
set new privacy policy and terms of use urls

fix mic volume tester visibility in call

fix #LINQT-1583 secured avatar on unsecured address in call history

fix #LINQT-1631 zrtp to verify devices

fix #LINQT-1526 title inside stackview to avoid freeze effect

fix #LINQT-1579 spacing in layouts

fix #LINQT-1625 right panel closes before new call starts

crop text sticker

fix verified icon size
This commit is contained in:
Gaelle Braud 2025-01-28 14:08:22 +01:00
parent 063cdfb33b
commit db6fc41480
17 changed files with 435 additions and 478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/tool/Constants.hpp
View file

@ -66,8 +66,8 @@ public:
static constexpr char VersionCheckReleaseUrl[] = "https://linphone.org/releases";
static constexpr char VersionCheckNightlyUrl[] = "https://linphone.org/snapshots";
static constexpr char PasswordRecoveryUrl[] = "https://subscribe.linphone.org/recovery/email";
static constexpr char CguUrl[] = "https://www.linphone.org/general-terms";
static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/privacy-policy";
static constexpr char CguUrl[] = "https://www.linphone.org/en/terms-of-use/";
static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/en/privacy-policy/";
static constexpr char ContactUrl[] = "https://www.linphone.org/contact";
static constexpr char TranslationUrl[] = "https://weblate.linphone.org/projects/linphone-desktop/";

2
Linphone/tool/Utils.cpp
View file

@ -135,6 +135,8 @@ void Utils::createCall(const QString &sipAddress,
LinphoneEnums::MediaEncryption mediaEncryption,
const QString &prepareTransfertAddress,
const QHash<QString, QString> &headers) {
// if default value use the settings' value
if (mediaEncryption == LinphoneEnums::MediaEncryption::None)
mediaEncryption =
App::getInstance()->getSettings()->getMediaEncryption()["id"].value<LinphoneEnums::MediaEncryption>();
lDebug() << "[Utils] create call with uri :" << sipAddress << mediaEncryption;

2
Linphone/view/Control/Container/Call/CallHistoryLayout.qml
View file

@ -75,7 +75,7 @@ ColumnLayout {
_address: mainItem.conferenceInfo
? mainItem.conferenceInfo.core.subject
: mainItem.contactAddress || mainItem.contactName
secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncrypted
secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
}
Item {
id: rightButton

5
Linphone/view/Control/Display/Contact/AllContactListView.qml
View file

@ -215,7 +215,7 @@ Flickable{
ColumnLayout{
id: contentsLayout
width: parent.width
spacing: 0
spacing: 20 * DefaultStyle.dp
BusyIndicator {
Layout.alignment: Qt.AlignCenter
Layout.preferredHeight: visible ? 60 * DefaultStyle.dp : 0
@ -228,6 +228,7 @@ Flickable{
ContactListView{
id: favoritesList
visible: contentHeight > 0
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
interactive: false
@ -259,6 +260,7 @@ Flickable{
ContactListView{
id: contactsList
visible: contentHeight > 0
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
Layout.topMargin: favoritesList.height > 0 ? 4 * DefaultStyle.dp : 0
@ -296,6 +298,7 @@ Flickable{
}
ContactListView{
id: suggestionsList
visible: contentHeight > 0
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
Layout.topMargin: contactsList.height + favoritesList.height > 0 ? 4 * DefaultStyle.dp : 0

2
Linphone/view/Control/Display/Contact/Avatar.qml
View file

@ -41,7 +41,7 @@ Loader{
property string computedAvatarUri: avatarObj ? avatarObj.value : ''
// To get the secured property for a specific address,
// override it as secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncrypted
// override it as secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
property var securityLevelObj: UtilsCpp.getFriendAddressSecurityLevel(_address)
property var securityLevel: securityLevelObj ? securityLevelObj.value : LinphoneEnums.SecurityLevel.None
property bool secured: call && call.core.encryption === LinphoneEnums.MediaEncryption.Zrtp

3
Linphone/view/Control/Display/Sticker.qml
View file

@ -245,10 +245,13 @@ Item {
}
Text {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: 10 * DefaultStyle.dp
anchors.rightMargin: 10 * DefaultStyle.dp
anchors.bottomMargin: 10 * DefaultStyle.dp
width: implicitWidth
maximumLineCount: 1
property string _text: mainItem.displayName != ''
? mainItem.displayName
: mainItem.account && mainItem.identityAddress

6
Linphone/view/Control/Form/Login/LoginForm.qml
View file

@ -8,7 +8,6 @@ import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
ColumnLayout {
id: mainItem
spacing: 10 * DefaultStyle.dp
signal connectionSucceed()
FormItemLayout {
id: username
@ -47,11 +46,6 @@ ColumnLayout {
if (passwordEdit.text.length > 0 || usernameEdit.text.length > 0)
errorText.setText(LoginPageCpp.errorMessage)
}
function onRegistrationStateChanged() {
if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
mainItem.connectionSucceed()
}
}
}
}
}

1
Linphone/view/Control/Form/Settings/MultimediaSettings.qml
View file

@ -227,7 +227,6 @@ ColumnLayout {
}
}
Connections {
enabled: !mainItem.call
target: SettingsCpp
onMicVolumeChanged: (value) => {
audioTestSlider.value = value

4
Linphone/view/Page/Form/Call/NewCallForm.qml
View file

@ -64,14 +64,12 @@ FocusScope {
}
onVisibleChanged: if (!visible) mainItem.numPadPopup.close()
contentItem: ColumnLayout {
// anchors.fill: parent
spacing: 10 * DefaultStyle.dp
spacing: 38 * DefaultStyle.dp
SearchBar {
id: searchBar
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
Layout.rightMargin: 39 * DefaultStyle.dp
//Layout.maximumWidth: mainItem.width
focus: true
color: mainItem.searchBarColor
borderColor: mainItem.searchBarBorderColor

2
Linphone/view/Page/Form/Login/LoginPage.qml
View file

@ -14,7 +14,6 @@ LoginLayout {
signal useSIPButtonClicked()
signal useRemoteConfigButtonClicked()
signal goToRegister()
signal connectionSucceed()
titleContent: [
BigButton {
@ -82,7 +81,6 @@ LoginLayout {
spacing: 0
LoginForm {
id: loginForm
onConnectionSucceed: mainItem.connectionSucceed()
}
BigButton {
Layout.preferredWidth: loginForm.width

6
Linphone/view/Page/Form/Login/SIPLoginPage.qml
View file

@ -11,7 +11,6 @@ LoginLayout {
id: mainItem
signal goBack()
signal goToRegister()
signal connectionSucceed()
property bool showBackButton: false
titleContent: [
@ -271,11 +270,6 @@ LoginLayout {
function onErrorMessageChanged(error) {
errorText.setText(error)
}
function onRegistrationStateChanged() {
if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
mainItem.connectionSucceed()
}
}
}
}

1
Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml
View file

@ -28,6 +28,7 @@ FocusScope{
ListView {
id: participantList
Layout.fillWidth: true
visible: contentHeight > 0
Layout.preferredHeight: contentHeight
Layout.maximumHeight: mainItem.height / 3
width: mainItem.width

107
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -81,27 +81,11 @@ AbstractMainPage {
id: leftPanel
Layout.fillWidth: true
Layout.fillHeight: true
Loader {
id: titleLoader
anchors.left: parent.left
anchors.leftMargin: 45 * DefaultStyle.dp
anchors.right: parent.right
asynchronous: false
onActiveFocusChanged:{
if(activeFocus && item){
item.forceActiveFocus()
}
}
}
Control.StackView {
id: listStackView
anchors.top: titleLoader.bottom
anchors.topMargin: 18 * DefaultStyle.dp
anchors.left: parent.left
anchors.fill: parent
anchors.leftMargin: 45 * DefaultStyle.dp
anchors.right: parent.right
anchors.bottom: parent.bottom
clip: true
initialItem: historyListItem
focus: true
@ -129,14 +113,15 @@ AbstractMainPage {
}
Component {
id: historyListTitle
id: historyListItem
FocusScope{
objectName: "historyListTitle"
width: parent.width
height: titleCallLayout.implicitHeight
objectName: "historyListItem"
property alias listView: historyListView
ColumnLayout {
anchors.fill: parent
spacing: 0
RowLayout {
id: titleCallLayout
anchors.fill: parent
spacing: 16 * DefaultStyle.dp
Text {
text: qsTr("Appels")
@ -192,19 +177,10 @@ AbstractMainPage {
}
}
}
}
}
Component {
id: historyListItem
FocusScope{
objectName: "historyListItem"
property alias listView: historyListView
Control.StackView.onActivated: titleLoader.sourceComponent = historyListTitle
ColumnLayout {
anchors.fill: parent
SearchBar {
id: searchBar
Layout.fillWidth: true
Layout.topMargin: 18 * DefaultStyle.dp
Layout.rightMargin: 39 * DefaultStyle.dp
placeholderText: qsTr("Rechercher un appel")
visible: historyListView.count !== 0 || text.length !== 0
@ -290,7 +266,7 @@ AbstractMainPage {
callHistoryProxy.displayMore()
}
}
//----------------------------------------------------------------
//----------------------------------------------------------------
function moveToCurrentItem(){
if( historyListView.currentIndex >= 0)
Utils.updatePosition(historyListView, historyListView)
@ -311,7 +287,7 @@ AbstractMainPage {
alwaysRunToEnd: true
}
}
//----------------------------------------------------------------
//----------------------------------------------------------------
onCurrentIndexChanged: {
mainItem.selectedRowHistoryGui = model.getAt(currentIndex)
@ -339,6 +315,7 @@ AbstractMainPage {
_address: modelData.core.conferenceInfo
? modelData.core.conferenceInfo.core.subject
: modelData.core.remoteAddress
secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
width: 45 * DefaultStyle.dp
height: 45 * DefaultStyle.dp
isConference: modelData.core.isConference
@ -446,7 +423,6 @@ AbstractMainPage {
Control.ScrollBar.vertical: scrollbar
}
}
}
ScrollBar {
id: scrollbar
@ -463,13 +439,18 @@ AbstractMainPage {
}
Component {
id: newCallTitle
id: newCallItem
FocusScope{
objectName: "newCallTitle"
width: parent.width
height: parent.height
RowLayout {
objectName: "newCallItem"
width: parent?.width
height: parent?.height
Control.StackView.onActivated:{
callContactsList.forceActiveFocus()
}
ColumnLayout {
anchors.fill: parent
spacing: 0
RowLayout {
spacing: 10 * DefaultStyle.dp
Button {
Layout.preferredWidth: 24 * DefaultStyle.dp
@ -494,23 +475,9 @@ AbstractMainPage {
Layout.fillWidth: true
}
}
}
}
Component {
id: newCallItem
FocusScope{
objectName: "newCallItem"
width: parent?.width
height: parent?.height
Control.StackView.onActivated:{
titleLoader.sourceComponent = newCallTitle
callContactsList.forceActiveFocus()
}
ColumnLayout {
anchors.fill: parent
NewCallForm {
id: callContactsList
Layout.topMargin: 18 * DefaultStyle.dp
Layout.fillWidth: true
Layout.fillHeight: true
focus: true
@ -534,20 +501,22 @@ AbstractMainPage {
}
Component {
id: groupCallTitle
id: groupCallItem
FocusScope{
objectName: "groupCallTitle"
width: parent.width
height: parent.height
RowLayout {
objectName: "groupCallItem"
Control.StackView.onActivated: {
addParticipantsLayout.forceActiveFocus()
}
ColumnLayout {
spacing: 0
anchors.fill: parent
RowLayout {
spacing: 10 * DefaultStyle.dp
visible: !SettingsCpp.disableMeetingsFeature
Button {
id: backGroupCallButton
style: ButtonStyle.noBackgroundOrange
icon.source: AppIcons.leftArrow
Layout.leftMargin: 21 * DefaultStyle.dp
Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp
KeyNavigation.down: listStackView
@ -595,22 +564,9 @@ AbstractMainPage {
}
}
}
}
}
Component {
id: groupCallItem
FocusScope{
objectName: "groupCallItem"
Control.StackView.onActivated: {
titleLoader.sourceComponent = groupCallTitle
addParticipantsLayout.forceActiveFocus()
}
ColumnLayout {
spacing: 5 * DefaultStyle.dp
anchors.fill: parent
RowLayout {
spacing: 0
Layout.topMargin: 18 * DefaultStyle.dp
Layout.rightMargin: 38 * DefaultStyle.dp
Text {
font.pixelSize: 13 * DefaultStyle.dp
@ -636,6 +592,7 @@ AbstractMainPage {
id: addParticipantsLayout
Layout.fillWidth: true
Layout.fillHeight: true
Layout.topMargin: 15 * DefaultStyle.dp
onSelectedParticipantsCountChanged: mainItem.selectedParticipantsCount = selectedParticipantsCount
focus: true
Connections {

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

@ -628,11 +628,11 @@ AbstractMainPage {
font.pixelSize: 14 * DefaultStyle.dp
}
Item{Layout.fillWidth: true}
Image{
EffectImage {
visible: listViewModelData.securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
source: AppIcons.trusted
width: 22 * DefaultStyle.dp
height: 22 * DefaultStyle.dp
Layout.preferredWidth: 22 * DefaultStyle.dp
Layout.preferredHeight: 22 * DefaultStyle.dp
}
SmallButton {

41
Linphone/view/Page/Main/Meeting/MeetingPage.qml
View file

@ -454,14 +454,18 @@ AbstractMainPage {
ColumnLayout {
property Control.StackView container
property ConferenceInfoGui conferenceInfoGui
spacing: 18 * DefaultStyle.dp
FocusScope{
Layout.fillWidth: true
Layout.preferredHeight: addParticipantsButtons.implicitHeight
Layout.preferredHeight: childrenRect.height
ColumnLayout {
spacing: 4 * DefaultStyle.dp
Layout.fillWidth: true
RowLayout {
id: addParticipantsButtons
spacing: 5 * DefaultStyle.dp
spacing: 10 * DefaultStyle.dp
Button {
id: removeButton
id: addParticipantsBackButton
style: ButtonStyle.noBackgroundOrange
icon.source: AppIcons.leftArrow
icon.width: 24 * DefaultStyle.dp
@ -470,8 +474,6 @@ AbstractMainPage {
KeyNavigation.down: addParticipantLayout
onClicked: container.pop()
}
ColumnLayout {
spacing: 8 * DefaultStyle.dp
Text {
text: qsTr("Ajouter des participants")
color: DefaultStyle.main1_500_main
@ -482,9 +484,24 @@ AbstractMainPage {
}
Layout.fillWidth: true
}
SmallButton {
id: addButton
enabled: addParticipantLayout.selectedParticipantsCount.length != 0
Layout.leftMargin: 11 * DefaultStyle.dp
focus: enabled
style: ButtonStyle.main
text: qsTr("Ajouter")
KeyNavigation.left: addParticipantsBackButton
KeyNavigation.down: addParticipantLayout
onClicked: {
mainItem.addParticipantsValidated(addParticipantLayout.selectedParticipants)
}
}
}
Text {
text: qsTr("%1 participant%2 sélectionné%2").arg(addParticipantLayout.selectedParticipantsCount).arg(addParticipantLayout.selectedParticipantsCount > 1 ? "s" : "")
color: DefaultStyle.main2_500main
Layout.leftMargin: addParticipantsBackButton.width + addParticipantsButtons.spacing
maximumLineCount: 1
font {
pixelSize: 12 * DefaultStyle.dp
@ -493,20 +510,6 @@ AbstractMainPage {
Layout.fillWidth: true
}
}
SmallButton {
id: addButton
enabled: addParticipantLayout.selectedParticipantsCount.length != 0
Layout.rightMargin: 21 * DefaultStyle.dp
focus: enabled
style: ButtonStyle.main
text: qsTr("Ajouter")
KeyNavigation.left: removeButton
KeyNavigation.down: addParticipantLayout
onClicked: {
mainItem.addParticipantsValidated(addParticipantLayout.selectedParticipants)
}
}
}
}
AddParticipantsForm {
id: addParticipantLayout

5
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -647,9 +647,12 @@ AbstractWindow {
searchBarBorderColor: DefaultStyle.grey_200
numPadPopup: numericPad
onContactClicked: (contact) => {
rightPanel.visible = false
mainWindow.startCallWithContact(contact, false, rightPanel)
}
Connections {
target: mainWindow
function onCallChanged(){ if (newCallForm.Control.StackView.status === Control.StackView.Active) rightPanel.visible = false}
}
NumericPadPopup {
id: numericPad

24
Linphone/view/Page/Window/Main/MainWindow.qml
View file

@ -29,8 +29,9 @@ AbstractWindow {
// color: DefaultStyle.grey_100
// }
function openMainPage(){
function openMainPage(connectionSucceed){
if (mainWindowStackView.currentItem.objectName !== "mainPage") mainWindowStackView.replace(mainPage, StackView.Immediate)
if (connectionSucceed) mainWindow.showInformationPopup(qsTr("Connexion réussie"), qsTr("Vous êtes connecté en mode %1").arg("interopérable"))
}
function goToCallHistory() {
openMainPage()
@ -46,7 +47,7 @@ AbstractWindow {
}
function transferCallSucceed() {
openMainPage()
UtilsCpp.showInformationPopup(qsTr("Appel transféré"), qsTr("Votre correspondant a été transféré au contact sélectionné"))
mainWindow.showInformationPopup(qsTr("Appel transféré"), qsTr("Votre correspondant a été transféré au contact sélectionné"))
}
function initStackViewItem() {
if(accountProxy && accountProxy.isInitialized) {
@ -96,6 +97,16 @@ AbstractWindow {
}
}
Connections {
target: LoginPageCpp
function onRegistrationStateChanged() {
if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
openMainPage(true)
proposeH264CodecsDownload()
}
}
}
Loader {
id: accountProxyLoader
active: AppCpp.coreStarted
@ -144,10 +155,6 @@ AbstractWindow {
onGoBack: openMainPage()
onUseSIPButtonClicked: mainWindowStackView.push(sipLoginPage)
onGoToRegister: mainWindowStackView.replace(registerPage)
onConnectionSucceed: {
openMainPage()
proposeH264CodecsDownload()
}
StackView.onActivated:{
if (accountProxy?.haveAccount) showBackButton = true
}
@ -164,11 +171,6 @@ AbstractWindow {
mainWindowStackView.pop()
}
onGoToRegister: mainWindowStackView.replace(registerPage)
onConnectionSucceed: {
openMainPage()
proposeH264CodecsDownload()
}
StackView.onActivated:{
if (!SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin || accountProxy?.haveAccount) showBackButton = true
}