mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update GUI, SDK and fix function name

Browse source
This commit is contained in:
Julien Wadel 2021-04-16 22:48:14 +02:00
parent 08c5aac211
commit 89ea3a8cb8
5 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/app/cli/Cli.cpp
View file

@ -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));

2
linphone-app/src/components/conference/ConferenceAddModel.cpp
View file

@ -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();

38
linphone-app/ui/views/App/Settings/SettingsLdap.qml
View file

@ -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}
}
}
}

5
linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml
View file

@ -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
}
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit e4c051fa9b3c9efb631047edd8c0a961e1487c82
Subproject commit 057001384addc4d833c3c2651f52b2ab215b8d5d