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
2f55eb52
Commit
2f55eb52
authored
Dec 19, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/MainWindow/Conversation): change edition icon if the contact is not a friend
parent
12636b34
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
56 additions
and
13 deletions
+56
-13
contact_add_hovered.svg
tests/assets/images/contact_add_hovered.svg
+14
-0
contact_add_normal.svg
tests/assets/images/contact_add_normal.svg
+14
-0
contact_add_pressed.svg
tests/assets/images/contact_add_pressed.svg
+14
-0
resources.qrc
tests/resources.qrc
+3
-0
ContactEdit.qml
tests/ui/views/App/MainWindow/ContactEdit.qml
+2
-4
Conversation.qml
tests/ui/views/App/MainWindow/Conversation.qml
+9
-9
No files found.
tests/assets/images/contact_add_hovered.svg
0 → 100644
View file @
2f55eb52
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"22px"
height=
"19px"
viewBox=
"0 0 22 19"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>
contact_add_over
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
stroke-linecap=
"round"
>
<g
id=
"contact_add_over"
stroke=
"#4B5964"
>
<path
d=
"M8.54029156,2.5 C10.850165,2.5 12.7226588,4.39098325 12.7226588,6.72356259 C12.7226588,7.83995271 12.2940348,8.85494372 11.5935908,9.61033703 C11.4952898,9.71653609 11.5340928,9.69793625 11.4252454,9.79333541 L11.5997595,9.91213435 C17.938579,12.6985097 16.3132304,17.3824682 16.3132304,17.3824682 C12.2309551,18.6900566 8.54685822,18.4888584 8.54685822,18.4888584 L8.45333302,18.4888584 C8.45333302,18.4886584 4.7688382,18.6900566 0.686761802,17.3824682 C0.686761802,17.3824682 -0.938586743,12.6985097 5.40043177,9.91213435 L5.57494581,9.79333541 C5.4660984,9.69793625 5.50490141,9.71653609 5.40660046,9.61033703 C4.70635541,8.85494372 4.27753243,7.83995271 4.27753243,6.72356259 C4.27753243,4.39098325 6.15002629,2.5 8.45989968,2.5 L8.54029156,2.5 L8.54029156,2.5 Z"
stroke-linejoin=
"round"
></path>
<path
d=
"M18.4166667,0.583333333 L18.4166667,6.41666667"
></path>
<path
d=
"M15.5,3.5 L21.3333333,3.5"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/contact_add_normal.svg
0 → 100644
View file @
2f55eb52
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"22px"
height=
"19px"
viewBox=
"0 0 22 19"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>
contact_add_default
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
stroke-linecap=
"round"
>
<g
id=
"contact_add_default"
>
<path
d=
"M8.54029156,2.5 C10.850165,2.5 12.7226588,4.39098325 12.7226588,6.72356259 C12.7226588,7.83995271 12.2940348,8.85494372 11.5935908,9.61033703 C11.4952898,9.71653609 11.5340928,9.69793625 11.4252454,9.79333541 L11.5997595,9.91213435 C17.938579,12.6985097 16.3132304,17.3824682 16.3132304,17.3824682 C12.2309551,18.6900566 8.54685822,18.4888584 8.54685822,18.4888584 L8.45333302,18.4888584 C8.45333302,18.4886584 4.7688382,18.6900566 0.686761802,17.3824682 C0.686761802,17.3824682 -0.938586743,12.6985097 5.40043177,9.91213435 L5.57494581,9.79333541 C5.4660984,9.69793625 5.50490141,9.71653609 5.40660046,9.61033703 C4.70635541,8.85494372 4.27753243,7.83995271 4.27753243,6.72356259 C4.27753243,4.39098325 6.15002629,2.5 8.45989968,2.5 L8.54029156,2.5 L8.54029156,2.5 Z"
stroke=
"#96A5B1"
stroke-linejoin=
"round"
></path>
<path
d=
"M18.4166667,0.583333333 L18.4166667,6.41666667"
stroke=
"#96A6B1"
></path>
<path
d=
"M15.5,3.5 L21.3333333,3.5"
stroke=
"#96A6B1"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/assets/images/contact_add_pressed.svg
0 → 100644
View file @
2f55eb52
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"22px"
height=
"19px"
viewBox=
"0 0 22 19"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>
contact_add_clic
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
stroke-linecap=
"round"
>
<g
id=
"contact_add_clic"
stroke=
"#FF5E00"
>
<path
d=
"M8.54029156,2.5 C10.850165,2.5 12.7226588,4.39098325 12.7226588,6.72356259 C12.7226588,7.83995271 12.2940348,8.85494372 11.5935908,9.61033703 C11.4952898,9.71653609 11.5340928,9.69793625 11.4252454,9.79333541 L11.5997595,9.91213435 C17.938579,12.6985097 16.3132304,17.3824682 16.3132304,17.3824682 C12.2309551,18.6900566 8.54685822,18.4888584 8.54685822,18.4888584 L8.45333302,18.4888584 C8.45333302,18.4886584 4.7688382,18.6900566 0.686761802,17.3824682 C0.686761802,17.3824682 -0.938586743,12.6985097 5.40043177,9.91213435 L5.57494581,9.79333541 C5.4660984,9.69793625 5.50490141,9.71653609 5.40660046,9.61033703 C4.70635541,8.85494372 4.27753243,7.83995271 4.27753243,6.72356259 C4.27753243,4.39098325 6.15002629,2.5 8.45989968,2.5 L8.54029156,2.5 L8.54029156,2.5 Z"
stroke-linejoin=
"round"
></path>
<path
d=
"M18.4166667,0.583333333 L18.4166667,6.41666667"
></path>
<path
d=
"M15.5,3.5 L21.3333333,3.5"
></path>
</g>
</g>
</svg>
\ No newline at end of file
tests/resources.qrc
View file @
2f55eb52
...
...
@@ -40,6 +40,9 @@
<file>
assets/images/chevron_red.svg
</file>
<file>
assets/images/chevron_white.svg
</file>
<file>
assets/images/collapse.svg
</file>
<file>
assets/images/contact_add_hovered.svg
</file>
<file>
assets/images/contact_add_normal.svg
</file>
<file>
assets/images/contact_add_pressed.svg
</file>
<file>
assets/images/contact_card_photo_disabled.svg
</file>
<file>
assets/images/contact_card_photo_hovered.svg
</file>
<file>
assets/images/contact_card_photo_normal.svg
</file>
...
...
tests/ui/views/App/MainWindow/ContactEdit.qml
View file @
2f55eb52
...
...
@@ -395,7 +395,9 @@ ColumnLayout {
Row
{
Layout.alignment
:
Qt
.
AlignHCenter
Layout.bottomMargin
:
ContactEditStyle
.
values
.
bottomMargin
Layout.topMargin
:
ContactEditStyle
.
buttons
.
topMargin
spacing
:
ContactEditStyle
.
buttons
.
spacing
visible
:
_edition
...
...
@@ -410,10 +412,6 @@ ColumnLayout {
onClicked
:
_save
()
}
}
Item
{
Layout.bottomMargin
:
ContactEditStyle
.
values
.
bottomMargin
}
}
}
}
...
...
tests/ui/views/App/MainWindow/Conversation.qml
View file @
2f55eb52
...
...
@@ -8,7 +8,7 @@ import Utils 1.0
import
App
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
ColumnLayout
{
id
:
conversation
...
...
@@ -31,13 +31,13 @@ ColumnLayout {
})
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
spacing
:
0
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
// Contact bar.
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
Rectangle
{
Layout.fillWidth
:
true
...
...
@@ -94,7 +94,7 @@ ColumnLayout {
anchors.verticalCenter
:
parent
.
verticalCenter
ActionButton
{
icon
:
'
contact_edit
'
icon
:
Utils
.
isString
(
_contact
)
?
'
contact_add
'
:
'
contact_edit
'
iconSize
:
ConversationStyle
.
bar
.
actions
.
edit
.
iconSize
onClicked
:
window
.
setView
(
'
ContactEdit
'
,
{
...
...
@@ -113,9 +113,9 @@ ColumnLayout {
}
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
// Messages/Calls filters.
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
Borders
{
Layout.fillWidth
:
true
...
...
@@ -149,9 +149,9 @@ ColumnLayout {
}
}
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
// Chat.
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
Chat
{
Layout.fillHeight
:
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