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

fix #LINQT-1425 timer close calls win

Browse source 
fix #LINQT-1426 end message call

fix full name

fix notif alignment
This commit is contained in:
Gaelle Braud 2024-11-19 14:24:40 +01:00
parent 950665138a
commit fbbcbe2012
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/core/friend/FriendCore.cpp
View file

@ -109,7 +109,7 @@ FriendCore::FriendCore(const std::shared_ptr<linphone::Friend> &contact, bool is
connect(this, &FriendCore::addressChanged, &FriendCore::allAddressesChanged); connect(this, &FriendCore::addressChanged, &FriendCore::allAddressesChanged);
connect(this, &FriendCore::phoneNumberChanged, &FriendCore::allAddressesChanged); connect(this, &FriendCore::phoneNumberChanged, &FriendCore::allAddressesChanged);
auto updateFullName = [this] { auto updateFullName = [this] {
auto name = (mGivenName.isEmpty() ? "" : mGivenName) + (mFamilyName.isEmpty() ? "" : mFamilyName); auto name = mGivenName + (!mGivenName.isEmpty() && !mFamilyName.isEmpty() ? " " : "") + mFamilyName;
if (!name.isEmpty()) setFullName(name); if (!name.isEmpty()) setFullName(name);
}; };
connect(this, &FriendCore::givenNameChanged, updateFullName); connect(this, &FriendCore::givenNameChanged, updateFullName);

16
Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
View file

@ -7,8 +7,8 @@ import UtilsCpp
Notification { Notification {
id: mainItem id: mainItem
radius: 20 * DefaultStyle.dp radius: 20 * DefaultStyle.dp
overriddenWidth: 450 * DefaultStyle.dp//content.width//101 * DefaultStyle.dp overriddenWidth: 450 * DefaultStyle.dp//content.width
overriddenHeight: 101 * DefaultStyle.dp//content.height// overriddenHeight: 101 * DefaultStyle.dp//content.height
readonly property var call: notificationData && notificationData.call readonly property var call: notificationData && notificationData.call
property var state: call.core.state property var state: call.core.state
@ -25,17 +25,15 @@ Notification {
Popup { Popup {
id: content id: content
visible: mainItem.visible visible: mainItem.visible
leftPadding: 19 * DefaultStyle.dp width: parent.width
rightPadding: 19 * DefaultStyle.dp height: parent.height
leftPadding: 26 * DefaultStyle.dp
rightPadding: 26 * DefaultStyle.dp
topPadding: 15 * DefaultStyle.dp topPadding: 15 * DefaultStyle.dp
bottomPadding: 15 * DefaultStyle.dp bottomPadding: 15 * DefaultStyle.dp
background: Item{} background: Item{}
contentItem: RowLayout { contentItem: RowLayout {
id: notifContent
spacing: 15 * DefaultStyle.dp spacing: 15 * DefaultStyle.dp
height: childrenRect.height
width: childrenRect.width
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
@ -80,7 +78,7 @@ Notification {
} }
} }
} }
Item{Layout.fillWidth: true}
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true Layout.fillWidth: true

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

@ -149,7 +149,7 @@ AbstractWindow {
Timer { Timer {
id: autoCloseWindow id: autoCloseWindow
interval: 3000 interval: mainWindow.callTerminatedByUser ? 1000 : 2000
onTriggered: { onTriggered: {
UtilsCpp.closeCallsWindow() UtilsCpp.closeCallsWindow()
} }
@ -157,7 +157,10 @@ AbstractWindow {
Dialog { Dialog {
id: terminateAllCallsDialog id: terminateAllCallsDialog
onAccepted: call.core.lTerminateAllCalls() onAccepted: {
mainWindow.callTerminatedByUser = true
call.core.lTerminateAllCalls()
}
width: 278 * DefaultStyle.dp width: 278 * DefaultStyle.dp
text: qsTr("La fenêtre est sur le point d'être fermée. Cela terminera tous les appels en cours. Souhaitez vous continuer ?") text: qsTr("La fenêtre est sur le point d'être fermée. Cela terminera tous les appels en cours. Souhaitez vous continuer ?")
} }