mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 05:23: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-12 15:21:21 +02:00
parent 7b3dcc47de
commit d86be325c2
11 changed files with 128 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -357,6 +357,13 @@ Server url not configured.</translation>
<translation>Status</translation>
</message>
</context>
<context>
<name>ConferenceManager</name>
<message>
<source>conferenceManagerDescription</source>
<translation>Manage participants to your conference.</translation>
</message>
</context>
<context>
<name>ConfirmDialog</name>
<message>

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

@ -357,6 +357,13 @@ Url du serveur non configurée.</translation>
<translation>Status</translation>
</message>
</context>
<context>
<name>ConferenceManager</name>
<message>
<source>conferenceManagerDescription</source>
<translation>Gérer les participants de votre conférence.</translation>
</message>
</context>
<context>
<name>ConfirmDialog</name>
<message>

3
linphone-desktop/resources.qrc
View file

@ -339,6 +339,8 @@
<file>ui/views/App/Calls/AbstractStartingCall.qml</file>
<file>ui/views/App/Calls/CallsWindow.js</file>
<file>ui/views/App/Calls/CallsWindow.qml</file>
<file>ui/views/App/Calls/ConferenceManager.js</file>
<file>ui/views/App/Calls/ConferenceManager.qml</file>
<file>ui/views/App/Calls/EndedCall.qml</file>
<file>ui/views/App/Calls/IncallFullscreenWindow.qml</file>
<file>ui/views/App/Calls/Incall.js</file>
@ -387,6 +389,7 @@
<file>ui/views/App/SplashScreen/SplashScreen.qml</file>
<file>ui/views/App/Styles/Calls/CallStyle.qml</file>
<file>ui/views/App/Styles/Calls/CallsWindowStyle.qml</file>
<file>ui/views/App/Styles/Calls/ConferenceManagerStyle.qml</file>
<file>ui/views/App/Styles/Main/AboutStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml</file>
<file>ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml</file>

1
linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp
View file

@ -47,6 +47,7 @@ private:
int computeStringWeight (const QString &string) const;
QString mFilter;
static const QRegExp mSearchSeparators;
};

2
linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml
View file

@ -51,8 +51,8 @@ ToolTip {
} else if (a.y > b.y + b.height) {
_edge = 'bottom'
} else {
// Unable to get the tooltip arrow position.
_edge = null
console.warn('Unable to get the tooltip arrow position.')
}
}

5
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file

@ -17,6 +17,7 @@ function handleClosing (close) {
return
}
window.detachVirtualWindow()
window.attachVirtualWindow(Utils.buildDialogUri('ConfirmDialog'), {
descriptionText: qsTr('acceptClosingDescription'),
}, function (status) {
@ -28,3 +29,7 @@ function handleClosing (close) {
close.accepted = false
}
function openConferenceManager () {
window.attachVirtualWindow(Qt.resolvedUrl('ConferenceManager.qml'))
}

3
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file

@ -94,7 +94,8 @@ Window {
ActionButton {
icon: 'new_conference'
// TODO: launch new conference
onClicked: Logic.openConferenceManager()
}
}
}

7
linphone-desktop/ui/views/App/Calls/ConferenceManager.js Normal file
View file

@ -0,0 +1,7 @@
// =============================================================================
// `ConferenceManager.qml` Logic.
// =============================================================================
function updateFilter (text) {
console.log('TODO')
}

70
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml Normal file
View file

@ -0,0 +1,70 @@
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Common 1.0
import Linphone 1.0
import App.Styles 1.0
import 'ConferenceManager.js' as Logic
// =============================================================================
ConfirmDialog {
descriptionText: qsTr('conferenceManagerDescription')
height: ConferenceManagerStyle.height
width: ConferenceManagerStyle.width
// ---------------------------------------------------------------------------
RowLayout {
anchors {
fill: parent
leftMargin: ConferenceManagerStyle.leftMargin
rightMargin: ConferenceManagerStyle.rightMargin
}
spacing: 0
// -------------------------------------------------------------------------
// Address selector.
// -------------------------------------------------------------------------
Column {
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
spacing: ConferenceManagerStyle.columns.selector.spacing
TextField {
icon: 'search'
width: parent.width
onTextChanged: Logic.updateFilter(text)
}
}
// -------------------------------------------------------------------------
// Separator.
// -------------------------------------------------------------------------
Rectangle {
Layout.fillHeight: true
Layout.leftMargin: ConferenceManagerStyle.leftMargin
Layout.preferredWidth: ConferenceManagerStyle.columns.separator.width
Layout.rightMargin: ConferenceManagerStyle.rightMargin
color: ConferenceManagerStyle.columns.separator.color
}
// -------------------------------------------------------------------------
// See and remove selected addresses.
// -------------------------------------------------------------------------
Column {
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
}
}
}

24
linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml Normal file
View file

@ -0,0 +1,24 @@
pragma Singleton
import QtQuick 2.7
import Common 1.0
// =============================================================================
QtObject {
property int height: 420
property int leftMargin: 35
property int rightMargin: 35
property int width: 680
property QtObject columns: QtObject {
property QtObject selector: QtObject {
property int spacing: 10
}
property QtObject separator: QtObject {
property color color: Colors.c
property int width: 1
}
}
}

1
linphone-desktop/ui/views/App/Styles/qmldir
View file

@ -6,6 +6,7 @@ module App.Styles
singleton CallStyle 1.0 Calls/CallStyle.qml
singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml
singleton ConferenceManagerStyle 1.0 Calls/ConferenceManagerStyle.qml
singleton ActivateLinphoneSipAccountWithEmailStyle 1.0 Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
singleton AssistantAbstractViewStyle 1.0 Main/Assistant/AssistantAbstractViewStyle.qml