mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 04:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(ui/views/App/Calls/ConferenceManager): in progress

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-29 12:12:08 +02:00
parent 1982234f63
commit 1b11e4004f
7 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/assets/languages/en.ts
View file

@ -368,7 +368,7 @@ Server url not configured.</translation>
<name>ConferenceControls</name>
<message>
<source>conference</source>
<translation type="unfinished"></translation>
<translation>CONFERENCE</translation>
</message>
</context>
<context>

2
linphone-desktop/assets/languages/fr.ts
View file

@ -368,7 +368,7 @@ Url du serveur non configurée.</translation>
<name>ConferenceControls</name>
<message>
<source>conference</source>
<translation type="unfinished"></translation>
<translation>CONFÉRENCE</translation>
</message>
</context>
<context>

1
linphone-desktop/resources.qrc
View file

@ -327,6 +327,7 @@
<file>ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml</file>
<file>ui/modules/Linphone/Styles/Calls/CallsStyle.qml</file>
<file>ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml</file>
<file>ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml</file>
<file>ui/modules/Linphone/Styles/Chat/ChatStyle.qml</file>
<file>ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml</file>
<file>ui/modules/Linphone/Styles/Contact/AvatarStyle.qml</file>

2
linphone-desktop/ui/modules/Linphone/Calls/Calls.js
View file

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

23
linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml
View file

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

13
linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml Normal file
View file

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

3
linphone-desktop/ui/modules/Linphone/Styles/qmldir
View file

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