return to meeting list if cancel scheduling of a conf

Linphone/view/Control/Container/Contact/ContactLayout.qml

@@ -17,20 +17,7 @@ ColumnLayout {
 	property alias bannerContent: bannerLayout.data
 	property alias secondLineContent: verticalLayoutSecondLine.data
 	property int minimumWidthForSwitchintToRowLayout: 756 * DefaultStyle.dp
-	property var useVerticalLayout
+	property var useVerticalLayout: width < minimumWidthForSwitchintToRowLayout * DefaultStyle.dp
-	function setResponsivityFlags() {
-		var mainWin = UtilsCpp.getMainWindow()
-		var newValue = width < minimumWidthForSwitchintToRowLayout * DefaultStyle.dp
-		if (useVerticalLayout != newValue) {
-			useVerticalLayout = newValue
-		}
-	}
-	onWidthChanged: {
-		setResponsivityFlags()
-    }
-	Component.onCompleted: {
-			setResponsivityFlags()
-	}
 
 	GridLayout {
 		Layout.leftMargin: 64 * DefaultStyle.dp

Linphone/view/Control/Popup/Loading/LoadingPopup.qml

@@ -7,6 +7,7 @@ Popup {
 	id: mainItem
 	property string text
 	property bool cancelButtonVisible: false
+	property var callback
 	modal: true
 	closePolicy: Control.Popup.NoAutoClose
 	anchors.centerIn: parent
@@ -35,7 +36,10 @@ Popup {
 			visible: mainItem.cancelButtonVisible
 			Layout.alignment: Qt.AlignHCenter
 			text: qsTr("Annuler")
-			onClicked: mainItem.close()
+			onClicked: {
+				if (callback) mainItem.callback()
+				mainItem.close()
+			}
 		}
 	}
 }

Linphone/view/Page/Main/Meeting/MeetingPage.qml

@@ -275,7 +275,9 @@ AbstractMainPage {
 								UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("La conférence doit contenir au moins un participant"), false)
 							} else {
 								meetingSetup.conferenceInfoGui.core.save()
-								mainWindow.showLoadingPopup(qsTr("Création de la réunion en cours ..."), true)
+								mainWindow.showLoadingPopup(qsTr("Création de la réunion en cours ..."), true, function () {
+									leftPanelStackView.pop()
+								})
 							}
 						}
 					}
@@ -293,7 +295,9 @@ AbstractMainPage {
 							var mainWin = UtilsCpp.getMainWindow()
 							if (meetingSetup.conferenceInfoGui.core.schedulerState == LinphoneEnums.ConferenceSchedulerState.AllocationPending
 								|| meetingSetup.conferenceInfoGui.core.schedulerState == LinphoneEnums.ConferenceSchedulerState.Updating) {
-								mainWin.showLoadingPopup(qsTr("Création de la réunion en cours..."))
+								mainWin.showLoadingPopup(qsTr("Création de la réunion en cours..."), true, function () {
+									leftPanelStackView.pop()
+								})
 							} else {
 								if (meetingSetup.conferenceInfoGui.core.schedulerState == LinphoneEnums.ConferenceSchedulerState.Error) {
 									UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("La création de la conférence a échoué"), false)
@@ -339,14 +343,14 @@ AbstractMainPage {
 				id: editLayout
 				anchors.left: parent.left
 				anchors.right: parent.right
+				anchors.top: parent.top
 				anchors.topMargin: 58 * DefaultStyle.dp
 				spacing: 0
 				Section {
 					Layout.preferredWidth: 393 * DefaultStyle.dp
 					content: RowLayout {
-						spacing: 8 * DefaultStyle.dp
+						spacing: 16 * DefaultStyle.dp
 						Layout.preferredWidth: overridenRightPanelStackView.width
-						Layout.preferredHeight: childrenRect.height
 						Button {
 							id: backButton
 							Layout.preferredWidth: 24 * DefaultStyle.dp
@@ -364,6 +368,14 @@ AbstractMainPage {
 							}
 							background: Item{}
 						}
+						RowLayout {
+							spacing: 8 * DefaultStyle.dp
+							EffectImage{
+								imageSource: AppIcons.usersThree
+								colorizationColor: DefaultStyle.main2_600
+								Layout.preferredWidth: 24 * DefaultStyle.dp
+								Layout.preferredHeight: 24 * DefaultStyle.dp
+							}
 							TextInput {
 								id: titleText
 								Layout.fillWidth: true
@@ -410,6 +422,7 @@ AbstractMainPage {
 							}
 						}
 					}
+				}
 				MeetingForm {
 					id: conferenceEdit
 					property bool isCreation
@@ -547,7 +560,9 @@ AbstractMainPage {
 			height: meetingDetailsLayout.implicitHeight
 			ColumnLayout {
 				id: meetingDetailsLayout
-				anchors.fill: parent
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.top: parent.top
 				anchors.topMargin: 58 * DefaultStyle.dp
 				visible: mainItem.selectedConference
 				spacing: 25 * DefaultStyle.dp
@@ -556,8 +571,9 @@ AbstractMainPage {
 					Layout.fillWidth: true
 					content: RowLayout {
 						spacing: 8 * DefaultStyle.dp
-						Image {
+						EffectImage {
-							source: AppIcons.usersThree
+							imageSource: AppIcons.usersThree
+							colorizationColor: DefaultStyle.main2_600
 							Layout.preferredWidth: 24 * DefaultStyle.dp
 							Layout.preferredHeight: 24 * DefaultStyle.dp
 						}
@@ -803,6 +819,7 @@ AbstractMainPage {
 								}
 								Text {
 									text: modelData.displayName
+									maximumLineCount: 1
 									Layout.fillWidth: true
 									font {
 										pixelSize: 14 * DefaultStyle.dp

Linphone/view/Page/Window/AbstractWindow.qml

@@ -199,9 +199,10 @@ ApplicationWindow {
 		infoPopup.open()
 		infoPopup.closePopup.connect(removeFromPopupLayout)
 	}
-	function showLoadingPopup(text, cancelButtonVisible) {
+	function showLoadingPopup(text, cancelButtonVisible, callback) {
 		if (cancelButtonVisible == undefined) cancelButtonVisible = false
 		loadingPopup.text = text
+		loadingPopup.callback = callback
 		loadingPopup.cancelButtonVisible = cancelButtonVisible
 		loadingPopup.open()
 	}