From 89ea3a8cb8c002258b932d4d77fd426f492382b6 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 16 Apr 2021 22:48:14 +0200
Subject: [PATCH] Update GUI, SDK and fix function name

---
 linphone-app/src/app/cli/Cli.cpp              |  2 +-
 .../conference/ConferenceAddModel.cpp         |  2 +-
 .../ui/views/App/Settings/SettingsLdap.qml    | 38 +++++++++++++------
 .../Styles/Settings/SettingsAdvancedStyle.qml |  5 +++
 linphone-sdk                                  |  2 +-
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/linphone-app/src/app/cli/Cli.cpp b/linphone-app/src/app/cli/Cli.cpp
index d5357837f..373fd2388 100644
--- a/linphone-app/src/app/cli/Cli.cpp
+++ b/linphone-app/src/app/cli/Cli.cpp
@@ -173,7 +173,7 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
 
 	qInfo() << QStringLiteral("Create conference with id: `%1`.").arg(id);
 	auto confParameters = core->createConferenceParams();
-	confParameters->enableVideo(false);// Video is not yet fully supported by the application in conference
+	confParameters->setVideoEnabled(false);// Video is not yet fully supported by the application in conference
 	conference = core->createConferenceWithParams(confParameters);
 	conference->setId(Utils::appStringToCoreString(id));
 
diff --git a/linphone-app/src/components/conference/ConferenceAddModel.cpp b/linphone-app/src/components/conference/ConferenceAddModel.cpp
index 13a986d1a..d72bcb9cb 100644
--- a/linphone-app/src/components/conference/ConferenceAddModel.cpp
+++ b/linphone-app/src/components/conference/ConferenceAddModel.cpp
@@ -137,7 +137,7 @@ void ConferenceHelperModel::ConferenceAddModel::update () {
   shared_ptr<linphone::Conference> conference = mConferenceHelperModel->mCore->getConference();
   if(!conference){
     auto parameters = mConferenceHelperModel->mCore->createConferenceParams();
-    parameters->enableVideo(false);// Video is not yet fully supported by the application in conference
+    parameters->setVideoEnabled(false);// Video is not yet fully supported by the application in conference
     conference = mConferenceHelperModel->mCore->createConferenceWithParams(parameters);
   }
   auto currentCalls = CoreManager::getInstance()->getCore()->getCalls();
diff --git a/linphone-app/ui/views/App/Settings/SettingsLdap.qml b/linphone-app/ui/views/App/Settings/SettingsLdap.qml
index 570f46177..85115fb9c 100644
--- a/linphone-app/ui/views/App/Settings/SettingsLdap.qml
+++ b/linphone-app/ui/views/App/Settings/SettingsLdap.qml
@@ -19,15 +19,15 @@ Column {
 	function add(){
 		LdapListModel.add()
 	}
-	
+
 	spacing: FormStyle.spacing
-	
+
 	// ---------------------------------------------------------------------------
 	Repeater{
 		id: ldapList
 		model:LdapProxyModel{id:ldapProxy}
 		delegate:Item{
-// LDAP line description : Summary (remove + name + activation)
+// LDAP line description : Summary (name + activation + remove)
 			id: swipeView
 			anchors.left: parent.left
 			anchors.right: parent.right
@@ -39,15 +39,7 @@ Column {
 				Row{
 					id:summaryRowItem
 					anchors.horizontalCenter: parent.horizontalCenter
-					spacing:20
-					ActionButton {
-						id:removeldap
-						anchors.verticalCenter: parent.verticalCenter
-						icon: 'cancel'
-						iconSize:CallsStyle.entry.iconActionSize
-						scale:0.8
-						onClicked:LdapListModel.remove(modelData)
-					}
+					spacing:SettingsAdvancedStyle.lists.spacing
 					Text {
 						id: summaryTitle
 						color: FormStyle.header.title.color
@@ -71,6 +63,28 @@ Column {
 						}
 					}
 				}
+				ActionButton {
+					id:removeldap
+					anchors.verticalCenter: parent.verticalCenter
+					anchors.right:parent.right
+					anchors.rightMargin:SettingsAdvancedStyle.lists.margin
+					icon: 'cancel'
+					iconSize:CallsStyle.entry.iconActionSize
+					scale:SettingsAdvancedStyle.lists.iconScale
+					onClicked:{
+						LdapListModel.remove(modelData)
+					}
+					visible:hoveringRow.containsMouse
+				}
+			}
+			MouseArea{
+				id:hoveringRow
+				anchors.fill:parent
+				preventStealing :true
+				hoverEnabled :true
+				propagateComposedEvents:true
+				onClicked:{mouse.accepted = false}
+				onPressed:{mouse.accepted = false}
 			}
 		}
 	}
diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml
index ef9dbb36f..8b58ee3d0 100644
--- a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml
+++ b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml
@@ -17,4 +17,9 @@ QtObject {
     property color color: Colors.j
     property int pointSize: Units.dp * 11
   }
+  property QtObject lists: QtObject {
+    property int spacing: 20
+    property real iconScale : 0.8
+    property int margin: 10
+  }
 }
diff --git a/linphone-sdk b/linphone-sdk
index e4c051fa9..057001384 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit e4c051fa9b3c9efb631047edd8c0a961e1487c82
+Subproject commit 057001384addc4d833c3c2651f52b2ab215b8d5d