From f243c7c8e750e316a030bb1ded08ee54220dbc1a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 7 Aug 2018 18:03:17 +0200 Subject: [PATCH] feat(icon): display smooth icons --- assets/images/attachment_disabled.svg | 77 +++++++-- assets/images/attachment_hovered.svg | 79 +++++++-- assets/images/attachment_normal.svg | 79 +++++++-- assets/images/attachment_pressed.svg | 80 +++++++-- assets/images/burger_menu_hovered.svg | 90 ++++++++-- assets/images/burger_menu_light_hovered.svg | 89 ++++++++-- assets/images/burger_menu_light_normal.svg | 89 ++++++++-- assets/images/burger_menu_light_pressed.svg | 89 ++++++++-- assets/images/burger_menu_normal.svg | 89 ++++++++-- assets/images/burger_menu_pressed.svg | 89 ++++++++-- assets/images/call_chat_secure_hovered.svg | 93 ++++++++-- assets/images/call_chat_secure_normal.svg | 93 ++++++++-- assets/images/call_chat_secure_pressed.svg | 93 ++++++++-- assets/images/call_chat_unsecure_hovered.svg | 95 ++++++++-- assets/images/call_chat_unsecure_normal.svg | 95 ++++++++-- assets/images/call_chat_unsecure_pressed.svg | 95 ++++++++-- assets/images/call_quality_0.svg | 93 ++++++++-- assets/images/call_quality_1.svg | 92 ++++++++-- assets/images/call_quality_2.svg | 92 ++++++++-- assets/images/call_quality_3.svg | 89 ++++++++-- assets/images/camera.svg | 57 +++++- assets/images/camera_off_hovered.svg | 88 ++++++++-- assets/images/camera_off_normal.svg | 88 ++++++++-- assets/images/camera_off_pressed.svg | 91 ++++++++-- assets/images/camera_off_updating.svg | 88 ++++++++-- assets/images/contact_add.svg | 89 ++++++++-- assets/images/contact_add_hovered.svg | 90 ++++++++-- assets/images/contact_add_normal.svg | 91 ++++++++-- assets/images/contact_add_pressed.svg | 91 ++++++++-- assets/images/contact_edit_hovered.svg | 95 ++++++++-- assets/images/contact_edit_normal.svg | 97 +++++++++-- assets/images/contact_edit_pressed.svg | 96 +++++++++-- assets/images/delete_hovered.svg | 79 +++++++-- assets/images/delete_normal.svg | 79 +++++++-- assets/images/delete_pressed.svg | 80 +++++++-- assets/images/drop_down.svg | 78 +++++++-- assets/images/edit_hovered.svg | 77 +++++++-- assets/images/edit_normal.svg | 79 +++++++-- assets/images/edit_pressed.svg | 78 +++++++-- assets/images/ended_call.svg | 85 +++++++-- assets/images/file_hovered.svg | 118 ++++++++++--- assets/images/file_normal.svg | 107 ++++++++++-- assets/images/file_pressed.svg | 108 ++++++++++-- assets/images/folder_hovered.svg | 79 +++++++-- assets/images/folder_normal.svg | 79 +++++++-- assets/images/folder_pressed.svg | 80 +++++++-- assets/images/generic_error.svg | 92 ++++++++-- assets/images/generic_error_hovered.svg | 92 ++++++++-- assets/images/generic_error_normal.svg | 92 ++++++++-- assets/images/generic_error_pressed.svg | 92 ++++++++-- assets/images/home_account_assistant.svg | 141 ++++++++++++--- assets/images/home_invite_friends.svg | 163 ++++++++++++++---- assets/images/home_use_linphone.svg | 141 ++++++++++++--- assets/images/incoming_call.svg | 79 +++++++-- assets/images/micro.svg | 57 +++++- assets/images/outgoing_call.svg | 80 +++++++-- assets/images/settings_audio_normal.svg | 77 +++++++-- assets/images/settings_audio_selected.svg | 79 +++++++-- assets/images/settings_network_normal.svg | 77 +++++++-- assets/images/settings_network_selected.svg | 78 +++++++-- .../images/settings_sip_accounts_normal.svg | 77 +++++++-- .../images/settings_sip_accounts_selected.svg | 78 +++++++-- assets/images/settings_video_normal.svg | 76 ++++++-- assets/images/settings_video_selected.svg | 77 +++++++-- assets/images/speaker.svg | 57 +++++- assets/images/tel_keypad_hovered.svg | 159 ++++++++++++++--- assets/images/tel_keypad_normal.svg | 158 ++++++++++++++--- assets/images/tel_keypad_pressed.svg | 159 ++++++++++++++--- assets/images/tooltip_arrow_bottom.svg | 76 ++++++-- assets/images/tooltip_arrow_left.svg | 75 ++++++-- assets/images/tooltip_arrow_right.svg | 76 ++++++-- assets/images/tooltip_arrow_top.svg | 77 +++++++-- src/app/providers/ImageProvider.cpp | 24 +-- ui/modules/Common/Form/ActionButton.qml | 4 +- ui/modules/Common/Image/Icon.qml | 22 +-- ui/modules/Common/Image/RoundedImage.qml | 2 + ui/modules/Common/Tooltip/Tooltip.qml | 2 + ui/modules/Linphone/Styles/Chat/ChatStyle.qml | 2 +- .../Styles/Timeline/TimelineStyle.qml | 2 +- ui/views/App/Calls/Incall.qml | 2 +- ui/views/App/Calls/IncallFullscreenWindow.qml | 2 +- ui/views/App/Styles/Calls/CallStyle.qml | 3 +- ui/views/App/Styles/Main/ContactEditStyle.qml | 2 +- ui/views/App/Styles/Main/ContactsStyle.qml | 2 +- .../Styles/Settings/SettingsWindowStyle.qml | 2 +- 85 files changed, 5651 insertions(+), 952 deletions(-) diff --git a/assets/images/attachment_disabled.svg b/assets/images/attachment_disabled.svg index 2f35b1c31..e09a3e829 100644 --- a/assets/images/attachment_disabled.svg +++ b/assets/images/attachment_disabled.svg @@ -1,12 +1,69 @@ - - - - attachment_clic - Created with Sketch. - - - - - + + + + + + image/svg+xml + + attachment_clic + + + + + + attachment_clic + Created with Sketch. + + + + + diff --git a/assets/images/attachment_hovered.svg b/assets/images/attachment_hovered.svg index 71b3a6ef2..6f572083e 100644 --- a/assets/images/attachment_hovered.svg +++ b/assets/images/attachment_hovered.svg @@ -1,12 +1,69 @@ - - - - attachment_over - Created with Sketch. - - - - - + + + + + + image/svg+xml + + attachment_over + + + + + + attachment_over + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/attachment_normal.svg b/assets/images/attachment_normal.svg index 9e49396e0..0cdee4f02 100644 --- a/assets/images/attachment_normal.svg +++ b/assets/images/attachment_normal.svg @@ -1,12 +1,69 @@ - - - - attachment_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + attachment_default + + + + + + attachment_default + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/attachment_pressed.svg b/assets/images/attachment_pressed.svg index 4dc7e81b4..49c628b5c 100644 --- a/assets/images/attachment_pressed.svg +++ b/assets/images/attachment_pressed.svg @@ -1,12 +1,70 @@ - - - - attachment_clic - Created with Sketch. - - - - - + + + + + + image/svg+xml + + attachment_clic + + + + + + attachment_clic + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_hovered.svg b/assets/images/burger_menu_hovered.svg index 20270f076..901affa9a 100644 --- a/assets/images/burger_menu_hovered.svg +++ b/assets/images/burger_menu_hovered.svg @@ -1,14 +1,78 @@ - - - - burger_menu_over_dark - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_over_dark + burger_menu_over_dark + + + + + + burger_menu_over_dark + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_light_hovered.svg b/assets/images/burger_menu_light_hovered.svg index fad7b30a8..bd7203d74 100644 --- a/assets/images/burger_menu_light_hovered.svg +++ b/assets/images/burger_menu_light_hovered.svg @@ -1,14 +1,77 @@ - - - - burger_menu_over_bright - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_over_bright + + + + + + burger_menu_over_bright + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_light_normal.svg b/assets/images/burger_menu_light_normal.svg index 937b1d880..21efbbafe 100644 --- a/assets/images/burger_menu_light_normal.svg +++ b/assets/images/burger_menu_light_normal.svg @@ -1,14 +1,77 @@ - - - - burger_menu_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_default + + + + + + burger_menu_default + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_light_pressed.svg b/assets/images/burger_menu_light_pressed.svg index 937b1d880..527bdd58e 100644 --- a/assets/images/burger_menu_light_pressed.svg +++ b/assets/images/burger_menu_light_pressed.svg @@ -1,14 +1,77 @@ - - - - burger_menu_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_default + + + + + + burger_menu_default + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_normal.svg b/assets/images/burger_menu_normal.svg index 937b1d880..32e2d1d85 100644 --- a/assets/images/burger_menu_normal.svg +++ b/assets/images/burger_menu_normal.svg @@ -1,14 +1,77 @@ - - - - burger_menu_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_default + + + + + + burger_menu_default + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/burger_menu_pressed.svg b/assets/images/burger_menu_pressed.svg index 937b1d880..68734fdd7 100644 --- a/assets/images/burger_menu_pressed.svg +++ b/assets/images/burger_menu_pressed.svg @@ -1,14 +1,77 @@ - - - - burger_menu_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + burger_menu_default + + + + + + burger_menu_default + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_secure_hovered.svg b/assets/images/call_chat_secure_hovered.svg index e14c89684..260042b62 100644 --- a/assets/images/call_chat_secure_hovered.svg +++ b/assets/images/call_chat_secure_hovered.svg @@ -1,15 +1,80 @@ - - - - chat_secure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_secure@x2 + + + + + + chat_secure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_secure_normal.svg b/assets/images/call_chat_secure_normal.svg index e14c89684..b8d4d294d 100644 --- a/assets/images/call_chat_secure_normal.svg +++ b/assets/images/call_chat_secure_normal.svg @@ -1,15 +1,80 @@ - - - - chat_secure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_secure@x2 + + + + + + chat_secure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_secure_pressed.svg b/assets/images/call_chat_secure_pressed.svg index e14c89684..50974d3bd 100644 --- a/assets/images/call_chat_secure_pressed.svg +++ b/assets/images/call_chat_secure_pressed.svg @@ -1,15 +1,80 @@ - - - - chat_secure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_secure@x2 + + + + + + chat_secure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_unsecure_hovered.svg b/assets/images/call_chat_unsecure_hovered.svg index bdc687c6e..91a08e637 100644 --- a/assets/images/call_chat_unsecure_hovered.svg +++ b/assets/images/call_chat_unsecure_hovered.svg @@ -1,15 +1,82 @@ - - - - chat_unsecure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_unsecure@x2 + + + + + + chat_unsecure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_unsecure_normal.svg b/assets/images/call_chat_unsecure_normal.svg index bdc687c6e..e6ab9bf92 100644 --- a/assets/images/call_chat_unsecure_normal.svg +++ b/assets/images/call_chat_unsecure_normal.svg @@ -1,15 +1,82 @@ - - - - chat_unsecure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_unsecure@x2 + + + + + + chat_unsecure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_chat_unsecure_pressed.svg b/assets/images/call_chat_unsecure_pressed.svg index bdc687c6e..be4947766 100644 --- a/assets/images/call_chat_unsecure_pressed.svg +++ b/assets/images/call_chat_unsecure_pressed.svg @@ -1,15 +1,82 @@ - - - - chat_unsecure@x2 - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + chat_unsecure@x2 + + + + + + chat_unsecure@x2 + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_quality_0.svg b/assets/images/call_quality_0.svg index 9a4c21f0f..497d567a7 100644 --- a/assets/images/call_quality_0.svg +++ b/assets/images/call_quality_0.svg @@ -1,14 +1,81 @@ - - - - call_quality_0 - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + call_quality_0 + + + + + + call_quality_0 + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_quality_1.svg b/assets/images/call_quality_1.svg index 0402c0a3d..23110c16b 100644 --- a/assets/images/call_quality_1.svg +++ b/assets/images/call_quality_1.svg @@ -1,14 +1,80 @@ - - - - call_quality_1 - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + call_quality_1 + + + + + + call_quality_1 + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_quality_2.svg b/assets/images/call_quality_2.svg index ec37c72ef..3dae5e5f4 100644 --- a/assets/images/call_quality_2.svg +++ b/assets/images/call_quality_2.svg @@ -1,14 +1,80 @@ - - - - call_quality_2 - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + call_quality_2 + + + + + + call_quality_2 + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/call_quality_3.svg b/assets/images/call_quality_3.svg index 816c7ca8e..612e8ddbc 100644 --- a/assets/images/call_quality_3.svg +++ b/assets/images/call_quality_3.svg @@ -1,14 +1,77 @@ - - - - call_quality_3 - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + call_quality_3 + + + + + + call_quality_3 + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/camera.svg b/assets/images/camera.svg index d243e5f10..990581a63 100644 --- a/assets/images/camera.svg +++ b/assets/images/camera.svg @@ -1,3 +1,56 @@ - - + + + + + + image/svg+xml + + + + + + + + diff --git a/assets/images/camera_off_hovered.svg b/assets/images/camera_off_hovered.svg index 6ec1335ed..2c4323d39 100644 --- a/assets/images/camera_off_hovered.svg +++ b/assets/images/camera_off_hovered.svg @@ -1,14 +1,78 @@ - - - - camera_off - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + camera_off + + + + + + camera_off + Created with Sketch. + + + + + + + diff --git a/assets/images/camera_off_normal.svg b/assets/images/camera_off_normal.svg index 7ee60debb..6f44153cd 100644 --- a/assets/images/camera_off_normal.svg +++ b/assets/images/camera_off_normal.svg @@ -1,14 +1,78 @@ - - - - camera_off - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + camera_off + + + + + + camera_off + Created with Sketch. + + + + + + + diff --git a/assets/images/camera_off_pressed.svg b/assets/images/camera_off_pressed.svg index c5e8eae57..a1bdd0da2 100644 --- a/assets/images/camera_off_pressed.svg +++ b/assets/images/camera_off_pressed.svg @@ -1,14 +1,79 @@ - - - - camera_off_clic - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + camera_off_clic + + + + + + camera_off_clic + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/camera_off_updating.svg b/assets/images/camera_off_updating.svg index 7ee60debb..867f331c8 100644 --- a/assets/images/camera_off_updating.svg +++ b/assets/images/camera_off_updating.svg @@ -1,14 +1,78 @@ - - - - camera_off - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + camera_off + + + + + + camera_off + Created with Sketch. + + + + + + + diff --git a/assets/images/contact_add.svg b/assets/images/contact_add.svg index a52e22b37..1ed790513 100644 --- a/assets/images/contact_add.svg +++ b/assets/images/contact_add.svg @@ -1,14 +1,79 @@ - - - - contact_add_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + contact_add_default + + + + + + contact_add_default + Created with Sketch. + + + + + + + diff --git a/assets/images/contact_add_hovered.svg b/assets/images/contact_add_hovered.svg index a084c76a3..bbc884334 100644 --- a/assets/images/contact_add_hovered.svg +++ b/assets/images/contact_add_hovered.svg @@ -1,14 +1,78 @@ - - - - contact_add_over - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + contact_add_over + + + + + + contact_add_over + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/contact_add_normal.svg b/assets/images/contact_add_normal.svg index 52b1ff90b..ca51c3476 100644 --- a/assets/images/contact_add_normal.svg +++ b/assets/images/contact_add_normal.svg @@ -1,14 +1,79 @@ - - - - contact_add_default - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + contact_add_default + + + + + + contact_add_default + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/contact_add_pressed.svg b/assets/images/contact_add_pressed.svg index d30b17b25..34fde2400 100644 --- a/assets/images/contact_add_pressed.svg +++ b/assets/images/contact_add_pressed.svg @@ -1,14 +1,79 @@ - - - - contact_add_clic - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + contact_add_clic + + + + + + contact_add_clic + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/contact_edit_hovered.svg b/assets/images/contact_edit_hovered.svg index 61fb974cb..4c4ea469c 100644 --- a/assets/images/contact_edit_hovered.svg +++ b/assets/images/contact_edit_hovered.svg @@ -1,15 +1,82 @@ - - - - contact_edit_over - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + contact_edit_over + + + + + + contact_edit_over + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/contact_edit_normal.svg b/assets/images/contact_edit_normal.svg index 48f409820..622bc555b 100644 --- a/assets/images/contact_edit_normal.svg +++ b/assets/images/contact_edit_normal.svg @@ -1,15 +1,84 @@ - - - - contact_edit_default - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + contact_edit_default + + + + + + contact_edit_default + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/contact_edit_pressed.svg b/assets/images/contact_edit_pressed.svg index 6b8f63f47..63dd27d2b 100644 --- a/assets/images/contact_edit_pressed.svg +++ b/assets/images/contact_edit_pressed.svg @@ -1,15 +1,83 @@ - - - - contact_edit_clic - Created with Sketch. - - - - - - - - + + + + + + image/svg+xml + + contact_edit_clic + + + + + + contact_edit_clic + Created with Sketch. + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/delete_hovered.svg b/assets/images/delete_hovered.svg index 160c078f1..0d19c3020 100644 --- a/assets/images/delete_hovered.svg +++ b/assets/images/delete_hovered.svg @@ -1,12 +1,69 @@ - - - - delete_over - Created with Sketch. - - - - - + + + + + + image/svg+xml + + delete_over + + + + + + delete_over + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/delete_normal.svg b/assets/images/delete_normal.svg index 3d89ea2f2..f29a3214c 100644 --- a/assets/images/delete_normal.svg +++ b/assets/images/delete_normal.svg @@ -1,12 +1,69 @@ - - - - delete_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + delete_default + + + + + + delete_default + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/delete_pressed.svg b/assets/images/delete_pressed.svg index cc84e9558..e5e77ed48 100644 --- a/assets/images/delete_pressed.svg +++ b/assets/images/delete_pressed.svg @@ -1,12 +1,70 @@ - - - - delete_clic - Created with Sketch. - - - - - + + + + + + image/svg+xml + + delete_clic + + + + + + delete_clic + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/drop_down.svg b/assets/images/drop_down.svg index 3e852d784..5f1260870 100644 --- a/assets/images/drop_down.svg +++ b/assets/images/drop_down.svg @@ -1,12 +1,70 @@ - - - - drop_down_list - Created with Sketch. - - - - - + + + + + + image/svg+xml + + drop_down_list + + + + + + drop_down_list + Created with Sketch. + + + + + diff --git a/assets/images/edit_hovered.svg b/assets/images/edit_hovered.svg index 661fd06b7..c37f6d2df 100644 --- a/assets/images/edit_hovered.svg +++ b/assets/images/edit_hovered.svg @@ -1,12 +1,69 @@ - - - - settings_edit_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_edit_default + + + + + + settings_edit_default + Created with Sketch. + + + + + diff --git a/assets/images/edit_normal.svg b/assets/images/edit_normal.svg index 5daa978ad..e91c77c48 100644 --- a/assets/images/edit_normal.svg +++ b/assets/images/edit_normal.svg @@ -1,12 +1,69 @@ - - - - settings_edit_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_edit_default + + + + + + settings_edit_default + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/edit_pressed.svg b/assets/images/edit_pressed.svg index 023656c3a..d73d161e8 100644 --- a/assets/images/edit_pressed.svg +++ b/assets/images/edit_pressed.svg @@ -1,12 +1,70 @@ - - - - settings_edit_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_edit_default + + + + + + settings_edit_default + Created with Sketch. + + + + + diff --git a/assets/images/ended_call.svg b/assets/images/ended_call.svg index 461013722..84d79b647 100644 --- a/assets/images/ended_call.svg +++ b/assets/images/ended_call.svg @@ -1,14 +1,73 @@ - - - - call_end - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + call_end + + + + + + call_end + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/file_hovered.svg b/assets/images/file_hovered.svg index a3b51852b..c54823591 100644 --- a/assets/images/file_hovered.svg +++ b/assets/images/file_hovered.svg @@ -1,22 +1,100 @@ - - - - settings_file_1 - Created with Sketch. - - - - - - - - - - - - - - + + + + + + image/svg+xml + + settings_file_1 + + + + + + settings_file_1 + Created with Sketch. + + + + + + + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/file_normal.svg b/assets/images/file_normal.svg index bd7f84cb7..b694c770f 100644 --- a/assets/images/file_normal.svg +++ b/assets/images/file_normal.svg @@ -1,16 +1,93 @@ - - - - settings_file_3 - Created with Sketch. - - - - - - - - - + + + + + + image/svg+xml + + settings_file_3 + + + + + + settings_file_3 + Created with Sketch. + + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/file_pressed.svg b/assets/images/file_pressed.svg index 65ee13d41..c1d09ef61 100644 --- a/assets/images/file_pressed.svg +++ b/assets/images/file_pressed.svg @@ -1,16 +1,94 @@ - - - - settings_file_2 - Created with Sketch. - - - - - - - - - + + + + + + image/svg+xml + + settings_file_2 + + + + + + settings_file_2 + Created with Sketch. + + + + + + + + - \ No newline at end of file + + diff --git a/assets/images/folder_hovered.svg b/assets/images/folder_hovered.svg index c3b8b181c..d0ba62cc0 100644 --- a/assets/images/folder_hovered.svg +++ b/assets/images/folder_hovered.svg @@ -1,12 +1,69 @@ - - - - settings_folder_1 - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_folder_1 + + + + + + settings_folder_1 + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/folder_normal.svg b/assets/images/folder_normal.svg index 4ef86b906..d50f198d1 100644 --- a/assets/images/folder_normal.svg +++ b/assets/images/folder_normal.svg @@ -1,12 +1,69 @@ - - - - settings_folder_3 - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_folder_3 + + + + + + settings_folder_3 + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/folder_pressed.svg b/assets/images/folder_pressed.svg index 0ae0c9a8c..14b79401c 100644 --- a/assets/images/folder_pressed.svg +++ b/assets/images/folder_pressed.svg @@ -1,12 +1,70 @@ - - - - settings_folder_2 - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_folder_2 + + + + + + settings_folder_2 + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/generic_error.svg b/assets/images/generic_error.svg index bb5964668..e1f4773db 100644 --- a/assets/images/generic_error.svg +++ b/assets/images/generic_error.svg @@ -1,14 +1,80 @@ - - - - chat_error - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + chat_error + + + + + + chat_error + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/generic_error_hovered.svg b/assets/images/generic_error_hovered.svg index bb5964668..0af8bf164 100644 --- a/assets/images/generic_error_hovered.svg +++ b/assets/images/generic_error_hovered.svg @@ -1,14 +1,80 @@ - - - - chat_error - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + chat_error + + + + + + chat_error + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/generic_error_normal.svg b/assets/images/generic_error_normal.svg index bb5964668..832f650c7 100644 --- a/assets/images/generic_error_normal.svg +++ b/assets/images/generic_error_normal.svg @@ -1,14 +1,80 @@ - - - - chat_error - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + chat_error + + + + + + chat_error + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/generic_error_pressed.svg b/assets/images/generic_error_pressed.svg index bb5964668..5dae13cba 100644 --- a/assets/images/generic_error_pressed.svg +++ b/assets/images/generic_error_pressed.svg @@ -1,14 +1,80 @@ - - - - chat_error - Created with Sketch. - - - - - - - + + + + + + image/svg+xml + + chat_error + + + + + + chat_error + Created with Sketch. + + + + + + - \ No newline at end of file + + diff --git a/assets/images/home_account_assistant.svg b/assets/images/home_account_assistant.svg index 5cc395804..1a75f4f6a 100644 --- a/assets/images/home_account_assistant.svg +++ b/assets/images/home_account_assistant.svg @@ -1,28 +1,119 @@ - - - - home_account_assistant - Created with Sketch. - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + home_account_assistant + + + + + + home_account_assistant + Created with Sketch. + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/home_invite_friends.svg b/assets/images/home_invite_friends.svg index 2f0d51a35..43db1ef14 100644 --- a/assets/images/home_invite_friends.svg +++ b/assets/images/home_invite_friends.svg @@ -1,33 +1,136 @@ - - - - home_invite_friends - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + home_invite_friends + + + + + + home_invite_friends + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/home_use_linphone.svg b/assets/images/home_use_linphone.svg index 94b2a7294..2838ef3b8 100644 --- a/assets/images/home_use_linphone.svg +++ b/assets/images/home_use_linphone.svg @@ -1,28 +1,119 @@ - - - - home_use_linphone - Created with Sketch. - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + home_use_linphone + + + + + + home_use_linphone + Created with Sketch. + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/incoming_call.svg b/assets/images/incoming_call.svg index bb1f645a9..9fe3a1521 100644 --- a/assets/images/incoming_call.svg +++ b/assets/images/incoming_call.svg @@ -1,12 +1,69 @@ - - - - call_incoming - Created with Sketch. - - - - - + + + + + + image/svg+xml + + call_incoming + + + + + + call_incoming + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/micro.svg b/assets/images/micro.svg index 399705539..672c3b63a 100644 --- a/assets/images/micro.svg +++ b/assets/images/micro.svg @@ -1,3 +1,56 @@ - - + + + + + + image/svg+xml + + + + + + + + diff --git a/assets/images/outgoing_call.svg b/assets/images/outgoing_call.svg index 91cc3a07f..a679ec0c3 100644 --- a/assets/images/outgoing_call.svg +++ b/assets/images/outgoing_call.svg @@ -1,12 +1,70 @@ - - - - call_outgoing - Created with Sketch. - - - - - + + + + + + image/svg+xml + + call_outgoing + + + + + + call_outgoing + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/assets/images/settings_audio_normal.svg b/assets/images/settings_audio_normal.svg index 8b699f08c..4e8807e65 100644 --- a/assets/images/settings_audio_normal.svg +++ b/assets/images/settings_audio_normal.svg @@ -1,12 +1,69 @@ - - - - settings_audio_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_audio_default + + + + + + settings_audio_default + Created with Sketch. + + + + + diff --git a/assets/images/settings_audio_selected.svg b/assets/images/settings_audio_selected.svg index b3d49d988..92f1f9eaa 100644 --- a/assets/images/settings_audio_selected.svg +++ b/assets/images/settings_audio_selected.svg @@ -1,12 +1,71 @@ - - - - settings_audio_selected - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_audio_selected + + + + + + settings_audio_selected + Created with Sketch. + + + + + diff --git a/assets/images/settings_network_normal.svg b/assets/images/settings_network_normal.svg index 1b2724d32..e24cd6db8 100644 --- a/assets/images/settings_network_normal.svg +++ b/assets/images/settings_network_normal.svg @@ -1,12 +1,69 @@ - - - - settings_network_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_network_default + + + + + + settings_network_default + Created with Sketch. + + + + + diff --git a/assets/images/settings_network_selected.svg b/assets/images/settings_network_selected.svg index 103b8d123..a5fa1f159 100644 --- a/assets/images/settings_network_selected.svg +++ b/assets/images/settings_network_selected.svg @@ -1,12 +1,70 @@ - - - - settings_network_selected - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_network_selected + + + + + + settings_network_selected + Created with Sketch. + + + + + diff --git a/assets/images/settings_sip_accounts_normal.svg b/assets/images/settings_sip_accounts_normal.svg index d1c79f0bb..eef4c160a 100644 --- a/assets/images/settings_sip_accounts_normal.svg +++ b/assets/images/settings_sip_accounts_normal.svg @@ -1,12 +1,69 @@ - - - - settings_account_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_account_default + + + + + + settings_account_default + Created with Sketch. + + + + + diff --git a/assets/images/settings_sip_accounts_selected.svg b/assets/images/settings_sip_accounts_selected.svg index 0606785ab..5e8e91dc5 100644 --- a/assets/images/settings_sip_accounts_selected.svg +++ b/assets/images/settings_sip_accounts_selected.svg @@ -1,12 +1,70 @@ - - - - settings_account_selected - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_account_selected + + + + + + settings_account_selected + Created with Sketch. + + + + + diff --git a/assets/images/settings_video_normal.svg b/assets/images/settings_video_normal.svg index edcf18833..2d6401f26 100644 --- a/assets/images/settings_video_normal.svg +++ b/assets/images/settings_video_normal.svg @@ -1,12 +1,68 @@ - - - - settings_video_default - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_video_default + + + + + + settings_video_default + Created with Sketch. + + + + + diff --git a/assets/images/settings_video_selected.svg b/assets/images/settings_video_selected.svg index 04fc32eab..119d272f5 100644 --- a/assets/images/settings_video_selected.svg +++ b/assets/images/settings_video_selected.svg @@ -1,12 +1,69 @@ - - - - settings_video_selected - Created with Sketch. - - - - - + + + + + + image/svg+xml + + settings_video_selected + + + + + + settings_video_selected + Created with Sketch. + + + + + diff --git a/assets/images/speaker.svg b/assets/images/speaker.svg index b984fef89..498ccdf76 100644 --- a/assets/images/speaker.svg +++ b/assets/images/speaker.svg @@ -1,3 +1,56 @@ - - + + + + + + image/svg+xml + + + + + + + + diff --git a/assets/images/tel_keypad_hovered.svg b/assets/images/tel_keypad_hovered.svg index f92112e9a..73a952141 100644 --- a/assets/images/tel_keypad_hovered.svg +++ b/assets/images/tel_keypad_hovered.svg @@ -1,24 +1,141 @@ - - - - dialer_dtmf - Created with Sketch. - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + dialer_dtmf + + + + + + dialer_dtmf + Created with Sketch. + + + + + + + + + + + + + + + + diff --git a/assets/images/tel_keypad_normal.svg b/assets/images/tel_keypad_normal.svg index f92112e9a..aac9b4a1e 100644 --- a/assets/images/tel_keypad_normal.svg +++ b/assets/images/tel_keypad_normal.svg @@ -1,24 +1,140 @@ - - - - dialer_dtmf - Created with Sketch. - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + dialer_dtmf + + + + + + dialer_dtmf + Created with Sketch. + + + + + + + + + + + + + + + + diff --git a/assets/images/tel_keypad_pressed.svg b/assets/images/tel_keypad_pressed.svg index 8ca6dbc5e..8a9c4fb8e 100644 --- a/assets/images/tel_keypad_pressed.svg +++ b/assets/images/tel_keypad_pressed.svg @@ -1,24 +1,141 @@ - - - - dialer_dtmf - Created with Sketch. - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + dialer_dtmf + + + + + + dialer_dtmf + Created with Sketch. + + + + + + + + + + + + + + + + diff --git a/assets/images/tooltip_arrow_bottom.svg b/assets/images/tooltip_arrow_bottom.svg index 3205ed696..b68fc3045 100644 --- a/assets/images/tooltip_arrow_bottom.svg +++ b/assets/images/tooltip_arrow_bottom.svg @@ -1,12 +1,68 @@ - - - - tooltip - Created with Sketch. - - - - - + + + + + + image/svg+xml + + tooltip + + + + + + tooltip + Created with Sketch. + + + + + diff --git a/assets/images/tooltip_arrow_left.svg b/assets/images/tooltip_arrow_left.svg index c36e5603e..2f48a2651 100644 --- a/assets/images/tooltip_arrow_left.svg +++ b/assets/images/tooltip_arrow_left.svg @@ -1,12 +1,67 @@ - - - - tooltip - Created with Sketch. - - - - - + + + + + + image/svg+xml + + tooltip + + + + + + tooltip + Created with Sketch. + + + + + diff --git a/assets/images/tooltip_arrow_right.svg b/assets/images/tooltip_arrow_right.svg index d0b37ee47..07ffa2b08 100644 --- a/assets/images/tooltip_arrow_right.svg +++ b/assets/images/tooltip_arrow_right.svg @@ -1,12 +1,68 @@ - - - - tooltip - Created with Sketch. - - - - - + + + + + + image/svg+xml + + tooltip + + + + + + tooltip + Created with Sketch. + + + + + diff --git a/assets/images/tooltip_arrow_top.svg b/assets/images/tooltip_arrow_top.svg index ba81f1b70..31f693237 100644 --- a/assets/images/tooltip_arrow_top.svg +++ b/assets/images/tooltip_arrow_top.svg @@ -1,12 +1,67 @@ - - - - tooltip - Created with Sketch. - - - - - + + + + + + image/svg+xml + + tooltip + + + + + + tooltip + Created with Sketch. + + + + - \ No newline at end of file + + diff --git a/src/app/providers/ImageProvider.cpp b/src/app/providers/ImageProvider.cpp index b52b11543..5364b3d31 100644 --- a/src/app/providers/ImageProvider.cpp +++ b/src/app/providers/ImageProvider.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "app/App.hpp" @@ -246,12 +247,14 @@ ImageProvider::ImageProvider () : QQuickImageProvider( QImage ImageProvider::requestImage (const QString &id, QSize *size, const QSize &requestedSize) { const QString path = QStringLiteral(":%1").arg(id); - qDebug() << QStringLiteral("Image `%1` requested.").arg(path); + qDebug() << QStringLiteral("Image `%1` requested with size: (%2, %3).") + .arg(path).arg(requestedSize.width()).arg(requestedSize.height()); QElapsedTimer timer; timer.start(); // 1. Read and update XML content. + *size = QSize(); QFile file(path); if (Q_UNLIKELY(QFileInfo(file).size() > MaxImageSize)) { qWarning() << QStringLiteral("Unable to open large file: `%1`.").arg(path); @@ -276,18 +279,15 @@ QImage ImageProvider::requestImage (const QString &id, QSize *size, const QSize return QImage(); } - // 3. Create en empty image. - const QRectF viewBox = renderer.viewBoxF(); - const int width = requestedSize.width(); - const int height = requestedSize.height(); - QImage image( - width > 0 ? width : int(viewBox.width()), - height > 0 ? height : int(viewBox.height()), - QImage::Format_ARGB32 - ); + QSize askedSize = !requestedSize.isEmpty() + ? requestedSize + : renderer.defaultSize() * QGuiApplication::primaryScreen()->devicePixelRatio(); + + // 3. Create image. + QImage image(askedSize, QImage::Format_ARGB32_Premultiplied); if (Q_UNLIKELY(image.isNull())) { - qWarning() << QStringLiteral("Unable to create image of size `(%1, %2)` from path: `%3`.") - .arg(viewBox.width()).arg(viewBox.height()).arg(path); + qWarning() << QStringLiteral("Unable to create image from path: `%1`.") + .arg(path); return QImage(); // Memory cannot be allocated. } image.fill(0x00000000); diff --git a/ui/modules/Common/Form/ActionButton.qml b/ui/modules/Common/Form/ActionButton.qml index da8eed48d..ca621e24d 100644 --- a/ui/modules/Common/Form/ActionButton.qml +++ b/ui/modules/Common/Form/ActionButton.qml @@ -15,7 +15,7 @@ Item { property bool enabled: true property bool updating: false property bool useStates: true - property int iconSize // Optionnal. + property int iconSize // Optional. readonly property alias hovered: button.hovered // If `useStates` = true, the used icons are: @@ -69,7 +69,7 @@ Item { anchors.centerIn: parent icon: _getIcon() - iconSize: parent.iconSize || ( + iconSize: wrappedButton.iconSize || ( parent.width > parent.height ? parent.height : parent.width ) } diff --git a/ui/modules/Common/Image/Icon.qml b/ui/modules/Common/Image/Icon.qml index 816cf2a46..5b8f97f4c 100644 --- a/ui/modules/Common/Image/Icon.qml +++ b/ui/modules/Common/Image/Icon.qml @@ -15,32 +15,20 @@ Item { width: iconSize Image { - function _checkIconSize () { + function getIconSize () { Utils.assert( iconSize != null && iconSize >= 0, '`iconSize` must be defined and must be positive. (icon=`' + icon + '`, iconSize=' + iconSize + ')' ) + + return iconSize } anchors.centerIn: parent - height: { - _checkIconSize() - return iconSize > sourceSize.height - ? sourceSize.height - : iconSize - } - width: { - _checkIconSize() - return iconSize > sourceSize.width - ? sourceSize.width - : iconSize - } - fillMode: Image.PreserveAspectFit source: Utils.resolveImageUri(icon) - - // Warning: Perfomance cost. - mipmap: true + sourceSize.width: getIconSize() + sourceSize.height: getIconSize() } } diff --git a/ui/modules/Common/Image/RoundedImage.qml b/ui/modules/Common/Image/RoundedImage.qml index 75444ad26..4e73b2b55 100644 --- a/ui/modules/Common/Image/RoundedImage.qml +++ b/ui/modules/Common/Image/RoundedImage.qml @@ -22,6 +22,8 @@ Item { anchors.fill: parent fillMode: Image.PreserveAspectCrop + sourceSize.width: parent.width + sourceSize.height: parent.height } } diff --git a/ui/modules/Common/Tooltip/Tooltip.qml b/ui/modules/Common/Tooltip/Tooltip.qml index c1cb800ad..7c9967d5d 100644 --- a/ui/modules/Common/Tooltip/Tooltip.qml +++ b/ui/modules/Common/Tooltip/Tooltip.qml @@ -105,6 +105,8 @@ ToolTip { source: _edge ? Utils.resolveImageUri('tooltip_arrow_' + _edge) : '' + sourceSize.height: height + sourceSize.width: width visible: tooltip.visible && _edge width: TooltipStyle.arrowSize z: Constants.zMax diff --git a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml index 1ee746bd9..cf40be3ff 100644 --- a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml +++ b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml @@ -42,7 +42,7 @@ QtObject { property QtObject entry: QtObject { property int bottomMargin: 10 - property int deleteIconSize: 17 + property int deleteIconSize: 22 property int leftMargin: 18 property int lineHeight: 30 property int metaWidth: 40 diff --git a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml index 9cb3ce8b0..78f033b97 100644 --- a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml +++ b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml @@ -38,7 +38,7 @@ QtObject { property color color: Colors.d property int pointSize: Units.dp * 11 property int height: 30 - property int iconSize: 10 + property int iconSize: 14 property int leftMargin: 17 property int rightMargin: 17 property int spacing: 8 diff --git a/ui/views/App/Calls/Incall.qml b/ui/views/App/Calls/Incall.qml index e34e1b8d6..3a8946e57 100644 --- a/ui/views/App/Calls/Incall.qml +++ b/ui/views/App/Calls/Incall.qml @@ -158,7 +158,7 @@ Rectangle { id: rightActions anchors.right: parent.right - iconSize: CallStyle.header.iconSize + iconSize: CallStyle.header.buttonIconSize ActionButton { icon: 'screenshot' diff --git a/ui/views/App/Calls/IncallFullscreenWindow.qml b/ui/views/App/Calls/IncallFullscreenWindow.qml index 8c512ba86..8c5609f41 100644 --- a/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -220,7 +220,7 @@ Window { ActionBar { anchors.right: parent.right - iconSize: CallStyle.header.iconSize + iconSize: CallStyle.header.buttonIconSize visible: !hideButtons ActionButton { diff --git a/ui/views/App/Styles/Calls/CallStyle.qml b/ui/views/App/Styles/Calls/CallStyle.qml index d9b786ac2..20668d8e7 100644 --- a/ui/views/App/Styles/Calls/CallStyle.qml +++ b/ui/views/App/Styles/Calls/CallStyle.qml @@ -50,7 +50,8 @@ QtObject { } property QtObject header: QtObject { - property int iconSize: 40 + property int buttonIconSize: 40 + property int iconSize: 16 property int leftMargin: 20 property int rightMargin: 20 property int spacing: 10 diff --git a/ui/views/App/Styles/Main/ContactEditStyle.qml b/ui/views/App/Styles/Main/ContactEditStyle.qml index 320915dad..5058029f1 100644 --- a/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -17,7 +17,7 @@ QtObject { property int avatarSize: 60 property int height: 80 property int leftMargin: 40 - property int rightMargin: 20 + property int rightMargin: 30 property int spacing: 20 property QtObject actions: QtObject { diff --git a/ui/views/App/Styles/Main/ContactsStyle.qml b/ui/views/App/Styles/Main/ContactsStyle.qml index 09c1349f7..30aa939a2 100644 --- a/ui/views/App/Styles/Main/ContactsStyle.qml +++ b/ui/views/App/Styles/Main/ContactsStyle.qml @@ -20,7 +20,7 @@ QtObject { property QtObject contact: QtObject { property int actionButtonsSize: 36 property int avatarSize: 30 - property int deleteButtonSize: 18 + property int deleteButtonSize: 22 property int height: 50 property int leftMargin: 40 property int presenceLevelSize: 12 diff --git a/ui/views/App/Styles/Settings/SettingsWindowStyle.qml b/ui/views/App/Styles/Settings/SettingsWindowStyle.qml index 4f99ee328..628ac7e82 100644 --- a/ui/views/App/Styles/Settings/SettingsWindowStyle.qml +++ b/ui/views/App/Styles/Settings/SettingsWindowStyle.qml @@ -22,7 +22,7 @@ QtObject { property QtObject sipAccounts: QtObject { property int buttonsSpacing: 8 - property int iconSize: 20 + property int iconSize: 22 property int legendLineWidth: 280 } }