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
bd7a4a2b
Commit
bd7a4a2b
authored
Sep 20, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mainWindow/contact): description bar
parent
cb1bf9a0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
6 deletions
+51
-6
main.cpp
tests/src/main.cpp
+7
-5
ShortContactDescription.qml
tests/ui/components/contact/ShortContactDescription.qml
+1
-1
contact.qml
tests/ui/views/mainWindow/contact.qml
+43
-0
No files found.
tests/src/main.cpp
View file @
bd7a4a2b
...
...
@@ -31,10 +31,12 @@ int exec (App &app, QQmlApplicationEngine &engine) {
// trayIcon: Left click actions.
root
->
connect
(
tray_icon
,
&
QSystemTrayIcon
::
activated
,
[
&
root
](
QSystemTrayIcon
::
ActivationReason
reason
)
{
if
(
reason
==
QSystemTrayIcon
::
Trigger
)
root
->
requestActivate
();
else
if
(
reason
==
QSystemTrayIcon
::
DoubleClick
)
if
(
reason
==
QSystemTrayIcon
::
Trigger
)
{
if
(
root
->
visibility
()
==
QWindow
::
Hidden
)
root
->
showNormal
();
else
root
->
hide
();
}
});
// Build trayIcon menu.
...
...
@@ -47,7 +49,7 @@ int exec (App &app, QQmlApplicationEngine &engine) {
tray_icon
->
setToolTip
(
"Linphone"
);
tray_icon
->
show
();
// R
UN
.
// R
un
.
return
app
.
exec
();
}
...
...
tests/ui/components/contact/ShortContactDescription.qml
View file @
bd7a4a2b
...
...
@@ -11,7 +11,7 @@ Column {
clip
:
true
color
:
'
#5A585B
'
font.pointSize
:
11
font.
weight
:
Font
.
DemiBold
font.
bold
:
true
height
:
parent
.
height
/
2
id
:
username
verticalAlignment
:
Text
.
AlignBottom
...
...
tests/ui/views/mainWindow/contact.qml
View file @
bd7a4a2b
...
...
@@ -2,6 +2,7 @@ import QtQuick 2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/contact
'
import
'
qrc:/ui/components/form
'
import
'
qrc:/ui/components/scrollBar
'
...
...
@@ -12,6 +13,48 @@ ColumnLayout {
Layout.fillWidth
:
true
Layout.preferredHeight
:
102
color
:
'
#D1D1D1
'
RowLayout
{
anchors.left
:
parent
.
left
anchors.leftMargin
:
40
anchors.right
:
parent
.
right
anchors.rightMargin
:
10
anchors.verticalCenter
:
parent
.
verticalCenter
height
:
80
spacing
:
0
width
:
parent
.
width
Avatar
{
Layout.fillHeight
:
true
Layout.preferredWidth
:
80
Layout.rightMargin
:
30
presence
:
'
connected
'
// TODO: Use C++.
username
:
'
Cameron Andrews
'
// TODO: Use C++.
}
// TODO: Replace by text edit.
// Component: EditableShortContactDescription.
ShortContactDescription
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
username
:
'
Cameron Andrews
'
// TODO: Use C++.
}
ActionBar
{
iconSize
:
32
Layout.alignment
:
Qt
.
AlignBottom
|
Qt
.
AlignRight
ActionButton
{
icon
:
'
delete
'
onClicked
:
console
.
log
(
'
clicked!!!
'
)
}
ActionButton
{
icon
:
'
contact
'
onClicked
:
console
.
log
(
'
clicked!!!
'
)
}
}
}
}
Flickable
{
...
...
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