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

contact edition new ui

Browse source
This commit is contained in:
Gaelle Braud 2024-11-05 10:45:17 +01:00
parent a80f4c1a6e
commit 9797ad70b0
14 changed files with 359 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/view/Control/Container/Contact/ContactLayout.qml
View file

@ -59,7 +59,7 @@ ColumnLayout {
height: childrenRect.height height: childrenRect.height
} }
} }
ColumnLayout { StackLayout {
id: detailLayout id: detailLayout
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: 30 * DefaultStyle.dp Layout.topMargin: 30 * DefaultStyle.dp

10
Linphone/view/Control/Container/FormItemLayout.qml
View file

@ -14,7 +14,6 @@ FocusScope{
property bool enableErrorText: false property bool enableErrorText: false
property bool errorTextVisible: errorText.text.length > 0 property bool errorTextVisible: errorText.text.length > 0
implicitHeight: layout.implicitHeight implicitHeight: layout.implicitHeight
implicitWidth: layout.implicitWidth
function clearErrorText() { function clearErrorText() {
errorText.clear() errorText.clear()
@ -22,6 +21,8 @@ FocusScope{
ColumnLayout { ColumnLayout {
id: layout id: layout
spacing: 5 * DefaultStyle.dp spacing: 5 * DefaultStyle.dp
anchors.left: parent.left
anchors.right: parent.right
Text { Text {
visible: label.length > 0 visible: label.length > 0
@ -41,11 +42,12 @@ FocusScope{
Item { Item {
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
Layout.preferredWidth: childrenRect.width Layout.fillWidth: true
Item { StackLayout {
id: contentItem id: contentItem
height: childrenRect.height height: childrenRect.height
width: childrenRect.width anchors.left: parent.left
anchors.right: parent.right
} }
TemporaryText { TemporaryText {
id: errorText id: errorText

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

@ -11,28 +11,30 @@ ColumnLayout {
FormItemLayout { FormItemLayout {
id: username id: username
Layout.preferredWidth: 346 * DefaultStyle.dp
label: qsTr("Nom d'utilisateur") label: qsTr("Nom d'utilisateur")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
contentItem: TextField { contentItem: TextField {
id: usernameEdit id: usernameEdit
isError: username.errorTextVisible || errorText.visible
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * DefaultStyle.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * DefaultStyle.dp
isError: username.errorTextVisible || errorText.visible
} }
} }
Item { Item {
Layout.preferredHeight: password.implicitHeight Layout.preferredHeight: password.implicitHeight
FormItemLayout { FormItemLayout {
id: password id: password
width: 346 * DefaultStyle.dp
label: qsTr("Mot de passe") label: qsTr("Mot de passe")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
contentItem: TextField { contentItem: TextField {
id: passwordEdit id: passwordEdit
isError: password.errorTextVisible || errorText.visible
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * DefaultStyle.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * DefaultStyle.dp
isError: password.errorTextVisible || errorText.visible
hidden: true hidden: true
} }
TemporaryText { TemporaryText {

1
Linphone/view/Control/Input/DecoratedTextField.qml
View file

@ -31,6 +31,7 @@ FormItemLayout {
contentItem: TextField { contentItem: TextField {
id: textField id: textField
Layout.preferredWidth: 360 * DefaultStyle.dp
placeholderText: useTitleAsPlaceHolder ? mainItem.title : mainItem.placeHolder placeholderText: useTitleAsPlaceHolder ? mainItem.title : mainItem.placeHolder
initialText: mainItem.propertyOwner[mainItem.propertyName] initialText: mainItem.propertyOwner[mainItem.propertyName]
customWidth: mainItem.parent.width customWidth: mainItem.parent.width

2
Linphone/view/Control/Popup/Dialog/AuthenticationDialog.qml
View file

@ -20,6 +20,7 @@ Dialog {
bottomPadding: 20 * DefaultStyle.dp bottomPadding: 20 * DefaultStyle.dp
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * DefaultStyle.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * DefaultStyle.dp
width: 637 * DefaultStyle.dp
content: ColumnLayout { content: ColumnLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * DefaultStyle.dp
id: contentLayout id: contentLayout
@ -39,7 +40,6 @@ Dialog {
label: qsTr("Identité") label: qsTr("Identité")
contentItem: TextField { contentItem: TextField {
enabled: false enabled: false
customWidth: parent.width
initialText: mainItem.identity initialText: mainItem.identity
} }
} }

85
Linphone/view/Page/Form/Contact/ContactEdition.qml
View file

@ -83,9 +83,9 @@ MainRightPanel {
bannerContent: [ bannerContent: [
IconLabelButton { IconLabelButton {
id: addPictureButton id: addPictureButton
visible: !mainItem.contact || mainItem.contact.core.pictureUri.length === 0
Layout.preferredWidth: width Layout.preferredWidth: width
Layout.preferredHeight: 17 * DefaultStyle.dp Layout.preferredHeight: 17 * DefaultStyle.dp
visible: !mainItem.contact || mainItem.contact.core.pictureUri.length === 0
iconSource: AppIcons.camera iconSource: AppIcons.camera
iconSize: 17 * DefaultStyle.dp iconSize: 17 * DefaultStyle.dp
backgroundColor: "transparent" backgroundColor: "transparent"
@ -133,11 +133,9 @@ MainRightPanel {
Item{Layout.fillWidth: true} Item{Layout.fillWidth: true}
] ]
content: Flickable { content: Flickable {
id: editFlicakble id: editionLayout
Layout.fillHeight: true contentWidth: 421 * DefaultStyle.dp
Layout.fillWidth: true
// width: parent.width
// height: parent.height
function ensureVisible(r) { function ensureVisible(r) {
if (contentY >= r.y) if (contentY >= r.y)
contentY = r.y; contentY = r.y;
@ -146,27 +144,23 @@ MainRightPanel {
} }
ScrollBar.vertical: Control.ScrollBar { ScrollBar.vertical: Control.ScrollBar {
anchors.right: parent.right
} }
ScrollBar.horizontal: Control.ScrollBar { ScrollBar.horizontal: Control.ScrollBar {
} }
RowLayout {
spacing: 100 * DefaultStyle.dp
// anchors.left: parent.left
// anchors.right: parent.right
ColumnLayout { ColumnLayout {
spacing: 20 * DefaultStyle.dp spacing: 20 * DefaultStyle.dp
Layout.fillWidth: true anchors.left: parent.left
Layout.fillHeight: true anchors.right: parent.right
FormItemLayout { FormItemLayout {
id: givenName id: givenName
Layout.fillWidth: true
enableErrorText: true enableErrorText: true
label: qsTr("Prénom") label: qsTr("Prénom")
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: givenNameEdit id: givenNameEdit
Layout.fillWidth: true Layout.preferredHeight: 49 * DefaultStyle.dp
initialText: contact.core.givenName initialText: contact.core.givenName
onTextEdited: contact.core.givenName = text onTextEdited: contact.core.givenName = text
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
@ -177,6 +171,7 @@ MainRightPanel {
} }
FormItemLayout { FormItemLayout {
label: qsTr("Nom") label: qsTr("Nom")
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: nameTextField id: nameTextField
initialText: contact.core.familyName initialText: contact.core.familyName
@ -188,6 +183,7 @@ MainRightPanel {
} }
FormItemLayout { FormItemLayout {
label: qsTr("Entreprise") label: qsTr("Entreprise")
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: companyTextField id: companyTextField
initialText: contact.core.organization initialText: contact.core.organization
@ -199,6 +195,7 @@ MainRightPanel {
} }
FormItemLayout { FormItemLayout {
label: qsTr("Fonction") label: qsTr("Fonction")
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: jobTextField id: jobTextField
initialText: contact.core.job initialText: contact.core.job
@ -216,15 +213,8 @@ MainRightPanel {
} }
} }
} }
Item{Layout.fillHeight: true}
}
ColumnLayout {
spacing: 20 * DefaultStyle.dp
Layout.fillWidth: true
Layout.fillHeight: true
Repeater { Repeater {
id: addressesList id: addressesList
Layout.fillWidth: true
onCountChanged: mainItem.addressCount = count onCountChanged: mainItem.addressCount = count
model: VariantList { model: VariantList {
model: mainItem.contact && mainItem.contact.core.addresses || [] model: mainItem.contact && mainItem.contact.core.addresses || []
@ -251,14 +241,14 @@ MainRightPanel {
} }
TextField { TextField {
id: addressTextField id: addressTextField
Layout.preferredWidth: 421 * DefaultStyle.dp
Layout.preferredHeight: height
onEditingFinished: { onEditingFinished: {
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
initialText: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_initialText) : _initialText initialText: SettingsCpp.onlyDisplaySipUriUsername ? UtilsCpp.getUsername(_initialText) : _initialText
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
Layout.preferredWidth: width
Layout.preferredHeight: height
focus: true focus: true
KeyNavigation.right: removeAddressButton KeyNavigation.right: removeAddressButton
Keys.onPressed: (event) => addressLayout.updateFocus(event) Keys.onPressed: (event) => addressLayout.updateFocus(event)
@ -268,12 +258,12 @@ MainRightPanel {
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * DefaultStyle.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
background: Item{}
icon.source: AppIcons.closeX
width: 24 * DefaultStyle.dp width: 24 * DefaultStyle.dp
height: 24 * DefaultStyle.dp height: 24 * DefaultStyle.dp
icon.source: AppIcons.closeX
icon.width: 24 * DefaultStyle.dp icon.width: 24 * DefaultStyle.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * DefaultStyle.dp
background: Item{}
KeyNavigation.left: addressTextField KeyNavigation.left: addressTextField
Keys.onPressed: (event) => addressLayout.updateFocus(event) Keys.onPressed: (event) => addressLayout.updateFocus(event)
onClicked: mainItem.contact.core.removeAddress(index) onClicked: mainItem.contact.core.removeAddress(index)
@ -281,11 +271,10 @@ MainRightPanel {
} }
} }
} }
RowLayout {
onYChanged: editFlicakble.ensureVisible(this)
spacing: 10 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
label: qsTr("Adresse SIP") label: qsTr("Adresse SIP")
Layout.fillWidth: true
onYChanged: editionLayout.ensureVisible(this)
contentItem: TextField { contentItem: TextField {
id: newAddressTextField id: newAddressTextField
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
@ -310,13 +299,7 @@ MainRightPanel {
} }
} }
} }
Item {
Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp
}
}
Repeater { Repeater {
// phone numbers
id: phoneNumberList id: phoneNumberList
model: VariantList { model: VariantList {
model: mainItem.contact && mainItem.contact.core.phoneNumbers || [] model: mainItem.contact && mainItem.contact.core.phoneNumbers || []
@ -335,7 +318,7 @@ MainRightPanel {
event.accepted = true event.accepted = true
}else if(event.key == Qt.Key_Down){ }else if(event.key == Qt.Key_Down){
if(index + 1 < phoneNumberList.count) if(index + 1 < phoneNumberList.count)
addressesList.phoneNumberList(index+1).forceActiveFocus() phoneNumberList.itemAt(index+1).forceActiveFocus()
else else
phoneNumberInputTextField.forceActiveFocus() phoneNumberInputTextField.forceActiveFocus()
event.accepted = true event.accepted = true
@ -343,26 +326,26 @@ MainRightPanel {
} }
TextField { TextField {
id: phoneTextField id: phoneTextField
initialText: modelData.address Layout.preferredWidth: 421 * DefaultStyle.dp
onTextEdited: {
if (text.length != 0) mainItem.contact.core.setPhoneNumberAt(index, qsTr("Téléphone"), text)
}
backgroundColor: DefaultStyle.grey_0
Layout.preferredWidth: width
Layout.preferredHeight: height Layout.preferredHeight: height
initialText: modelData.address
backgroundColor: DefaultStyle.grey_0
focus: true focus: true
KeyNavigation.right: removePhoneButton KeyNavigation.right: removePhoneButton
Keys.onPressed: (event) => phoneNumberLayout.updateFocus(event) Keys.onPressed: (event) => phoneNumberLayout.updateFocus(event)
onEditingFinished: {
if (text.length != 0) mainItem.contact.core.setPhoneNumberAt(index, qsTr("Téléphone"), text)
}
} }
Button { Button {
id: removePhoneButton id: removePhoneButton
Layout.preferredWidth: 24 * DefaultStyle.dp Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp Layout.preferredHeight: 24 * DefaultStyle.dp
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
background: Item{}
icon.source: AppIcons.closeX
width: 24 * DefaultStyle.dp width: 24 * DefaultStyle.dp
height: 24 * DefaultStyle.dp height: 24 * DefaultStyle.dp
background: Item{}
icon.source: AppIcons.closeX
icon.width: 24 * DefaultStyle.dp icon.width: 24 * DefaultStyle.dp
icon.height: 24 * DefaultStyle.dp icon.height: 24 * DefaultStyle.dp
KeyNavigation.left: phoneTextField KeyNavigation.left: phoneTextField
@ -372,12 +355,11 @@ MainRightPanel {
} }
} }
} }
RowLayout {
onYChanged: editFlicakble.ensureVisible(this)
spacing: 10 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
id: phoneNumberInput id: phoneNumberInput
Layout.fillWidth: true
label: qsTr("Phone") label: qsTr("Phone")
onYChanged: editionLayout.ensureVisible(this)
contentItem: TextField { contentItem: TextField {
id: phoneNumberInputTextField id: phoneNumberInputTextField
backgroundColor: DefaultStyle.grey_0 backgroundColor: DefaultStyle.grey_0
@ -402,21 +384,16 @@ MainRightPanel {
} }
} }
} }
Item {
Layout.preferredWidth: 24 * DefaultStyle.dp
Layout.preferredHeight: 24 * DefaultStyle.dp
}
}
TemporaryText { TemporaryText {
id: addressesErrorText id: addressesErrorText
Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
elide: Text.ElideRight elide: Text.ElideRight
Layout.fillWidth: true onTextChanged: editionLayout.ensureVisible(this)
} }
Item{Layout.fillHeight: true} Item{Layout.fillHeight: true}
} }
} }
}
} }

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

@ -82,7 +82,7 @@ LoginLayout {
Component { Component {
id: firstItem id: firstItem
Flickable { Flickable {
width: contentWidth width: parent.width
contentWidth: content.implicitWidth contentWidth: content.implicitWidth
contentHeight: content.implicitHeight contentHeight: content.implicitHeight
clip: true clip: true
@ -188,7 +188,7 @@ LoginLayout {
Component { Component {
id: secondItem id: secondItem
Flickable { Flickable {
width: contentWidth width: parent.width
contentWidth: content.implicitWidth contentWidth: content.implicitWidth
contentHeight: content.implicitHeight contentHeight: content.implicitHeight
clip: true clip: true
@ -196,6 +196,8 @@ LoginLayout {
ColumnLayout { ColumnLayout {
id: content id: content
spacing: 2 * DefaultStyle.dp spacing: 2 * DefaultStyle.dp
width: 361 * DefaultStyle.dp
ColumnLayout { ColumnLayout {
spacing: 16 * DefaultStyle.dp spacing: 16 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
@ -203,6 +205,7 @@ LoginLayout {
label: qsTr("Nom d'utilisateur") label: qsTr("Nom d'utilisateur")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: usernameEdit id: usernameEdit
isError: username.errorTextVisible isError: username.errorTextVisible
@ -215,6 +218,7 @@ LoginLayout {
label: qsTr("Mot de passe") label: qsTr("Mot de passe")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: passwordEdit id: passwordEdit
isError: password.errorTextVisible isError: password.errorTextVisible
@ -229,6 +233,7 @@ LoginLayout {
label: qsTr("Domaine") label: qsTr("Domaine")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: domainEdit id: domainEdit
isError: domain.errorTextVisible isError: domain.errorTextVisible
@ -246,6 +251,7 @@ LoginLayout {
} }
FormItemLayout { FormItemLayout {
label: qsTr("Nom d'affichage") label: qsTr("Nom d'affichage")
Layout.fillWidth: true
contentItem: TextField { contentItem: TextField {
id: displayName id: displayName
Layout.preferredWidth: 360 * DefaultStyle.dp Layout.preferredWidth: 360 * DefaultStyle.dp
@ -256,6 +262,7 @@ LoginLayout {
} }
FormItemLayout { FormItemLayout {
label: qsTr("Transport") label: qsTr("Transport")
Layout.fillWidth: true
contentItem: ComboBox { contentItem: ComboBox {
id: transportCbox id: transportCbox
height: 49 * DefaultStyle.dp height: 49 * DefaultStyle.dp
@ -276,6 +283,7 @@ LoginLayout {
TemporaryText { TemporaryText {
id: errorText id: errorText
Layout.fillWidth: true
Connections { Connections {
target: LoginPageCpp target: LoginPageCpp
function onErrorMessageChanged(error) { function onErrorMessageChanged(error) {

28
Linphone/view/Page/Form/Register/RegisterPage.qml
View file

@ -93,60 +93,62 @@ LoginLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
ColumnLayout { ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
spacing: 22 * DefaultStyle.dp spacing: 22 * DefaultStyle.dp
ColumnLayout { ColumnLayout {
spacing: 24 * DefaultStyle.dp spacing: 24 * DefaultStyle.dp
RowLayout { RowLayout {
Layout.preferredHeight: usernameItem.height
spacing: 16 * DefaultStyle.dp spacing: 16 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
id: usernameItem id: usernameItem
label: qsTr("Username") label: qsTr("Username")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
Layout.preferredWidth: 346 * DefaultStyle.dp
contentItem: TextField { contentItem: TextField {
id: usernameInput id: usernameInput
Layout.preferredWidth: 346 * DefaultStyle.dp
backgroundBorderColor: usernameItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: usernameItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
RowLayout { RowLayout {
spacing: 10 * DefaultStyle.dp spacing: 10 * DefaultStyle.dp
Layout.alignment: Qt.AlignBottom
ComboBox { ComboBox {
enabled: false
model: [{text:"@sip.linphone.org"}]
Layout.preferredWidth: 210 * DefaultStyle.dp Layout.preferredWidth: 210 * DefaultStyle.dp
Layout.preferredHeight: 49 * DefaultStyle.dp Layout.preferredHeight: 49 * DefaultStyle.dp
enabled: false
model: [{text:"@sip.linphone.org"}]
} }
EffectImage { EffectImage {
imageSource: AppIcons.lock
colorizationColor: DefaultStyle.main2_600
Layout.preferredWidth: 16 * DefaultStyle.dp Layout.preferredWidth: 16 * DefaultStyle.dp
Layout.preferredHeight: 16 * DefaultStyle.dp Layout.preferredHeight: 16 * DefaultStyle.dp
imageSource: AppIcons.lock
colorizationColor: DefaultStyle.main2_600
} }
} }
} }
StackLayout { StackLayout {
currentIndex: bar.currentIndex currentIndex: bar.currentIndex
Layout.fillWidth: true
PhoneNumberInput { PhoneNumberInput {
id: phoneNumberInput id: phoneNumberInput
Layout.preferredWidth: 346 * DefaultStyle.dp
property string completePhoneNumber: countryCode + phoneNumber property string completePhoneNumber: countryCode + phoneNumber
label: qsTr("Numéro de téléphone") label: qsTr("Numéro de téléphone")
enableErrorText: true enableErrorText: true
mandatory: true mandatory: true
placeholderText: "Phone number" placeholderText: "Phone number"
defaultCallingCode: "33" defaultCallingCode: "33"
Layout.preferredWidth: 346 * DefaultStyle.dp
} }
FormItemLayout { FormItemLayout {
id: emailItem id: emailItem
Layout.fillWidth: false
Layout.preferredWidth: 346 * DefaultStyle.dp
label: qsTr("Email") label: qsTr("Email")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
contentItem: TextField { contentItem: TextField {
id: emailInput id: emailInput
Layout.preferredWidth: 346 * DefaultStyle.dp
backgroundBorderColor: emailItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: emailItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
@ -158,10 +160,9 @@ LoginLayout {
RowLayout { RowLayout {
id: rowlayout id: rowlayout
spacing: 16 * DefaultStyle.dp spacing: 16 * DefaultStyle.dp
ColumnLayout {
spacing: 5 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
id: passwordItem id: passwordItem
Layout.preferredWidth: 346 * DefaultStyle.dp
label: qsTr("Mot de passe") label: qsTr("Mot de passe")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
@ -172,10 +173,8 @@ LoginLayout {
backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200 backgroundBorderColor: passwordItem.errorMessage.length > 0 ? DefaultStyle.danger_500main : DefaultStyle.grey_200
} }
} }
}
ColumnLayout {
spacing: 5 * DefaultStyle.dp
FormItemLayout { FormItemLayout {
Layout.preferredWidth: 346 * DefaultStyle.dp
label: qsTr("Confirmation mot de passe") label: qsTr("Confirmation mot de passe")
mandatory: true mandatory: true
enableErrorText: true enableErrorText: true
@ -187,7 +186,6 @@ LoginLayout {
} }
} }
} }
}
TemporaryText { TemporaryText {
id: otherErrorText id: otherErrorText
Layout.fillWidth: true Layout.fillWidth: true

7
Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
View file

@ -47,6 +47,7 @@ AbstractSettingsLayout {
Layout.leftMargin: 64 * DefaultStyle.dp Layout.leftMargin: 64 * DefaultStyle.dp
Layout.topMargin: 20 * DefaultStyle.dp Layout.topMargin: 20 * DefaultStyle.dp
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
propertyName: "mwiServerAddress" propertyName: "mwiServerAddress"
propertyOwner: account.core propertyOwner: account.core
title: qsTr("URI du serveur de messagerie vocale") title: qsTr("URI du serveur de messagerie vocale")
@ -114,6 +115,7 @@ AbstractSettingsLayout {
propertyOwner: account.core propertyOwner: account.core
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
title: qsTr("URL du serveur mandataire") title: qsTr("URL du serveur mandataire")
propertyName: "serverAddress" propertyName: "serverAddress"
propertyOwner: account.core propertyOwner: account.core
@ -126,6 +128,7 @@ AbstractSettingsLayout {
propertyOwner: account.core propertyOwner: account.core
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
propertyName: "stunServer" propertyName: "stunServer"
propertyOwner: account.core propertyOwner: account.core
title: qsTr("Adresse du serveur STUN") title: qsTr("Adresse du serveur STUN")
@ -148,6 +151,7 @@ AbstractSettingsLayout {
propertyOwner: account.core propertyOwner: account.core
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
propertyName: "expire" propertyName: "expire"
propertyOwner: account.core propertyOwner: account.core
title: qsTr("Expiration (en seconde)") title: qsTr("Expiration (en seconde)")
@ -156,6 +160,7 @@ AbstractSettingsLayout {
toValidate: true toValidate: true
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
title: qsTr("URI de l’usine à conversations") title: qsTr("URI de l’usine à conversations")
propertyName: "conferenceFactoryAddress" propertyName: "conferenceFactoryAddress"
propertyOwner: account.core propertyOwner: account.core
@ -163,6 +168,7 @@ AbstractSettingsLayout {
toValidate: true toValidate: true
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
title: qsTr("URI de l’usine à réunions") title: qsTr("URI de l’usine à réunions")
propertyName: "audioVideoConferenceFactoryAddress" propertyName: "audioVideoConferenceFactoryAddress"
propertyOwner: account.core propertyOwner: account.core
@ -171,6 +177,7 @@ AbstractSettingsLayout {
toValidate: true toValidate: true
} }
DecoratedTextField { DecoratedTextField {
Layout.fillWidth: true
title: qsTr("URL du serveur d’échange de clés de chiffrement") title: qsTr("URL du serveur d’échange de clés de chiffrement")
propertyName: "limeServerUrl" propertyName: "limeServerUrl"
propertyOwner: account.core propertyOwner: account.core

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

@ -217,7 +217,6 @@ AbstractMainPage {
property: "showDefaultItem" property: "showDefaultItem"
when: searchBar.text.length != 0 when: searchBar.text.length != 0
value: false value: false
restoreMode: Binding.RestoreBindingOrValue
} }
} }
Item { Item {

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

@ -14,7 +14,7 @@ AbstractMainPage {
newItemIconSource: AppIcons.plusCircle newItemIconSource: AppIcons.plusCircle
// disable left panel contact list interaction while a contact is being edited // disable left panel contact list interaction while a contact is being edited
property bool leftPanelEnabled: true property bool leftPanelEnabled: !rightPanelStackView.currentItem || rightPanelStackView.currentItem.objectName != "contactEdition"
property FriendGui selectedContact property FriendGui selectedContact
property string initialFriendToDisplay property string initialFriendToDisplay
@ -551,8 +551,6 @@ AbstractMainPage {
} }
] ]
content: Flickable { content: Flickable {
Layout.fillWidth: true
Layout.fillHeight: true
contentWidth: parent.width contentWidth: parent.width
ColumnLayout { ColumnLayout {
spacing: 32 * DefaultStyle.dp spacing: 32 * DefaultStyle.dp
@ -912,8 +910,6 @@ AbstractMainPage {
id: contactEdition id: contactEdition
ContactEdition { ContactEdition {
property string objectName: "contactEdition" property string objectName: "contactEdition"
Control.StackView.onActivated: mainItem.leftPanelEnabled = false
Control.StackView.onDeactivated: mainItem.leftPanelEnabled = true
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)

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

@ -172,7 +172,6 @@ AbstractMainPage {
property: "showDefaultItem" property: "showDefaultItem"
when: searchBar.text.length !== 0 when: searchBar.text.length !== 0
value: false value: false
restoreMode: Binding.RestoreBindingOrValue
} }
} }
Text { Text {

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

@ -960,14 +960,12 @@ AbstractWindow {
when: middleItemStackView.currentItem.objectName === "waitingRoom" when: middleItemStackView.currentItem.objectName === "waitingRoom"
property: "imageSource" property: "imageSource"
value: AppIcons.usersThree value: AppIcons.usersThree
restoreMode: Binding.RestoreBindingOrValue
} }
Binding { Binding {
target: callStatusText target: callStatusText
when: middleItemStackView.currentItem.objectName === "waitingRoom" when: middleItemStackView.currentItem.objectName === "waitingRoom"
property: "text" property: "text"
value: waitingRoomIn.conferenceInfo ? waitingRoomIn.conferenceInfo.core.subject : '' value: waitingRoomIn.conferenceInfo ? waitingRoomIn.conferenceInfo.core.subject : ''
restoreMode: Binding.RestoreBindingOrValue
} }
Binding { Binding {
target: conferenceDate target: conferenceDate