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
b729dfa3
Commit
b729dfa3
authored
Sep 14, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(mainWindow/conversation): display contact actions
parent
a2efc6fa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
13 deletions
+40
-13
resources.qrc
tests/resources.qrc
+1
-0
DialogPlus.qml
tests/ui/components/dialog/DialogPlus.qml
+0
-1
ActionBar.qml
tests/ui/components/form/ActionBar.qml
+1
-1
contacts.qml
tests/ui/views/mainWindow/contacts.qml
+38
-11
No files found.
tests/resources.qrc
View file @
b729dfa3
...
...
@@ -31,6 +31,7 @@
<file>
imgs/led_do_not_disturb.svg
</file>
<file>
imgs/conference.svg
</file>
<file>
imgs/cam.svg
</file>
<file>
imgs/chat.svg
</file>
<file>
imgs/chat_attachment.svg
</file>
<file>
imgs/led_connected.svg
</file>
<file>
imgs/led_absent.svg
</file>
...
...
tests/ui/components/dialog/DialogPlus.qml
View file @
b729dfa3
...
...
@@ -10,7 +10,6 @@ Window {
default
property
alias
content
:
content
.
data
// Required.
property
alias
buttons
:
buttons
.
data
// Required.
property
alias
descriptionText
:
description
.
text
// Optionnal.
property
bool
centeredButtons
// Optionnal.
modality
:
Qt
.
WindowModal
...
...
tests/ui/components/form/ActionBar.qml
View file @
b729dfa3
import
QtQuick
2.7
// ===================================================================
// Bar which can contains ActionButton.
// Bar which can contains ActionButton
s
.
// ===================================================================
Row
{
...
...
tests/ui/views/mainWindow/contacts.qml
View file @
b729dfa3
...
...
@@ -26,15 +26,14 @@ ColumnLayout {
TextField
{
Layout.fillWidth
:
true
Layout.preferredHeight
:
parent
.
height
background
:
Rectangle
{
color
:
'
#EAEAEA
'
implicitHeight
:
30
}
placeholderText
:
qsTr
(
'
searchContactPlaceholder
'
)
}
ExclusiveButtons
{
Layout.preferredHeight
:
parent
.
height
texts
:
[
qsTr
(
'
selectAllContacts
'
),
qsTr
(
'
selectConnectedContacts
'
)
...
...
@@ -42,7 +41,6 @@ ColumnLayout {
}
LightButton
{
Layout.preferredHeight
:
parent
.
height
text
:
qsTr
(
'
addContact
'
)
}
}
...
...
@@ -156,6 +154,13 @@ ColumnLayout {
id
:
contact
width
:
parent
.
width
MouseArea
{
anchors.fill
:
parent
hoverEnabled
:
true
onEntered
:
contact
.
state
=
'
hover
'
onExited
:
contact
.
state
=
''
}
Item
{
anchors.verticalCenter
:
parent
.
verticalCenter
height
:
30
...
...
@@ -199,24 +204,46 @@ ColumnLayout {
font.weight
:
Font
.
DemiBold
text
:
$username
verticalAlignment
:
Text
.
AlignVCenter
MouseArea
{
anchors.fill
:
parent
hoverEnabled
:
true
onEntered
:
contact
.
state
=
'
hover
'
onExited
:
contact
.
state
=
''
}
}
}
// Actions.
// TODO.
Row
{
Layout.fillHeight
:
true
id
:
actions
spacing
:
50
visible
:
false
ActionBar
{
iconSize
:
parent
.
height
ActionButton
{
icon
:
'
cam
'
}
ActionButton
{
icon
:
'
call
'
}
ActionButton
{
icon
:
'
chat
'
}
}
ActionButton
{
iconSize
:
parent
.
height
icon
:
'
delete
'
onClicked
:
console
.
log
(
'
toto
'
)
}
}
}
}
states
:
State
{
name
:
'
hover
'
PropertyChanges
{
target
:
contact
;
color
:
'
#D1D1D1
'
}
PropertyChanges
{
target
:
actions
;
visible
:
true
}
}
}
}
...
...
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