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

fix merge call ui

Browse source
This commit is contained in:
Gaelle Braud 2024-07-11 16:02:42 +02:00
parent 80a9c6d969
commit a18d86a74c
4 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Linphone/view/App/CallsWindow.qml
View file

@ -194,9 +194,6 @@ AppWindow {
} }
Popup { Popup {
id: waitingPopup id: waitingPopup
visible: mainWindow.transferState === LinphoneEnums.CallState.OutgoingInit
|| mainWindow.transferState === LinphoneEnums.CallState.OutgoingProgress
|| mainWindow.transferState === LinphoneEnums.CallState.OutgoingRinging || false
modal: true modal: true
closePolicy: Control.Popup.NoAutoClose closePolicy: Control.Popup.NoAutoClose
anchors.centerIn: parent anchors.centerIn: parent
@ -205,6 +202,16 @@ AppWindow {
radius: 15 * DefaultStyle.dp radius: 15 * DefaultStyle.dp
width: 278 * DefaultStyle.dp width: 278 * DefaultStyle.dp
height: 115 * DefaultStyle.dp height: 115 * DefaultStyle.dp
Connections {
target: mainWindow
function ontransferStateChanged() {
if (mainWindow.transferState === LinphoneEnums.CallState.Error
|| mainWindow.transferState === LinphoneEnums.CallState.End
|| mainWindow.transferState === LinphoneEnums.CallState.Released
|| mainWindow.transferState === LinphoneEnums.CallState.Connected)
waitingPopup.close()
}
}
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 0 spacing: 0
BusyIndicator{ BusyIndicator{
@ -501,6 +508,7 @@ AppWindow {
searchBarBorderColor: DefaultStyle.grey_200 searchBarBorderColor: DefaultStyle.grey_200
onSelectedContactChanged: { onSelectedContactChanged: {
if (selectedContact) mainWindow.transferCallToContact(mainWindow.call, selectedContact, callcontactslist) if (selectedContact) mainWindow.transferCallToContact(mainWindow.call, selectedContact, callcontactslist)
waitingPopup.open()
} }
} }
} }

16
Linphone/view/Item/Contact/ContactEdition.qml
View file

@ -133,7 +133,7 @@ RightPanelLayout {
contentItem: TextField { contentItem: TextField {
id: givenNameEdit id: givenNameEdit
initialText: contact.core.givenName initialText: contact.core.givenName
onEditingFinished: contact.core.givenName = text onTextEdited: contact.core.givenName = text
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
backgroundBorderColor: givenName.errorTextItem.opacity != 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: givenName.errorTextItem.opacity != 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
@ -142,7 +142,7 @@ RightPanelLayout {
label: qsTr("Nom") label: qsTr("Nom")
contentItem: TextField { contentItem: TextField {
initialText: contact.core.familyName initialText: contact.core.familyName
onEditingFinished: contact.core.familyName = text onTextEdited: contact.core.familyName = text
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
} }
} }
@ -150,7 +150,7 @@ RightPanelLayout {
label: qsTr("Entreprise") label: qsTr("Entreprise")
contentItem: TextField { contentItem: TextField {
initialText: contact.core.organization initialText: contact.core.organization
onEditingFinished: contact.core.organization = text onTextEdited: contact.core.organization = text
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
} }
} }
@ -158,7 +158,7 @@ RightPanelLayout {
label: qsTr("Fonction") label: qsTr("Fonction")
contentItem: TextField { contentItem: TextField {
initialText: contact.core.job initialText: contact.core.job
onEditingFinished: contact.core.job = text onTextEdited: contact.core.job = text
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
} }
} }
@ -180,7 +180,7 @@ RightPanelLayout {
label: modelData.label label: modelData.label
contentItem: RowLayout { contentItem: RowLayout {
TextField { TextField {
onEditingFinished: { onTextEdited: {
if (text.length != 0) mainItem.contact.core.setAddressAt(index, qsTr("Adresse SIP"), text) if (text.length != 0) mainItem.contact.core.setAddressAt(index, qsTr("Adresse SIP"), text)
} }
property string _initialText: modelData.address property string _initialText: modelData.address
@ -213,10 +213,6 @@ RightPanelLayout {
if (text.length != 0) mainItem.contact.core.appendAddress(text) if (text.length != 0) mainItem.contact.core.appendAddress(text)
text = "" text = ""
} }
onFocusChanged: if (!focus && text.length != 0) {
mainItem.contact.core.appendAddress(text)
text = ""
}
} }
} }
Item { Item {
@ -234,7 +230,7 @@ RightPanelLayout {
label: modelData.label label: modelData.label
contentItem: TextField { contentItem: TextField {
initialText: modelData.address initialText: modelData.address
onEditingFinished: { onTextEdited: {
if (text.length != 0) mainItem.contact.core.setPhoneNumberAt(index, qsTr("Téléphone"), text) if (text.length != 0) mainItem.contact.core.setPhoneNumberAt(index, qsTr("Téléphone"), text)
} }
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0

1
Linphone/view/Item/Contact/ContactsList.qml
View file

@ -42,6 +42,7 @@ ListView {
property FriendGui selectedContact: model.getAt(currentIndex) || null property FriendGui selectedContact: model.getAt(currentIndex) || null
onCurrentIndexChanged: selectedContact = model.getAt(currentIndex) || null onCurrentIndexChanged: selectedContact = model.getAt(currentIndex) || null
onCountChanged: selectedContact = model.getAt(currentIndex) || null
signal contactStarredChanged() signal contactStarredChanged()
signal contactDeletionRequested(FriendGui contact) signal contactDeletionRequested(FriendGui contact)

5
Linphone/view/Page/Main/ContactPage.qml
View file

@ -34,7 +34,8 @@ AbstractMainPage {
friendGui.core.givenName = UtilsCpp.getGivenNameFromFullName(name) friendGui.core.givenName = UtilsCpp.getGivenNameFromFullName(name)
friendGui.core.familyName = UtilsCpp.getFamilyNameFromFullName(name) friendGui.core.familyName = UtilsCpp.getFamilyNameFromFullName(name)
friendGui.core.defaultAddress = address friendGui.core.defaultAddress = address
rightPanelStackView.push(contactEdition, {"contact": friendGui, "title": qsTr("Nouveau contact"), "saveButtonText": qsTr("Créer")}) if (rightPanelStackView.currentItem && rightPanelStackView.currentItem.objectName != "contactEdition")
rightPanelStackView.push(contactEdition, {"contact": friendGui, "title": qsTr("Nouveau contact"), "saveButtonText": qsTr("Créer")})
} }
function editContact(friendGui) { function editContact(friendGui) {
@ -787,7 +788,7 @@ AbstractMainPage {
Component { Component {
id: contactEdition id: contactEdition
ContactEdition { ContactEdition {
Control.StackView.onActivated: console.log("edit/create contact") property string objectName: "contactEdition"
onCloseEdition: { onCloseEdition: {
if (rightPanelStackView.depth <= 1) rightPanelStackView.clear() if (rightPanelStackView.depth <= 1) rightPanelStackView.clear()
else rightPanelStackView.pop(Control.StackView.Immediate) else rightPanelStackView.pop(Control.StackView.Immediate)