diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index 790bc8d7d..8adc2ca6b 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -368,7 +368,7 @@ Server url not configured.
ConferenceControls
conference
-
+ CONFERENCE
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index 333098fdc..6155dc0f4 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -368,7 +368,7 @@ Url du serveur non configurée.
ConferenceControls
conference
-
+ CONFÉRENCE
diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc
index d3e27e9df..181a5c5ef 100644
--- a/linphone-desktop/resources.qrc
+++ b/linphone-desktop/resources.qrc
@@ -327,6 +327,7 @@
ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml
ui/modules/Linphone/Styles/Calls/CallsStyle.qml
ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
+ ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
diff --git a/linphone-desktop/ui/modules/Linphone/Calls/Calls.js b/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
index 42737e6ae..2d7327076 100644
--- a/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
+++ b/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
@@ -107,6 +107,8 @@ function resetSelectedCall () {
function setIndexWithCall (call) {
var count = calls.count
+ var model = calls.model
+
for (var i = 0; i < count; i++) {
if (call === model.data(model.index(i, 0))) {
updateSelectedCall(call, i)
diff --git a/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml b/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml
index 329a38c06..3159f0428 100644
--- a/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml
+++ b/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml
@@ -12,7 +12,6 @@ Rectangle {
// ---------------------------------------------------------------------------
- property alias signIcon: signIcon.icon
property alias textColor: text.color
// ---------------------------------------------------------------------------
@@ -21,8 +20,8 @@ Rectangle {
// ---------------------------------------------------------------------------
- color: CallControlsStyle.color
- height: CallControlsStyle.height
+ color: ConferenceControlsStyle.color
+ height: ConferenceControlsStyle.height
MouseArea {
anchors.fill: parent
@@ -30,22 +29,11 @@ Rectangle {
onClicked: callControls.clicked()
}
- Icon {
- id: signIcon
-
- anchors {
- left: parent.left
- top: parent.top
- }
-
- iconSize: CallControlsStyle.signSize
- }
-
RowLayout {
anchors {
fill: parent
- leftMargin: CallControlsStyle.leftMargin
- rightMargin: CallControlsStyle.rightMargin
+ leftMargin: ConferenceControlsStyle.leftMargin
+ rightMargin: ConferenceControlsStyle.rightMargin
}
spacing: 0
@@ -56,7 +44,10 @@ Rectangle {
Layout.fillHeight: true
Layout.fillWidth: true
+ font.bold: true
text: qsTr('conference')
+
+ verticalAlignment: Text.AlignVCenter
}
}
}
diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml
new file mode 100644
index 000000000..b58f4ba5b
--- /dev/null
+++ b/linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml
@@ -0,0 +1,13 @@
+pragma Singleton
+import QtQuick 2.7
+
+import Common 1.0
+
+// =============================================================================
+
+QtObject {
+ property color color: Colors.e
+ property int height: 60
+ property int leftMargin: 12
+ property int rightMargin: 12
+}
diff --git a/linphone-desktop/ui/modules/Linphone/Styles/qmldir b/linphone-desktop/ui/modules/Linphone/Styles/qmldir
index 3bbd06035..2c9172222 100644
--- a/linphone-desktop/ui/modules/Linphone/Styles/qmldir
+++ b/linphone-desktop/ui/modules/Linphone/Styles/qmldir
@@ -11,9 +11,10 @@ singleton RequestBlockStyle 1.0 Blocks/RequestBlockStyle.qml
singleton ChatStyle 1.0 Chat/ChatStyle.qml
-singleton CallsStyle 1.0 Calls/CallsStyle.qml
singleton CallControlsStyle 1.0 Calls/CallControlsStyle.qml
+singleton CallsStyle 1.0 Calls/CallsStyle.qml
singleton CallStatisticsStyle 1.0 Calls/CallStatisticsStyle.qml
+singleton ConferenceControlsStyle 1.0 Calls/ConferenceControlsStyle.qml
singleton CodecsViewerStyle 1.0 Codecs/CodecsViewerStyle.qml