mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 22:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/MainWindow/Conversation): change edition icon if the contact is not a friend

Browse source
This commit is contained in:
Ronan Abhamon 2016-12-19 15:24:46 +01:00
parent 12636b34b2
commit 2f55eb522f
6 changed files with 56 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/assets/images/contact_add_hovered.svg Normal file
View file

@ -0,0 +1,14 @@
<?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>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
tests/assets/images/contact_add_normal.svg Normal file
View file

@ -0,0 +1,14 @@
<?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>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

14
tests/assets/images/contact_add_pressed.svg Normal file
View file

@ -0,0 +1,14 @@
<?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>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

3
tests/resources.qrc
View file

@ -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>

6
tests/ui/views/App/MainWindow/ContactEdit.qml
View file

@ -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
}
}
}
}

18
tests/ui/views/App/MainWindow/Conversation.qml
View file

@ -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