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
2db3292b
Commit
2db3292b
authored
May 17, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
e560d4cf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
19 deletions
+37
-19
ScrollableListViewField.qml
...ui/modules/Common/Form/Fields/ScrollableListViewField.qml
+0
-4
SmartSearchBar.qml
...top/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
+17
-14
ConferenceManager.qml
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
+19
-0
ConferenceManagerStyle.qml
...ktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
+1
-1
No files found.
linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
View file @
2db3292b
...
...
@@ -13,8 +13,4 @@ Rectangle {
color
:
TextFieldStyle
.
background
.
color
.
normal
radius
:
TextFieldStyle
.
background
.
radius
ScrollableListView
{
anchors.fill
:
parent
}
}
linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
View file @
2db3292b
...
...
@@ -6,11 +6,11 @@ import Linphone.Styles 1.0
// =============================================================================
SearchBox
{
id
:
searchB
ox
id
:
searchB
ar
// ---------------------------------------------------------------------------
readonly
property
alias
isOpen
:
searchB
ox
.
_isOpen
readonly
property
alias
isOpen
:
searchB
ar
.
_isOpen
// ---------------------------------------------------------------------------
...
...
@@ -27,7 +27,10 @@ SearchBox {
// ---------------------------------------------------------------------------
onEnterPressed
:
view
.
interpretableSipAddress
.
length
>
0
&&
searchBox
.
launchCall
(
interpretableSipAddress
)
onEnterPressed
:
{
var
sipAddress
=
view
.
interpretableSipAddress
return
sipAddress
.
length
>
0
&&
searchBar
.
launchCall
(
sipAddress
)
}
// ---------------------------------------------------------------------------
...
...
@@ -37,35 +40,35 @@ SearchBox {
actions
:
[{
icon
:
'
video_call
'
,
handler
:
function
(
entry
)
{
searchB
ox
.
closeMenu
()
searchB
ox
.
launchVideoCall
(
entry
.
sipAddress
)
searchB
ar
.
closeMenu
()
searchB
ar
.
launchVideoCall
(
entry
.
sipAddress
)
}
},
{
icon
:
'
call
'
,
handler
:
function
(
entry
)
{
searchB
ox
.
closeMenu
()
searchB
ox
.
launchCall
(
entry
.
sipAddress
)
searchB
ar
.
closeMenu
()
searchB
ar
.
launchCall
(
entry
.
sipAddress
)
}
},
{
icon
:
'
chat
'
,
handler
:
function
(
entry
)
{
searchB
ox
.
closeMenu
()
searchB
ox
.
launchChat
(
entry
.
sipAddress
)
searchB
ar
.
closeMenu
()
searchB
ar
.
launchChat
(
entry
.
sipAddress
)
}
}]
headerButtonDescription
:
qsTr
(
'
addContact
'
)
headerButtonIcon
:
'
contact_add
'
headerButtonAction
:
(
function
(
sipAddress
)
{
searchB
ox
.
closeMenu
()
searchB
ox
.
addContact
(
sipAddress
)
searchB
ar
.
closeMenu
()
searchB
ar
.
addContact
(
sipAddress
)
})
genSipAddress
:
searchB
ox
.
filter
genSipAddress
:
searchB
ar
.
filter
onEntryClicked
:
{
searchB
ox
.
closeMenu
()
searchB
ox
.
entryClicked
(
entry
)
searchB
ar
.
closeMenu
()
searchB
ar
.
entryClicked
(
entry
)
}
}
}
linphone-desktop/ui/views/App/Calls/ConferenceManager.qml
View file @
2db3292b
...
...
@@ -52,6 +52,25 @@ ConfirmDialog {
ScrollableListViewField
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
SipAddressesView
{
id
:
view
anchors.fill
:
parent
actions
:
[{
icon
:
'
video_call
'
,
handler
:
function
(
entry
)
{
console
.
log
(
'
toto
'
)
}
}]
genSipAddress
:
filter
.
text
onEntryClicked
:
{
console
.
log
(
'
todo2
'
)
}
}
}
}
}
...
...
linphone-desktop/ui/views/App/Styles/Calls/ConferenceManagerStyle.qml
View file @
2db3292b
...
...
@@ -9,7 +9,7 @@ QtObject {
property
int
height
:
420
property
int
leftMargin
:
35
property
int
rightMargin
:
35
property
int
width
:
68
0
property
int
width
:
74
0
property
QtObject
columns
:
QtObject
{
property
QtObject
selector
:
QtObject
{
...
...
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