Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
d86be325
Commit
d86be325
authored
May 12, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
7b3dcc47
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
128 additions
and
2 deletions
+128
-2
en.ts
linphone-desktop/assets/languages/en.ts
+7
-0
fr.ts
linphone-desktop/assets/languages/fr.ts
+7
-0
resources.qrc
linphone-desktop/resources.qrc
+3
-0
SmartSearchBarModel.hpp
...p/src/components/smart-search-bar/SmartSearchBarModel.hpp
+1
-0
Tooltip.qml
linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml
+1
-1
CallsWindow.js
linphone-desktop/ui/views/App/Calls/CallsWindow.js
+5
-0
CallsWindow.qml
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
+2
-1
ConferenceManager.js
linphone-desktop/ui/views/App/Calls/ConferenceManager.js
+7
-0
ConferenceManager.qml
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
+70
-0
ConferenceManagerStyle.qml
...ktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
+24
-0
qmldir
linphone-desktop/ui/views/App/Styles/qmldir
+1
-0
No files found.
linphone-desktop/assets/languages/en.ts
View file @
d86be325
...
...
@@ -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
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
d86be325
...
...
@@ -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
>
...
...
linphone-desktop/resources.qrc
View file @
d86be325
...
...
@@ -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>
...
...
linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp
View file @
d86be325
...
...
@@ -47,6 +47,7 @@ private:
int
computeStringWeight
(
const
QString
&
string
)
const
;
QString
mFilter
;
static
const
QRegExp
mSearchSeparators
;
};
...
...
linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml
View file @
d86be325
...
...
@@ -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.
'
)
}
}
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file @
d86be325
...
...
@@ -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
'
))
}
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file @
d86be325
...
...
@@ -94,7 +94,8 @@ Window {
ActionButton
{
icon
:
'
new_conference
'
// TODO: launch new conference
onClicked
:
Logic
.
openConferenceManager
()
}
}
}
...
...
linphone-desktop/ui/views/App/Calls/ConferenceManager.js
0 → 100644
View file @
d86be325
// =============================================================================
// `ConferenceManager.qml` Logic.
// =============================================================================
function
updateFilter
(
text
)
{
console
.
log
(
'
TODO
'
)
}
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
0 → 100644
View file @
d86be325
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
}
}
}
linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
0 → 100644
View file @
d86be325
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
}
}
}
linphone-desktop/ui/views/App/Styles/qmldir
View file @
d86be325
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment