diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b6a3c8b3..78512ea76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ option(ENABLE_TESTS "Build with testing binaries of SDK" NO ) option(ENABLE_TESTS_COMPONENTS "Build libbctoolbox-tester" NO ) option(ENABLE_TOOLS "Enable tools of SDK" NO) option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO) -option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." YES) +option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." ON) option(ENABLE_BUILD_VERBOSE "Enable the build generation to be more verbose" NO) option(ENABLE_OPENH264 "Enable the use of OpenH264 codec" YES) option(ENABLE_NON_FREE_CODECS "Enable the use of non free codecs" YES) @@ -210,10 +210,10 @@ endif() include(FindPkgConfig) set(APP_DEPENDS sdk) -find_package(Qt5 5.9 COMPONENTS Core REQUIRED) +find_package(Qt5 5.10 COMPONENTS Core REQUIRED) if ( NOT Qt5_FOUND ) - message(FATAL_ERROR "Minimum supported Qt5 version is 5.9!") + message(FATAL_ERROR "Minimum supported Qt5 version is 5.10!") endif() find_package(LinphoneCxx CONFIG QUIET) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 5399280c3..499fe4983 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -158,6 +158,7 @@ set(SOURCES src/components/other/colors/ColorModel.cpp src/components/other/colors/ColorListModel.cpp src/components/other/colors/ColorProxyModel.cpp + src/components/other/colors/ImageColorsProxyModel.cpp src/components/other/images/ImageModel.cpp src/components/other/images/ImageListModel.cpp src/components/other/images/ImageProxyModel.cpp @@ -263,6 +264,7 @@ set(HEADERS src/components/other/colors/ColorModel.hpp src/components/other/colors/ColorListModel.hpp src/components/other/colors/ColorProxyModel.hpp + src/components/other/colors/ImageColorsProxyModel.hpp src/components/other/images/ImageModel.hpp src/components/other/images/ImageListModel.hpp src/components/other/images/ImageProxyModel.hpp diff --git a/linphone-app/assets/images/menu_delete.svg b/linphone-app/assets/images/add_custom.svg similarity index 54% rename from linphone-app/assets/images/menu_delete.svg rename to linphone-app/assets/images/add_custom.svg index 4c9eff791..0195c2fca 100644 --- a/linphone-app/assets/images/menu_delete.svg +++ b/linphone-app/assets/images/add_custom.svg @@ -1,11 +1,10 @@ + inkscape:current-layer="svg8" /> - - - + id="g6" + transform="matrix(4.4444441,0,0,4.4444467,0,-1.9873506e-5)"> + + diff --git a/linphone-app/assets/images/add_disabled.svg b/linphone-app/assets/images/add_disabled.svg deleted file mode 100644 index 787a60cd1..000000000 --- a/linphone-app/assets/images/add_disabled.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - add_disabled - - - - - - add_disabled - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/add_hovered.svg b/linphone-app/assets/images/add_hovered.svg deleted file mode 100644 index 3c9311d2e..000000000 --- a/linphone-app/assets/images/add_hovered.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - add_over - - - - - - add_over - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/add_normal.svg b/linphone-app/assets/images/add_normal.svg deleted file mode 100644 index a54c9f43b..000000000 --- a/linphone-app/assets/images/add_normal.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - add_default - - - - - - add_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/add_participant_normal.svg b/linphone-app/assets/images/add_participant_custom.svg similarity index 64% rename from linphone-app/assets/images/add_participant_normal.svg rename to linphone-app/assets/images/add_participant_custom.svg index fa20f9912..b3bb1981e 100644 --- a/linphone-app/assets/images/add_participant_normal.svg +++ b/linphone-app/assets/images/add_participant_custom.svg @@ -1,11 +1,11 @@ + id="g10" + transform="matrix(2.2256148,0,0,2.2256465,-4.5129465,-4.5123835)"> diff --git a/linphone-app/assets/images/add_participant_hovered.svg b/linphone-app/assets/images/add_participant_hovered.svg deleted file mode 100644 index fc0aceb21..000000000 --- a/linphone-app/assets/images/add_participant_hovered.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/add_pressed.svg b/linphone-app/assets/images/add_pressed.svg deleted file mode 100644 index ff2f3acbe..000000000 --- a/linphone-app/assets/images/add_pressed.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - add_clic - - - - - - add_clic - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/admin_selected.svg b/linphone-app/assets/images/admin_selected_custom.svg similarity index 76% rename from linphone-app/assets/images/admin_selected.svg rename to linphone-app/assets/images/admin_selected_custom.svg index 1d937c84d..698a4a9f6 100644 --- a/linphone-app/assets/images/admin_selected.svg +++ b/linphone-app/assets/images/admin_selected_custom.svg @@ -1,8 +1,8 @@ + transform="matrix(1.1729548,0,0,1.2500176,12.5,20)"> diff --git a/linphone-app/assets/images/attachment_custom.svg b/linphone-app/assets/images/attachment_custom.svg new file mode 100644 index 000000000..9b5b78e1b --- /dev/null +++ b/linphone-app/assets/images/attachment_custom.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/linphone-app/assets/images/attachment_disabled.svg b/linphone-app/assets/images/attachment_disabled.svg deleted file mode 100644 index e09a3e829..000000000 --- a/linphone-app/assets/images/attachment_disabled.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - attachment_clic - - - - - - attachment_clic - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/attachment_hovered.svg b/linphone-app/assets/images/attachment_hovered.svg deleted file mode 100644 index 6f572083e..000000000 --- a/linphone-app/assets/images/attachment_hovered.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - attachment_over - - - - - - attachment_over - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/attachment_normal.svg b/linphone-app/assets/images/attachment_normal.svg deleted file mode 100644 index 0cdee4f02..000000000 --- a/linphone-app/assets/images/attachment_normal.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - attachment_default - - - - - - attachment_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/attachment_pressed.svg b/linphone-app/assets/images/attachment_pressed.svg deleted file mode 100644 index 49c628b5c..000000000 --- a/linphone-app/assets/images/attachment_pressed.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - attachment_clic - - - - - - attachment_clic - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/auto_answer.svg b/linphone-app/assets/images/auto_answer_custom.svg similarity index 98% rename from linphone-app/assets/images/auto_answer.svg rename to linphone-app/assets/images/auto_answer_custom.svg index 9eaa7332b..f4f1482b4 100644 --- a/linphone-app/assets/images/auto_answer.svg +++ b/linphone-app/assets/images/auto_answer_custom.svg @@ -59,7 +59,7 @@ transform="translate(1,1)"> + sodipodi:docname="burger_menu_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -36,17 +36,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1131" id="namedview18" showgrid="false" - inkscape:zoom="14.75" - inkscape:cx="6.5142425" - inkscape:cy="7.1991662" + inkscape:zoom="3.6875" + inkscape:cx="-57.355932" + inkscape:cy="-18.169492" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg16" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg16" + inkscape:pagecheckerboard="0" /> burger_menu_over_dark @@ -57,7 +58,7 @@ + transform="matrix(3.1125799,0,0,2.8238801,16.88742,17.88209)"> diff --git a/linphone-app/assets/images/burger_menu_light_hovered.svg b/linphone-app/assets/images/burger_menu_light_hovered.svg deleted file mode 100644 index bd7203d74..000000000 --- a/linphone-app/assets/images/burger_menu_light_hovered.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - burger_menu_over_bright - - - - - - burger_menu_over_bright - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/burger_menu_light_normal.svg b/linphone-app/assets/images/burger_menu_light_normal.svg deleted file mode 100644 index 21efbbafe..000000000 --- a/linphone-app/assets/images/burger_menu_light_normal.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - burger_menu_default - - - - - - burger_menu_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/burger_menu_light_pressed.svg b/linphone-app/assets/images/burger_menu_light_pressed.svg deleted file mode 100644 index 527bdd58e..000000000 --- a/linphone-app/assets/images/burger_menu_light_pressed.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - burger_menu_default - - - - - - burger_menu_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/burger_menu_normal.svg b/linphone-app/assets/images/burger_menu_normal.svg deleted file mode 100644 index 32e2d1d85..000000000 --- a/linphone-app/assets/images/burger_menu_normal.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - burger_menu_default - - - - - - burger_menu_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/burger_menu_pressed.svg b/linphone-app/assets/images/burger_menu_pressed.svg deleted file mode 100644 index 68734fdd7..000000000 --- a/linphone-app/assets/images/burger_menu_pressed.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - burger_menu_default - - - - - - burger_menu_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/call_accept_custom.svg b/linphone-app/assets/images/call_accept_custom.svg new file mode 100644 index 000000000..969706ad7 --- /dev/null +++ b/linphone-app/assets/images/call_accept_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/call_accept_hovered.svg b/linphone-app/assets/images/call_accept_hovered.svg deleted file mode 100644 index 6b1a1fb41..000000000 --- a/linphone-app/assets/images/call_accept_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_accept_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_accept_normal.svg b/linphone-app/assets/images/call_accept_normal.svg deleted file mode 100644 index bd2442345..000000000 --- a/linphone-app/assets/images/call_accept_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_accept default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_accept_pressed.svg b/linphone-app/assets/images/call_accept_pressed.svg deleted file mode 100644 index 065c56680..000000000 --- a/linphone-app/assets/images/call_accept_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_accept_clic - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_chat_secure_normal.svg b/linphone-app/assets/images/call_chat_secure_custom.svg similarity index 96% rename from linphone-app/assets/images/call_chat_secure_normal.svg rename to linphone-app/assets/images/call_chat_secure_custom.svg index b8d4d294d..f1a35ab05 100644 --- a/linphone-app/assets/images/call_chat_secure_normal.svg +++ b/linphone-app/assets/images/call_chat_secure_custom.svg @@ -68,12 +68,12 @@ y="4.333333" width="10" height="8.666666" - style="fill:#5a585b" /> + style="fill:#000000" /> + style="stroke:#000000;stroke-width:2" /> diff --git a/linphone-app/assets/images/call_chat_secure_hovered.svg b/linphone-app/assets/images/call_chat_secure_hovered.svg deleted file mode 100644 index 260042b62..000000000 --- a/linphone-app/assets/images/call_chat_secure_hovered.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - chat_secure@x2 - - - - - - chat_secure@x2 - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/call_chat_secure_pressed.svg b/linphone-app/assets/images/call_chat_secure_pressed.svg deleted file mode 100644 index 50974d3bd..000000000 --- a/linphone-app/assets/images/call_chat_secure_pressed.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - chat_secure@x2 - - - - - - chat_secure@x2 - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/call_chat_unsecure_normal.svg b/linphone-app/assets/images/call_chat_unsecure_custom.svg similarity index 96% rename from linphone-app/assets/images/call_chat_unsecure_normal.svg rename to linphone-app/assets/images/call_chat_unsecure_custom.svg index e6ab9bf92..413a4bd8b 100644 --- a/linphone-app/assets/images/call_chat_unsecure_normal.svg +++ b/linphone-app/assets/images/call_chat_unsecure_custom.svg @@ -69,13 +69,13 @@ y="7.1354165" width="10" height="8.666667" - style="fill:#ff0000" /> + style="fill:#000000" /> + style="stroke:#000000;stroke-width:2" /> diff --git a/linphone-app/assets/images/call_chat_unsecure_hovered.svg b/linphone-app/assets/images/call_chat_unsecure_hovered.svg deleted file mode 100644 index 91a08e637..000000000 --- a/linphone-app/assets/images/call_chat_unsecure_hovered.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - chat_unsecure@x2 - - - - - - chat_unsecure@x2 - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/call_chat_unsecure_pressed.svg b/linphone-app/assets/images/call_chat_unsecure_pressed.svg deleted file mode 100644 index be4947766..000000000 --- a/linphone-app/assets/images/call_chat_unsecure_pressed.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - chat_unsecure@x2 - - - - - - chat_unsecure@x2 - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/call_custom.svg b/linphone-app/assets/images/call_custom.svg new file mode 100644 index 000000000..969706ad7 --- /dev/null +++ b/linphone-app/assets/images/call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/call_hovered.svg b/linphone-app/assets/images/call_hovered.svg deleted file mode 100644 index a41351654..000000000 --- a/linphone-app/assets/images/call_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_normal.svg b/linphone-app/assets/images/call_normal.svg deleted file mode 100644 index 0bab66f77..000000000 --- a/linphone-app/assets/images/call_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_pressed.svg b/linphone-app/assets/images/call_pressed.svg deleted file mode 100644 index 832802de9..000000000 --- a/linphone-app/assets/images/call_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - call_clic - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/call_quality_0.svg b/linphone-app/assets/images/call_quality_0.svg deleted file mode 100644 index 497d567a7..000000000 --- a/linphone-app/assets/images/call_quality_0.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - image/svg+xml - - call_quality_0 - - - - - - call_quality_0 - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/call_quality_2.svg b/linphone-app/assets/images/call_quality_2.svg deleted file mode 100644 index 3dae5e5f4..000000000 --- a/linphone-app/assets/images/call_quality_2.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - call_quality_2 - - - - - - call_quality_2 - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/call_quality_3.svg b/linphone-app/assets/images/call_quality_3.svg deleted file mode 100644 index 612e8ddbc..000000000 --- a/linphone-app/assets/images/call_quality_3.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - call_quality_3 - - - - - - call_quality_3 - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/call_quality_1.svg b/linphone-app/assets/images/call_quality_custom.svg similarity index 57% rename from linphone-app/assets/images/call_quality_1.svg rename to linphone-app/assets/images/call_quality_custom.svg index 23110c16b..0524cd0c3 100644 --- a/linphone-app/assets/images/call_quality_1.svg +++ b/linphone-app/assets/images/call_quality_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="call_quality_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,7 +22,7 @@ image/svg+xml - call_quality_1 + call_quality_custom @@ -35,20 +35,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1131" id="namedview18" showgrid="false" - inkscape:zoom="18.153846" - inkscape:cx="5" - inkscape:cy="6.5" + inkscape:zoom="4.5384615" + inkscape:cx="-30.516949" + inkscape:cy="37.237288" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg16" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="call_quality_custom" + inkscape:pagecheckerboard="0" /> call_quality_1 + id="title2">call_quality_custom Created with Sketch. + transform="matrix(7.9999899,0,0,6.2557797,0,0.29056132)"> + id="call_quality_custom" + style="stroke:#6b7a86;stroke-width:2"> + style="stroke-width:2.40305372;stroke-miterlimit:4;stroke-dasharray:none" /> + style="stroke-width:2.41245;stroke-miterlimit:4;stroke-dasharray:none" /> + style="stroke-width:2.36235;stroke-miterlimit:4;stroke-dasharray:none" /> diff --git a/linphone-app/assets/images/camera.svg b/linphone-app/assets/images/camera.svg deleted file mode 100644 index 990581a63..000000000 --- a/linphone-app/assets/images/camera.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/linphone-app/assets/images/camera_off_custom.svg b/linphone-app/assets/images/camera_off_custom.svg new file mode 100644 index 000000000..d3df40572 --- /dev/null +++ b/linphone-app/assets/images/camera_off_custom.svg @@ -0,0 +1,46 @@ + + + + + + + + diff --git a/linphone-app/assets/images/camera_off_hovered.svg b/linphone-app/assets/images/camera_off_hovered.svg deleted file mode 100644 index 2c4323d39..000000000 --- a/linphone-app/assets/images/camera_off_hovered.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - camera_off - - - - - - camera_off - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/camera_off_normal.svg b/linphone-app/assets/images/camera_off_normal.svg deleted file mode 100644 index 6f44153cd..000000000 --- a/linphone-app/assets/images/camera_off_normal.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - camera_off - - - - - - camera_off - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/camera_off_pressed.svg b/linphone-app/assets/images/camera_off_pressed.svg deleted file mode 100644 index a1bdd0da2..000000000 --- a/linphone-app/assets/images/camera_off_pressed.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - camera_off_clic - - - - - - camera_off_clic - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/camera_off_updating.svg b/linphone-app/assets/images/camera_off_updating.svg deleted file mode 100644 index 867f331c8..000000000 --- a/linphone-app/assets/images/camera_off_updating.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - camera_off - - - - - - camera_off - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/camera_on_custom.svg b/linphone-app/assets/images/camera_on_custom.svg new file mode 100644 index 000000000..f610dedd5 --- /dev/null +++ b/linphone-app/assets/images/camera_on_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/camera_on_hovered.svg b/linphone-app/assets/images/camera_on_hovered.svg deleted file mode 100644 index 59b356116..000000000 --- a/linphone-app/assets/images/camera_on_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - camera_on - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/camera_on_normal.svg b/linphone-app/assets/images/camera_on_normal.svg deleted file mode 100644 index 6b2835676..000000000 --- a/linphone-app/assets/images/camera_on_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - camera_on - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/camera_on_pressed.svg b/linphone-app/assets/images/camera_on_pressed.svg deleted file mode 100644 index 06c2475a0..000000000 --- a/linphone-app/assets/images/camera_on_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - camera_on_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/camera_on_updating.svg b/linphone-app/assets/images/camera_on_updating.svg deleted file mode 100644 index 6b2835676..000000000 --- a/linphone-app/assets/images/camera_on_updating.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - camera_on - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/cancel_custom.svg b/linphone-app/assets/images/cancel_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/cancel_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/cancel_hovered.svg b/linphone-app/assets/images/cancel_hovered.svg deleted file mode 100644 index ac47999bf..000000000 --- a/linphone-app/assets/images/cancel_hovered.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - cancel_add_conference_over - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/cancel_normal.svg b/linphone-app/assets/images/cancel_normal.svg deleted file mode 100644 index 3acee96a1..000000000 --- a/linphone-app/assets/images/cancel_normal.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - cancel_add_conference_default - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/cancel_pressed.svg b/linphone-app/assets/images/cancel_pressed.svg deleted file mode 100644 index a14f16758..000000000 --- a/linphone-app/assets/images/cancel_pressed.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - cancel_add_conference_clic - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/chat_custom.svg b/linphone-app/assets/images/chat_custom.svg new file mode 100644 index 000000000..db15e6661 --- /dev/null +++ b/linphone-app/assets/images/chat_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/chat_disabled.svg b/linphone-app/assets/images/chat_disabled.svg deleted file mode 100644 index 0500269bc..000000000 --- a/linphone-app/assets/images/chat_disabled.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - chat_default - Created with Sketch. - - - - - - - - - - - - - chat_default - - - - diff --git a/linphone-app/assets/images/chat_hovered.svg b/linphone-app/assets/images/chat_hovered.svg deleted file mode 100644 index 18c5cf6aa..000000000 --- a/linphone-app/assets/images/chat_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - chat_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/chat_menu_normal.svg b/linphone-app/assets/images/chat_menu_custom.svg similarity index 85% rename from linphone-app/assets/images/chat_menu_normal.svg rename to linphone-app/assets/images/chat_menu_custom.svg index 57fcc7150..d01c86582 100644 --- a/linphone-app/assets/images/chat_menu_normal.svg +++ b/linphone-app/assets/images/chat_menu_custom.svg @@ -68,20 +68,7 @@ - - - - + id="g26"> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/chat_menu_pressed.svg b/linphone-app/assets/images/chat_menu_pressed.svg deleted file mode 100644 index 17e46f152..000000000 --- a/linphone-app/assets/images/chat_menu_pressed.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/chat_micro.svg b/linphone-app/assets/images/chat_micro_custom.svg similarity index 82% rename from linphone-app/assets/images/chat_micro.svg rename to linphone-app/assets/images/chat_micro_custom.svg index 7bd118b07..dfbaa91dd 100644 --- a/linphone-app/assets/images/chat_micro.svg +++ b/linphone-app/assets/images/chat_micro_custom.svg @@ -1,11 +1,11 @@ + transform="matrix(1.6850146,0,0,2,25,15)"> - - - chat_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/chat_pressed.svg b/linphone-app/assets/images/chat_pressed.svg deleted file mode 100644 index 460cf104d..000000000 --- a/linphone-app/assets/images/chat_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - chat_clic - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/chat_room.svg b/linphone-app/assets/images/chat_room_custom.svg similarity index 94% rename from linphone-app/assets/images/chat_room.svg rename to linphone-app/assets/images/chat_room_custom.svg index 1973fa81c..408e19619 100644 --- a/linphone-app/assets/images/chat_room.svg +++ b/linphone-app/assets/images/chat_room_custom.svg @@ -1,11 +1,11 @@ + transform="matrix(0.91808004,0,0,0.97218937,14.299365,21.746553)"> - - - - - - - - diff --git a/linphone-app/assets/images/close.svg b/linphone-app/assets/images/close.svg deleted file mode 100644 index 97cc19996..000000000 --- a/linphone-app/assets/images/close.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/close_custom.svg b/linphone-app/assets/images/close_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/close_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/collapse.svg b/linphone-app/assets/images/collapse.svg deleted file mode 100644 index aa34c7c00..000000000 --- a/linphone-app/assets/images/collapse.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - window_close - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/expanded.svg b/linphone-app/assets/images/collapsed_custom.svg similarity index 85% rename from linphone-app/assets/images/expanded.svg rename to linphone-app/assets/images/collapsed_custom.svg index b18f30c06..2cceabfbe 100644 --- a/linphone-app/assets/images/expanded.svg +++ b/linphone-app/assets/images/collapsed_custom.svg @@ -1,11 +1,11 @@ @@ -57,10 +57,10 @@ + transform="matrix(4.1666619,0,0,4.2856734,15,25)"> + style="stroke:#000000;stroke-width:2"> - - - - - - - - - - - diff --git a/linphone-app/assets/images/conferences_selected.svg b/linphone-app/assets/images/conferences_selected.svg deleted file mode 100644 index c0b066fb6..000000000 --- a/linphone-app/assets/images/conferences_selected.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - diff --git a/linphone-app/assets/images/contact_add.svg b/linphone-app/assets/images/contact_add.svg deleted file mode 100644 index 1ed790513..000000000 --- a/linphone-app/assets/images/contact_add.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - contact_add_default - - - - - - contact_add_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/contact_add_custom.svg b/linphone-app/assets/images/contact_add_custom.svg new file mode 100644 index 000000000..de24c41a0 --- /dev/null +++ b/linphone-app/assets/images/contact_add_custom.svg @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/linphone-app/assets/images/contact_add_hovered.svg b/linphone-app/assets/images/contact_add_hovered.svg deleted file mode 100644 index bbc884334..000000000 --- a/linphone-app/assets/images/contact_add_hovered.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - contact_add_over - - - - - - contact_add_over - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/contact_add_normal.svg b/linphone-app/assets/images/contact_add_normal.svg deleted file mode 100644 index ca51c3476..000000000 --- a/linphone-app/assets/images/contact_add_normal.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - contact_add_default - - - - - - contact_add_default - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/contact_add_pressed.svg b/linphone-app/assets/images/contact_add_pressed.svg deleted file mode 100644 index 34fde2400..000000000 --- a/linphone-app/assets/images/contact_add_pressed.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - contact_add_clic - - - - - - contact_add_clic - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/contact_card_photo_custom.svg b/linphone-app/assets/images/contact_card_photo_custom.svg new file mode 100644 index 000000000..738e3d12c --- /dev/null +++ b/linphone-app/assets/images/contact_card_photo_custom.svg @@ -0,0 +1,73 @@ + + + + + contact_card_photo_over + Created with Sketch. + + + + + + + + + + + + + contact_card_photo_over + + + + diff --git a/linphone-app/assets/images/contact_card_photo_disabled.svg b/linphone-app/assets/images/contact_card_photo_disabled.svg deleted file mode 100644 index b4e52a62f..000000000 --- a/linphone-app/assets/images/contact_card_photo_disabled.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - contact_card_photo_default - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/contact_card_photo_hovered.svg b/linphone-app/assets/images/contact_card_photo_hovered.svg deleted file mode 100644 index e7b9d282d..000000000 --- a/linphone-app/assets/images/contact_card_photo_hovered.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - contact_card_photo_over - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/contact_card_photo_normal.svg b/linphone-app/assets/images/contact_card_photo_normal.svg deleted file mode 100644 index b4e52a62f..000000000 --- a/linphone-app/assets/images/contact_card_photo_normal.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - contact_card_photo_default - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/contact_card_photo_pressed.svg b/linphone-app/assets/images/contact_card_photo_pressed.svg deleted file mode 100644 index 572361513..000000000 --- a/linphone-app/assets/images/contact_card_photo_pressed.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - contact_card_photo_over - Created with Sketch. - - - - - - - - - - - diff --git a/linphone-app/assets/images/contact_custom.svg b/linphone-app/assets/images/contact_custom.svg new file mode 100644 index 000000000..7929cb7f2 --- /dev/null +++ b/linphone-app/assets/images/contact_custom.svg @@ -0,0 +1,66 @@ + + + + + contact_selected + Created with Sketch. + + + + + + + + + + contact_selected + + + + diff --git a/linphone-app/assets/images/contact_delete_custom.svg b/linphone-app/assets/images/contact_delete_custom.svg new file mode 100644 index 000000000..d3cf68fbc --- /dev/null +++ b/linphone-app/assets/images/contact_delete_custom.svg @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/linphone-app/assets/images/contact_disabled.svg b/linphone-app/assets/images/contact_disabled.svg deleted file mode 100644 index f7197ac04..000000000 --- a/linphone-app/assets/images/contact_disabled.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - contact_default - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/edit_pressed.svg b/linphone-app/assets/images/contact_edit_custom.svg similarity index 75% rename from linphone-app/assets/images/edit_pressed.svg rename to linphone-app/assets/images/contact_edit_custom.svg index d73d161e8..e28afe867 100644 --- a/linphone-app/assets/images/edit_pressed.svg +++ b/linphone-app/assets/images/contact_edit_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="edit_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,17 +35,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1043" id="namedview13" showgrid="false" - inkscape:zoom="7.8666667" - inkscape:cx="5.3568631" - inkscape:cy="8.0375807" + inkscape:zoom="2.7812868" + inkscape:cx="21.752522" + inkscape:cy="2.1572749" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg11" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> settings_edit_default @@ -56,11 +57,10 @@ + transform="matrix(2.66793,0,0,2.666665,19.981268,19.999945)"> + style="stroke:#000000"> - - - - - image/svg+xml - - contact_edit_over - - - - - - contact_edit_over - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/contact_edit_normal.svg b/linphone-app/assets/images/contact_edit_normal.svg deleted file mode 100644 index 622bc555b..000000000 --- a/linphone-app/assets/images/contact_edit_normal.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - image/svg+xml - - contact_edit_default - - - - - - contact_edit_default - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/contact_edit_pressed.svg b/linphone-app/assets/images/contact_edit_pressed.svg deleted file mode 100644 index 63dd27d2b..000000000 --- a/linphone-app/assets/images/contact_edit_pressed.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - image/svg+xml - - contact_edit_clic - - - - - - contact_edit_clic - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/contact_normal.svg b/linphone-app/assets/images/contact_normal.svg deleted file mode 100644 index f0a637c0b..000000000 --- a/linphone-app/assets/images/contact_normal.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - contact_selected - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/contact_selected.svg b/linphone-app/assets/images/contact_selected.svg deleted file mode 100644 index f0a637c0b..000000000 --- a/linphone-app/assets/images/contact_selected.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - contact_selected - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/contact_view_custom.svg b/linphone-app/assets/images/contact_view_custom.svg new file mode 100644 index 000000000..28277fdac --- /dev/null +++ b/linphone-app/assets/images/contact_view_custom.svg @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/linphone-app/assets/images/copy_light.svg b/linphone-app/assets/images/copy_custom.svg similarity index 99% rename from linphone-app/assets/images/copy_light.svg rename to linphone-app/assets/images/copy_custom.svg index 20f0f3f1e..719dfe8cc 100644 --- a/linphone-app/assets/images/copy_light.svg +++ b/linphone-app/assets/images/copy_custom.svg @@ -37,7 +37,7 @@ id="g10" transform="matrix(4.7763786,0,0,4.7058824,7,0)"> - - - - - image/svg+xml - - call_lost - - - - - - call_lost - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/declined_incoming_call_custom.svg b/linphone-app/assets/images/declined_incoming_call_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/declined_incoming_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/declined_outgoing_call.svg b/linphone-app/assets/images/declined_outgoing_call.svg deleted file mode 100644 index 6020feb66..000000000 --- a/linphone-app/assets/images/declined_outgoing_call.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - call_lost - - - - - - call_lost - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/declined_outgoing_call_custom.svg b/linphone-app/assets/images/declined_outgoing_call_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/declined_outgoing_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/delete_custom.svg b/linphone-app/assets/images/delete_custom.svg new file mode 100644 index 000000000..26b1f664e --- /dev/null +++ b/linphone-app/assets/images/delete_custom.svg @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/linphone-app/assets/images/delete_hovered.svg b/linphone-app/assets/images/delete_hovered.svg deleted file mode 100644 index 0d19c3020..000000000 --- a/linphone-app/assets/images/delete_hovered.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - delete_over - - - - - - delete_over - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/delete_normal.svg b/linphone-app/assets/images/delete_normal.svg deleted file mode 100644 index f29a3214c..000000000 --- a/linphone-app/assets/images/delete_normal.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - delete_default - - - - - - delete_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/delete_pressed.svg b/linphone-app/assets/images/delete_pressed.svg deleted file mode 100644 index e5e77ed48..000000000 --- a/linphone-app/assets/images/delete_pressed.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - delete_clic - - - - - - delete_clic - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/download.svg b/linphone-app/assets/images/download.svg deleted file mode 100644 index c1328fc73..000000000 --- a/linphone-app/assets/images/download.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - dowanload_icon - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/download_custom.svg b/linphone-app/assets/images/download_custom.svg new file mode 100644 index 000000000..368fade8e --- /dev/null +++ b/linphone-app/assets/images/download_custom.svg @@ -0,0 +1,76 @@ + + + + + dowanload_icon + Created with Sketch. + + + + + + + + + + + + + + dowanload_icon + + + + diff --git a/linphone-app/assets/images/drop_down.svg b/linphone-app/assets/images/drop_down_custom.svg similarity index 77% rename from linphone-app/assets/images/drop_down.svg rename to linphone-app/assets/images/drop_down_custom.svg index 5f1260870..2cceabfbe 100644 --- a/linphone-app/assets/images/drop_down.svg +++ b/linphone-app/assets/images/drop_down_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="collapsed_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -36,16 +36,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="985" + inkscape:window-height="1043" id="namedview13" showgrid="false" inkscape:zoom="5.9599" - inkscape:cx="4.2497286" - inkscape:cy="-10.038144" + inkscape:cx="4.2785953" + inkscape:cy="30.201849" inkscape:window-x="0" - inkscape:window-y="35" + inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg11" /> + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> drop_down_list @@ -56,10 +57,10 @@ + transform="matrix(4.1666619,0,0,4.2856734,15,25)"> + style="stroke:#000000;stroke-width:2"> + sodipodi:docname="edit_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,17 +35,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1043" id="namedview13" showgrid="false" - inkscape:zoom="7.8666667" - inkscape:cx="7.2557047" - inkscape:cy="14.851071" + inkscape:zoom="2.7812868" + inkscape:cx="21.752522" + inkscape:cy="2.1572749" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg11" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> settings_edit_default @@ -56,10 +57,10 @@ + transform="matrix(2.66793,0,0,2.666665,19.981268,19.999945)"> + style="stroke:#000000"> - - - - - image/svg+xml - - settings_edit_default - - - - - - settings_edit_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/ended_call.svg b/linphone-app/assets/images/ended_call.svg deleted file mode 100644 index 84d79b647..000000000 --- a/linphone-app/assets/images/ended_call.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - image/svg+xml - - call_end - - - - - - call_end - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/ended_call_custom.svg b/linphone-app/assets/images/ended_call_custom.svg new file mode 100644 index 000000000..97110beca --- /dev/null +++ b/linphone-app/assets/images/ended_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/collapsed.svg b/linphone-app/assets/images/expanded_custom.svg similarity index 77% rename from linphone-app/assets/images/collapsed.svg rename to linphone-app/assets/images/expanded_custom.svg index 5f1260870..bb1123c50 100644 --- a/linphone-app/assets/images/collapsed.svg +++ b/linphone-app/assets/images/expanded_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="expanded_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -36,16 +36,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="985" + inkscape:window-height="1131" id="namedview13" showgrid="false" inkscape:zoom="5.9599" - inkscape:cx="4.2497286" - inkscape:cy="-10.038144" + inkscape:cx="4.2785953" + inkscape:cy="3.355761" inkscape:window-x="0" - inkscape:window-y="35" + inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg11" /> + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> drop_down_list @@ -56,10 +57,10 @@ + transform="matrix(4.1666269,0,0,-4.2857559,15,55.000291)"> + style="stroke:#000000;stroke-width:2"> + sodipodi:docname="file_hovered_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,17 +35,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1131" id="namedview23" showgrid="false" - inkscape:zoom="11.8" - inkscape:cx="8" - inkscape:cy="10" + inkscape:zoom="2.95" + inkscape:cx="-48.983051" + inkscape:cy="29.830508" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg21" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg21" + inkscape:pagecheckerboard="0" /> settings_file_1 @@ -56,10 +57,10 @@ + transform="matrix(2.1875226,0,0,1.9999927,22.5,20)"> + style="stroke:#000000"> - - - - - image/svg+xml - - settings_file_3 - - - - - - settings_file_3 - Created with Sketch. - - - - - - - - - - - diff --git a/linphone-app/assets/images/file_pressed.svg b/linphone-app/assets/images/file_pressed.svg deleted file mode 100644 index c1d09ef61..000000000 --- a/linphone-app/assets/images/file_pressed.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - image/svg+xml - - settings_file_2 - - - - - - settings_file_2 - Created with Sketch. - - - - - - - - - - - diff --git a/linphone-app/assets/images/filter.svg b/linphone-app/assets/images/filter_custom.svg similarity index 90% rename from linphone-app/assets/images/filter.svg rename to linphone-app/assets/images/filter_custom.svg index 5f7298388..6a63691e4 100644 --- a/linphone-app/assets/images/filter.svg +++ b/linphone-app/assets/images/filter_custom.svg @@ -5,8 +5,8 @@ Created with Sketch. - + - \ No newline at end of file + diff --git a/linphone-app/assets/images/filter_params_custom.svg b/linphone-app/assets/images/filter_params_custom.svg new file mode 100644 index 000000000..194fecd9b --- /dev/null +++ b/linphone-app/assets/images/filter_params_custom.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + diff --git a/linphone-app/assets/images/folder_hovered.svg b/linphone-app/assets/images/folder_custom.svg similarity index 76% rename from linphone-app/assets/images/folder_hovered.svg rename to linphone-app/assets/images/folder_custom.svg index d0ba62cc0..4280e2ad9 100644 --- a/linphone-app/assets/images/folder_hovered.svg +++ b/linphone-app/assets/images/folder_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="folder_hovered_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,17 +35,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1131" id="namedview13" showgrid="false" - inkscape:zoom="13.111111" - inkscape:cx="10.5" - inkscape:cy="9" + inkscape:zoom="3.2777778" + inkscape:cx="-18.762712" + inkscape:cy="25.932204" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg11" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> settings_folder_1 @@ -56,10 +57,10 @@ + transform="matrix(2.142856,0,0,2.2222245,17.5,20)"> + style="stroke:#000000"> - - - - - image/svg+xml - - settings_folder_3 - - - - - - settings_folder_3 - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/folder_pressed.svg b/linphone-app/assets/images/folder_pressed.svg deleted file mode 100644 index 14b79401c..000000000 --- a/linphone-app/assets/images/folder_pressed.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - settings_folder_2 - - - - - - settings_folder_2 - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/fullscreen_custom.svg b/linphone-app/assets/images/fullscreen_custom.svg new file mode 100644 index 000000000..31e68244f --- /dev/null +++ b/linphone-app/assets/images/fullscreen_custom.svg @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/linphone-app/assets/images/fullscreen_hovered.svg b/linphone-app/assets/images/fullscreen_hovered.svg deleted file mode 100644 index 54685df81..000000000 --- a/linphone-app/assets/images/fullscreen_hovered.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - fullscreen_over - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/fullscreen_normal.svg b/linphone-app/assets/images/fullscreen_normal.svg deleted file mode 100644 index bbc2491bc..000000000 --- a/linphone-app/assets/images/fullscreen_normal.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - fullscreen_default - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/fullscreen_pressed.svg b/linphone-app/assets/images/fullscreen_pressed.svg deleted file mode 100644 index 54685df81..000000000 --- a/linphone-app/assets/images/fullscreen_pressed.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - fullscreen_over - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/generic_error_hovered.svg b/linphone-app/assets/images/generic_error_hovered.svg deleted file mode 100644 index 0af8bf164..000000000 --- a/linphone-app/assets/images/generic_error_hovered.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - chat_error - - - - - - chat_error - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/generic_error_normal.svg b/linphone-app/assets/images/generic_error_normal.svg deleted file mode 100644 index 832f650c7..000000000 --- a/linphone-app/assets/images/generic_error_normal.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - chat_error - - - - - - chat_error - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/generic_error_pressed.svg b/linphone-app/assets/images/generic_error_pressed.svg deleted file mode 100644 index 5dae13cba..000000000 --- a/linphone-app/assets/images/generic_error_pressed.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - image/svg+xml - - chat_error - - - - - - chat_error - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/group_chat_custom.svg b/linphone-app/assets/images/group_chat_custom.svg new file mode 100644 index 000000000..6856fa63e --- /dev/null +++ b/linphone-app/assets/images/group_chat_custom.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/group_chat_hovered.svg b/linphone-app/assets/images/group_chat_hovered.svg deleted file mode 100644 index 89b8d1294..000000000 --- a/linphone-app/assets/images/group_chat_hovered.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/group_chat_normal.svg b/linphone-app/assets/images/group_chat_normal.svg deleted file mode 100644 index 5e92285b7..000000000 --- a/linphone-app/assets/images/group_chat_normal.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/group_chat_pressed.svg b/linphone-app/assets/images/group_chat_pressed.svg deleted file mode 100644 index 04842791b..000000000 --- a/linphone-app/assets/images/group_chat_pressed.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - 4DD8BA2F-EDDE-41CB-BCE6-DE37F912DDDA - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4DD8BA2F-EDDE-41CB-BCE6-DE37F912DDDA - - - - - - diff --git a/linphone-app/assets/images/hangup_custom.svg b/linphone-app/assets/images/hangup_custom.svg new file mode 100644 index 000000000..d67c8b4f1 --- /dev/null +++ b/linphone-app/assets/images/hangup_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/hangup_hovered.svg b/linphone-app/assets/images/hangup_hovered.svg deleted file mode 100644 index 884d35a32..000000000 --- a/linphone-app/assets/images/hangup_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - hangup_over - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/hangup_normal.svg b/linphone-app/assets/images/hangup_normal.svg deleted file mode 100644 index a58321671..000000000 --- a/linphone-app/assets/images/hangup_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - hangup_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/hangup_pressed.svg b/linphone-app/assets/images/hangup_pressed.svg deleted file mode 100644 index 72686adc3..000000000 --- a/linphone-app/assets/images/hangup_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - hangup_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/history.svg b/linphone-app/assets/images/history.svg deleted file mode 100644 index bfba0d0e1..000000000 --- a/linphone-app/assets/images/history.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - history - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/history_custom.svg b/linphone-app/assets/images/history_custom.svg new file mode 100644 index 000000000..9d8110c96 --- /dev/null +++ b/linphone-app/assets/images/history_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/history_hovered.svg b/linphone-app/assets/images/history_hovered.svg deleted file mode 100644 index 0bb02b704..000000000 --- a/linphone-app/assets/images/history_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - history_over - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/history_normal.svg b/linphone-app/assets/images/history_normal.svg deleted file mode 100644 index b516f9608..000000000 --- a/linphone-app/assets/images/history_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - history_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/history_pressed.svg b/linphone-app/assets/images/history_pressed.svg deleted file mode 100644 index 800aea0ef..000000000 --- a/linphone-app/assets/images/history_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - history_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/home_custom.svg b/linphone-app/assets/images/home_custom.svg new file mode 100644 index 000000000..d7fa70733 --- /dev/null +++ b/linphone-app/assets/images/home_custom.svg @@ -0,0 +1,40 @@ + + + + + + diff --git a/linphone-app/assets/images/home_disabled.svg b/linphone-app/assets/images/home_disabled.svg deleted file mode 100644 index f9cb2f7c3..000000000 --- a/linphone-app/assets/images/home_disabled.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/home_hovered.svg b/linphone-app/assets/images/home_hovered.svg deleted file mode 100644 index 3293b35dc..000000000 --- a/linphone-app/assets/images/home_hovered.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/home_normal.svg b/linphone-app/assets/images/home_normal.svg deleted file mode 100644 index d3755d91a..000000000 --- a/linphone-app/assets/images/home_normal.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/home_pressed.svg b/linphone-app/assets/images/home_pressed.svg deleted file mode 100644 index 1bbda16a5..000000000 --- a/linphone-app/assets/images/home_pressed.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/home_selected.svg b/linphone-app/assets/images/home_selected.svg deleted file mode 100644 index 9d4be5dc4..000000000 --- a/linphone-app/assets/images/home_selected.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - home_icon_selected - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/incoming_call.svg b/linphone-app/assets/images/incoming_call_custom.svg similarity index 60% rename from linphone-app/assets/images/incoming_call.svg rename to linphone-app/assets/images/incoming_call_custom.svg index 9fe3a1521..15fa93ee3 100644 --- a/linphone-app/assets/images/incoming_call.svg +++ b/linphone-app/assets/images/incoming_call_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="incoming_call_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,7 +22,7 @@ image/svg+xml - call_incoming + call_outgoing @@ -35,20 +35,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1043" id="namedview13" showgrid="false" - inkscape:zoom="9.8333333" - inkscape:cx="3.0047032" - inkscape:cy="4.1961332" + inkscape:zoom="2.4583334" + inkscape:cx="-43.322033" + inkscape:cy="106.57627" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg11" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> call_incoming + id="title2">call_outgoing Created with Sketch. + transform="matrix(-3.4757387,0,0,-3.4636486,60.520921,61.018475)"> + id="call_outgoing" + style="stroke:#000000;stroke-width:2"> diff --git a/linphone-app/assets/images/menu_copy_text.svg b/linphone-app/assets/images/menu_copy_text.svg deleted file mode 100644 index 3a32b9908..000000000 --- a/linphone-app/assets/images/menu_copy_text.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_copy_text_custom.svg b/linphone-app/assets/images/menu_copy_text_custom.svg new file mode 100644 index 000000000..ad5a13053 --- /dev/null +++ b/linphone-app/assets/images/menu_copy_text_custom.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/linphone-app/assets/images/menu_devices.svg b/linphone-app/assets/images/menu_devices_custom.svg similarity index 86% rename from linphone-app/assets/images/menu_devices.svg rename to linphone-app/assets/images/menu_devices_custom.svg index 51cb78b65..ef17a6422 100644 --- a/linphone-app/assets/images/menu_devices.svg +++ b/linphone-app/assets/images/menu_devices_custom.svg @@ -1,8 +1,8 @@ @@ -36,17 +36,17 @@ fill="none" fill-rule="evenodd" id="g8" - transform="matrix(0.18571633,0,0,0.1875043,0.90699082,-0.28142708)"> + transform="matrix(0.50000772,0,0,0.50000981,22.24959,19.24953)"> diff --git a/linphone-app/assets/images/menu_devices_selected.svg b/linphone-app/assets/images/menu_devices_selected.svg deleted file mode 100644 index a74c1fc7e..000000000 --- a/linphone-app/assets/images/menu_devices_selected.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_ephemeral.svg b/linphone-app/assets/images/menu_ephemeral_custom.svg similarity index 89% rename from linphone-app/assets/images/menu_ephemeral.svg rename to linphone-app/assets/images/menu_ephemeral_custom.svg index 865d7fad2..ef9a0b159 100644 --- a/linphone-app/assets/images/menu_ephemeral.svg +++ b/linphone-app/assets/images/menu_ephemeral_custom.svg @@ -1,8 +1,8 @@ @@ -36,9 +36,9 @@ fill="none" fill-rule="evenodd" id="g10" - transform="matrix(0.19288979,0,0,0.18473816,0.84530239,0)"> + transform="matrix(0.51931865,0,0,0.49263511,22.083506,20)"> - - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_imdn_info.svg b/linphone-app/assets/images/menu_imdn_info.svg deleted file mode 100644 index b3a491d93..000000000 --- a/linphone-app/assets/images/menu_imdn_info.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_imdn_info_custom.svg b/linphone-app/assets/images/menu_imdn_info_custom.svg new file mode 100644 index 000000000..ec3f3aa0e --- /dev/null +++ b/linphone-app/assets/images/menu_imdn_info_custom.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/menu_info_custom.svg b/linphone-app/assets/images/menu_info_custom.svg new file mode 100644 index 000000000..ec3f3aa0e --- /dev/null +++ b/linphone-app/assets/images/menu_info_custom.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/menu_infos.svg b/linphone-app/assets/images/menu_infos.svg deleted file mode 100644 index fab872712..000000000 --- a/linphone-app/assets/images/menu_infos.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_infos_selected.svg b/linphone-app/assets/images/menu_infos_selected.svg deleted file mode 100644 index 618e4f6ad..000000000 --- a/linphone-app/assets/images/menu_infos_selected.svg +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/menu_vdots_hovered.svg b/linphone-app/assets/images/menu_vdots_custom.svg similarity index 81% rename from linphone-app/assets/images/menu_vdots_hovered.svg rename to linphone-app/assets/images/menu_vdots_custom.svg index 7aed15fa0..ebf91daf0 100644 --- a/linphone-app/assets/images/menu_vdots_hovered.svg +++ b/linphone-app/assets/images/menu_vdots_custom.svg @@ -6,11 +6,11 @@ id="Layer_1" x="0px" y="0px" - viewBox="0 0 30 30" + viewBox="0 0 80 80" xml:space="preserve" - sodipodi:docname="menu_vdots_hovered.svg" - width="30" - height="30" + sodipodi:docname="menu_vdots_custom.svg" + width="80" + height="80" inkscape:version="1.1 (c68e22c387, 2021-05-23)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -28,13 +28,13 @@ width="15px" showguides="false" borderlayer="false" - inkscape:zoom="27.28125" - inkscape:cx="2.7308133" - inkscape:cy="12.077892" + inkscape:zoom="3.4101563" + inkscape:cx="-28.591065" + inkscape:cy="36.068728" inkscape:window-width="1920" - inkscape:window-height="1092" - inkscape:window-x="1920" - inkscape:window-y="33" + inkscape:window-height="1131" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" height="30px" /> @@ -45,7 +45,7 @@ + transform="matrix(0.08460237,0,0,0.078125,18.341793,20)"> - - - - - - - - diff --git a/linphone-app/assets/images/menu_vdots_pressed.svg b/linphone-app/assets/images/menu_vdots_pressed.svg deleted file mode 100644 index 7aed15fa0..000000000 --- a/linphone-app/assets/images/menu_vdots_pressed.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - diff --git a/linphone-app/assets/images/micro.svg b/linphone-app/assets/images/micro.svg deleted file mode 100644 index 672c3b63a..000000000 --- a/linphone-app/assets/images/micro.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/linphone-app/assets/images/micro_off_custom.svg b/linphone-app/assets/images/micro_off_custom.svg new file mode 100644 index 000000000..87e03b3f8 --- /dev/null +++ b/linphone-app/assets/images/micro_off_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/micro_off_hovered.svg b/linphone-app/assets/images/micro_off_hovered.svg deleted file mode 100644 index 502450050..000000000 --- a/linphone-app/assets/images/micro_off_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_off - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/micro_off_normal.svg b/linphone-app/assets/images/micro_off_normal.svg deleted file mode 100644 index 4c19f8966..000000000 --- a/linphone-app/assets/images/micro_off_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_off - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/micro_off_pressed.svg b/linphone-app/assets/images/micro_off_pressed.svg deleted file mode 100644 index 37de1740a..000000000 --- a/linphone-app/assets/images/micro_off_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_off_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/micro_on_custom.svg b/linphone-app/assets/images/micro_on_custom.svg new file mode 100644 index 000000000..ff42e7317 --- /dev/null +++ b/linphone-app/assets/images/micro_on_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/micro_on_hovered.svg b/linphone-app/assets/images/micro_on_hovered.svg deleted file mode 100644 index 6375f2dc0..000000000 --- a/linphone-app/assets/images/micro_on_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_on - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/micro_on_normal.svg b/linphone-app/assets/images/micro_on_normal.svg deleted file mode 100644 index da770932a..000000000 --- a/linphone-app/assets/images/micro_on_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_on - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/micro_on_pressed.svg b/linphone-app/assets/images/micro_on_pressed.svg deleted file mode 100644 index f993523d8..000000000 --- a/linphone-app/assets/images/micro_on_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - micro_on_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/missed_incoming_call.svg b/linphone-app/assets/images/missed_incoming_call.svg deleted file mode 100644 index 6020feb66..000000000 --- a/linphone-app/assets/images/missed_incoming_call.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - call_lost - - - - - - call_lost - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/missed_incoming_call_custom.svg b/linphone-app/assets/images/missed_incoming_call_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/missed_incoming_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/missed_outgoing_call.svg b/linphone-app/assets/images/missed_outgoing_call.svg deleted file mode 100644 index 6020feb66..000000000 --- a/linphone-app/assets/images/missed_outgoing_call.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - call_lost - - - - - - call_lost - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/missed_outgoing_call_custom.svg b/linphone-app/assets/images/missed_outgoing_call_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/missed_outgoing_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/new_call_custom.svg b/linphone-app/assets/images/new_call_custom.svg new file mode 100644 index 000000000..e5c35b297 --- /dev/null +++ b/linphone-app/assets/images/new_call_custom.svg @@ -0,0 +1,49 @@ + + + + + + + + + diff --git a/linphone-app/assets/images/new_call_hovered.svg b/linphone-app/assets/images/new_call_hovered.svg deleted file mode 100644 index c624484cc..000000000 --- a/linphone-app/assets/images/new_call_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - new_call_clic - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/assets/images/new_call_normal.svg b/linphone-app/assets/images/new_call_normal.svg deleted file mode 100644 index a14c9ae93..000000000 --- a/linphone-app/assets/images/new_call_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - new_call_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/new_call_pressed.svg b/linphone-app/assets/images/new_call_pressed.svg deleted file mode 100644 index a14c9ae93..000000000 --- a/linphone-app/assets/images/new_call_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - new_call_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/new_chat_group_custom.svg b/linphone-app/assets/images/new_chat_group_custom.svg new file mode 100644 index 000000000..62bcc5470 --- /dev/null +++ b/linphone-app/assets/images/new_chat_group_custom.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/linphone-app/assets/images/new_chat_group_disabled.svg b/linphone-app/assets/images/new_chat_group_disabled.svg deleted file mode 100644 index 336a8a101..000000000 --- a/linphone-app/assets/images/new_chat_group_disabled.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_group_hovered.svg b/linphone-app/assets/images/new_chat_group_hovered.svg deleted file mode 100644 index 578548f11..000000000 --- a/linphone-app/assets/images/new_chat_group_hovered.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_group_normal.svg b/linphone-app/assets/images/new_chat_group_normal.svg deleted file mode 100644 index 33edd0b0d..000000000 --- a/linphone-app/assets/images/new_chat_group_normal.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_group_pressed.svg b/linphone-app/assets/images/new_chat_group_pressed.svg deleted file mode 100644 index c4fce2792..000000000 --- a/linphone-app/assets/images/new_chat_group_pressed.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_hovered.svg b/linphone-app/assets/images/new_chat_hovered.svg deleted file mode 100644 index db2f52b86..000000000 --- a/linphone-app/assets/images/new_chat_hovered.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_normal.svg b/linphone-app/assets/images/new_chat_normal.svg deleted file mode 100644 index db2f52b86..000000000 --- a/linphone-app/assets/images/new_chat_normal.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_chat_pressed.svg b/linphone-app/assets/images/new_chat_pressed.svg deleted file mode 100644 index db2f52b86..000000000 --- a/linphone-app/assets/images/new_chat_pressed.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_conference_custom.svg b/linphone-app/assets/images/new_conference_custom.svg new file mode 100644 index 000000000..c6809985f --- /dev/null +++ b/linphone-app/assets/images/new_conference_custom.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/new_conference_disabled.svg b/linphone-app/assets/images/new_conference_disabled.svg deleted file mode 100644 index 5076f48fe..000000000 --- a/linphone-app/assets/images/new_conference_disabled.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_conference_hovered.svg b/linphone-app/assets/images/new_conference_hovered.svg deleted file mode 100644 index eb909735e..000000000 --- a/linphone-app/assets/images/new_conference_hovered.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_conference_normal.svg b/linphone-app/assets/images/new_conference_normal.svg deleted file mode 100644 index b2f19248e..000000000 --- a/linphone-app/assets/images/new_conference_normal.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/new_conference_pressed.svg b/linphone-app/assets/images/new_conference_pressed.svg deleted file mode 100644 index 0274bed8e..000000000 --- a/linphone-app/assets/images/new_conference_pressed.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/options_custom.svg b/linphone-app/assets/images/options_custom.svg new file mode 100644 index 000000000..c3bd30421 --- /dev/null +++ b/linphone-app/assets/images/options_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/options_hovered.svg b/linphone-app/assets/images/options_hovered.svg deleted file mode 100644 index 573854bd0..000000000 --- a/linphone-app/assets/images/options_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - options_over - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/options_normal.svg b/linphone-app/assets/images/options_normal.svg deleted file mode 100644 index c3b080307..000000000 --- a/linphone-app/assets/images/options_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - options_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/options_pressed.svg b/linphone-app/assets/images/options_pressed.svg deleted file mode 100644 index 0e973452b..000000000 --- a/linphone-app/assets/images/options_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - options_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/outgoing_call.svg b/linphone-app/assets/images/outgoing_call_custom.svg similarity index 71% rename from linphone-app/assets/images/outgoing_call.svg rename to linphone-app/assets/images/outgoing_call_custom.svg index a679ec0c3..30d310d20 100644 --- a/linphone-app/assets/images/outgoing_call.svg +++ b/linphone-app/assets/images/outgoing_call_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="outgoing_call_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,17 +35,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="868" - inkscape:window-height="480" + inkscape:window-width="1920" + inkscape:window-height="1043" id="namedview13" showgrid="false" - inkscape:zoom="19.666667" - inkscape:cx="6" - inkscape:cy="6" + inkscape:zoom="2.4583334" + inkscape:cx="-43.322033" + inkscape:cy="106.57627" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg11" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg11" + inkscape:pagecheckerboard="0" /> call_outgoing @@ -56,14 +57,14 @@ + transform="matrix(3.4757387,0,0,3.4636486,18.464483,20.000317)"> + style="stroke:#000000;stroke-width:2"> diff --git a/linphone-app/assets/images/panel_arrow.svg b/linphone-app/assets/images/panel_arrow_custom.svg similarity index 75% rename from linphone-app/assets/images/panel_arrow.svg rename to linphone-app/assets/images/panel_arrow_custom.svg index 9c3c6d21e..bc03a7595 100644 --- a/linphone-app/assets/images/panel_arrow.svg +++ b/linphone-app/assets/images/panel_arrow_custom.svg @@ -1,11 +1,11 @@ + transform="matrix(2.8571282,0,0,3.3333144,30.000468,20)"> + + + + + diff --git a/linphone-app/assets/images/pause_off_hovered.svg b/linphone-app/assets/images/pause_off_hovered.svg deleted file mode 100644 index d6aed7eab..000000000 --- a/linphone-app/assets/images/pause_off_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - play_over - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_off_normal.svg b/linphone-app/assets/images/pause_off_normal.svg deleted file mode 100644 index e0ca25744..000000000 --- a/linphone-app/assets/images/pause_off_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - play_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_off_pressed.svg b/linphone-app/assets/images/pause_off_pressed.svg deleted file mode 100644 index 28269c664..000000000 --- a/linphone-app/assets/images/pause_off_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - play_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_off_updating.svg b/linphone-app/assets/images/pause_off_updating.svg deleted file mode 100644 index e0ca25744..000000000 --- a/linphone-app/assets/images/pause_off_updating.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - play_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_on_hovered.svg b/linphone-app/assets/images/pause_on_hovered.svg deleted file mode 100644 index bfad261f6..000000000 --- a/linphone-app/assets/images/pause_on_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - pause_over - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_on_normal.svg b/linphone-app/assets/images/pause_on_normal.svg deleted file mode 100644 index a2fde79f5..000000000 --- a/linphone-app/assets/images/pause_on_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - pause_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_on_pressed.svg b/linphone-app/assets/images/pause_on_pressed.svg deleted file mode 100644 index a20e8bcbc..000000000 --- a/linphone-app/assets/images/pause_on_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - pause_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/pause_on_updating.svg b/linphone-app/assets/images/pause_on_updating.svg deleted file mode 100644 index a2fde79f5..000000000 --- a/linphone-app/assets/images/pause_on_updating.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - pause_default - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/play_custom.svg b/linphone-app/assets/images/play_custom.svg new file mode 100644 index 000000000..1e5a53405 --- /dev/null +++ b/linphone-app/assets/images/play_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/plus_disabled.svg b/linphone-app/assets/images/plus_disabled.svg deleted file mode 100644 index e1ac823f8..000000000 --- a/linphone-app/assets/images/plus_disabled.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/plus_hovered.svg b/linphone-app/assets/images/plus_hovered.svg deleted file mode 100644 index 8067cda62..000000000 --- a/linphone-app/assets/images/plus_hovered.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/plus_normal.svg b/linphone-app/assets/images/plus_normal.svg deleted file mode 100644 index 558867507..000000000 --- a/linphone-app/assets/images/plus_normal.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/plus_pressed.svg b/linphone-app/assets/images/plus_pressed.svg deleted file mode 100644 index 84b7f71da..000000000 --- a/linphone-app/assets/images/plus_pressed.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/record_custom.svg b/linphone-app/assets/images/record_custom.svg new file mode 100644 index 000000000..897c28bc9 --- /dev/null +++ b/linphone-app/assets/images/record_custom.svg @@ -0,0 +1,55 @@ + + + + + + + + + + diff --git a/linphone-app/assets/images/record_off.svg b/linphone-app/assets/images/record_off.svg deleted file mode 100644 index a83adf1f9..000000000 --- a/linphone-app/assets/images/record_off.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - record_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/record_on.svg b/linphone-app/assets/images/record_on.svg deleted file mode 100644 index 75b039a69..000000000 --- a/linphone-app/assets/images/record_on.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - record_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/remove_participant_custom.svg b/linphone-app/assets/images/remove_participant_custom.svg new file mode 100644 index 000000000..2024d69e9 --- /dev/null +++ b/linphone-app/assets/images/remove_participant_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/remove_participant_hovered.svg b/linphone-app/assets/images/remove_participant_hovered.svg deleted file mode 100644 index c0c2126c7..000000000 --- a/linphone-app/assets/images/remove_participant_hovered.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/remove_participant_normal.svg b/linphone-app/assets/images/remove_participant_normal.svg deleted file mode 100644 index f53108df9..000000000 --- a/linphone-app/assets/images/remove_participant_normal.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/remove_participant_pressed.svg b/linphone-app/assets/images/remove_participant_pressed.svg deleted file mode 100644 index f8ba7a4bb..000000000 --- a/linphone-app/assets/images/remove_participant_pressed.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/add_participant_pressed.svg b/linphone-app/assets/images/screenshot_custom.svg similarity index 51% rename from linphone-app/assets/images/add_participant_pressed.svg rename to linphone-app/assets/images/screenshot_custom.svg index 01e569aee..1228d536c 100644 --- a/linphone-app/assets/images/add_participant_pressed.svg +++ b/linphone-app/assets/images/screenshot_custom.svg @@ -1,11 +1,10 @@ - - - - - - - + + + + diff --git a/linphone-app/assets/images/screenshot_hovered.svg b/linphone-app/assets/images/screenshot_hovered.svg deleted file mode 100644 index 0924abdd4..000000000 --- a/linphone-app/assets/images/screenshot_hovered.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - screenshot_over - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/screenshot_normal.svg b/linphone-app/assets/images/screenshot_normal.svg deleted file mode 100644 index 1d65b1e35..000000000 --- a/linphone-app/assets/images/screenshot_normal.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - screenshot_default - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/screenshot_pressed.svg b/linphone-app/assets/images/screenshot_pressed.svg deleted file mode 100644 index 0924abdd4..000000000 --- a/linphone-app/assets/images/screenshot_pressed.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - screenshot_over - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/search.svg b/linphone-app/assets/images/search.svg deleted file mode 100644 index d72633397..000000000 --- a/linphone-app/assets/images/search.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - search - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/search_custom.svg b/linphone-app/assets/images/search_custom.svg new file mode 100644 index 000000000..64e569a46 --- /dev/null +++ b/linphone-app/assets/images/search_custom.svg @@ -0,0 +1,66 @@ + + + + + search + Created with Sketch. + + + + + + + + + + search + + + + diff --git a/linphone-app/assets/images/send.svg b/linphone-app/assets/images/send.svg deleted file mode 100644 index 64e4bef27..000000000 --- a/linphone-app/assets/images/send.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/send_custom.svg b/linphone-app/assets/images/send_custom.svg new file mode 100644 index 000000000..79c8416cd --- /dev/null +++ b/linphone-app/assets/images/send_custom.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/settings_advanced_selected.svg b/linphone-app/assets/images/settings_advanced_custom.svg similarity index 98% rename from linphone-app/assets/images/settings_advanced_selected.svg rename to linphone-app/assets/images/settings_advanced_custom.svg index 06f34e7af..4056e3ac2 100644 --- a/linphone-app/assets/images/settings_advanced_selected.svg +++ b/linphone-app/assets/images/settings_advanced_custom.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/linphone-app/assets/images/settings_advanced_normal.svg b/linphone-app/assets/images/settings_advanced_normal.svg deleted file mode 100644 index a9a16694f..000000000 --- a/linphone-app/assets/images/settings_advanced_normal.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - settings_advanced_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/settings_audio_selected.svg b/linphone-app/assets/images/settings_audio_custom.svg similarity index 97% rename from linphone-app/assets/images/settings_audio_selected.svg rename to linphone-app/assets/images/settings_audio_custom.svg index 92f1f9eaa..ff79f0a76 100644 --- a/linphone-app/assets/images/settings_audio_selected.svg +++ b/linphone-app/assets/images/settings_audio_custom.svg @@ -61,7 +61,7 @@ + style="stroke:#000000;stroke-width:1.5"> - - - - - image/svg+xml - - settings_audio_default - - - - - - settings_audio_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/settings_call_selected.svg b/linphone-app/assets/images/settings_call_custom.svg similarity index 96% rename from linphone-app/assets/images/settings_call_selected.svg rename to linphone-app/assets/images/settings_call_custom.svg index 5fbdda3ce..b6dc51e01 100644 --- a/linphone-app/assets/images/settings_call_selected.svg +++ b/linphone-app/assets/images/settings_call_custom.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/linphone-app/assets/images/settings_call_normal.svg b/linphone-app/assets/images/settings_call_normal.svg deleted file mode 100644 index 34bd78429..000000000 --- a/linphone-app/assets/images/settings_call_normal.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - settings_call_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/settings_network_selected.svg b/linphone-app/assets/images/settings_network_custom.svg similarity index 99% rename from linphone-app/assets/images/settings_network_selected.svg rename to linphone-app/assets/images/settings_network_custom.svg index a5fa1f159..20d132704 100644 --- a/linphone-app/assets/images/settings_network_selected.svg +++ b/linphone-app/assets/images/settings_network_custom.svg @@ -60,7 +60,7 @@ + style="fill:#000000"> - - - - - image/svg+xml - - settings_network_default - - - - - - settings_network_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/settings_sip_accounts_selected.svg b/linphone-app/assets/images/settings_sip_accounts_custom.svg similarity index 98% rename from linphone-app/assets/images/settings_sip_accounts_selected.svg rename to linphone-app/assets/images/settings_sip_accounts_custom.svg index 5e8e91dc5..426f8ee7e 100644 --- a/linphone-app/assets/images/settings_sip_accounts_selected.svg +++ b/linphone-app/assets/images/settings_sip_accounts_custom.svg @@ -60,7 +60,7 @@ + style="stroke:#000000;stroke-width:1.5"> - - - - - image/svg+xml - - settings_account_default - - - - - - settings_account_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/settings_video_selected.svg b/linphone-app/assets/images/settings_video_custom.svg similarity index 97% rename from linphone-app/assets/images/settings_video_selected.svg rename to linphone-app/assets/images/settings_video_custom.svg index 119d272f5..33b3aacf8 100644 --- a/linphone-app/assets/images/settings_video_selected.svg +++ b/linphone-app/assets/images/settings_video_custom.svg @@ -60,7 +60,7 @@ + style="stroke:#000000;stroke-width:1.5"> diff --git a/linphone-app/assets/images/settings_video_normal.svg b/linphone-app/assets/images/settings_video_normal.svg deleted file mode 100644 index 2d6401f26..000000000 --- a/linphone-app/assets/images/settings_video_normal.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - image/svg+xml - - settings_video_default - - - - - - settings_video_default - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/speaker.svg b/linphone-app/assets/images/speaker.svg deleted file mode 100644 index 498ccdf76..000000000 --- a/linphone-app/assets/images/speaker.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/linphone-app/assets/images/speaker_off_custom.svg b/linphone-app/assets/images/speaker_off_custom.svg new file mode 100644 index 000000000..c79aece46 --- /dev/null +++ b/linphone-app/assets/images/speaker_off_custom.svg @@ -0,0 +1,46 @@ + + + + + + + + diff --git a/linphone-app/assets/images/speaker_off_hovered.svg b/linphone-app/assets/images/speaker_off_hovered.svg deleted file mode 100644 index b8546381b..000000000 --- a/linphone-app/assets/images/speaker_off_hovered.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - speaker_off - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/speaker_off_normal.svg b/linphone-app/assets/images/speaker_off_normal.svg deleted file mode 100644 index b6f06a66d..000000000 --- a/linphone-app/assets/images/speaker_off_normal.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - speaker_off - Created with Sketch. - - - - - - - - - diff --git a/linphone-app/assets/images/speaker_off_pressed.svg b/linphone-app/assets/images/speaker_off_pressed.svg deleted file mode 100644 index ba78ea53f..000000000 --- a/linphone-app/assets/images/speaker_off_pressed.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - speaker_off_clic - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/speaker_on_custom.svg b/linphone-app/assets/images/speaker_on_custom.svg new file mode 100644 index 000000000..816f333cd --- /dev/null +++ b/linphone-app/assets/images/speaker_on_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/speaker_on_hovered.svg b/linphone-app/assets/images/speaker_on_hovered.svg deleted file mode 100644 index 5bee6cbda..000000000 --- a/linphone-app/assets/images/speaker_on_hovered.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - speaker_on - Created with Sketch. - - - - - - - - diff --git a/linphone-app/assets/images/speaker_on_normal.svg b/linphone-app/assets/images/speaker_on_normal.svg deleted file mode 100644 index 0256a84ba..000000000 --- a/linphone-app/assets/images/speaker_on_normal.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - speaker_on - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/speaker_on_pressed.svg b/linphone-app/assets/images/speaker_on_pressed.svg deleted file mode 100644 index 2866a71ef..000000000 --- a/linphone-app/assets/images/speaker_on_pressed.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - speaker_on_clic - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/stop_fullscreen_custom.svg b/linphone-app/assets/images/stop_fullscreen_custom.svg new file mode 100644 index 000000000..922d65be2 --- /dev/null +++ b/linphone-app/assets/images/stop_fullscreen_custom.svg @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/linphone-app/assets/images/tel_keypad_hovered.svg b/linphone-app/assets/images/tel_keypad_custom.svg similarity index 85% rename from linphone-app/assets/images/tel_keypad_hovered.svg rename to linphone-app/assets/images/tel_keypad_custom.svg index 73a952141..ad948b56a 100644 --- a/linphone-app/assets/images/tel_keypad_hovered.svg +++ b/linphone-app/assets/images/tel_keypad_custom.svg @@ -1,19 +1,19 @@ + sodipodi:docname="tel_keypad_custom.svg" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -35,8 +35,8 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1268" - inkscape:window-height="847" + inkscape:window-width="1920" + inkscape:window-height="1131" id="namedview29" showgrid="false" fit-margin-top="0" @@ -44,13 +44,14 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:zoom="36.307692" - inkscape:cx="6.4161971" - inkscape:cy="5.4258991" + inkscape:zoom="4.5384615" + inkscape:cx="84.059323" + inkscape:cy="4.1864407" inkscape:window-x="0" - inkscape:window-y="35" - inkscape:window-maximized="0" - inkscape:current-layer="svg27" /> + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg27" + inkscape:pagecheckerboard="0" /> dialer_dtmf @@ -61,11 +62,11 @@ + transform="matrix(5.8333331,0,0,5.6538462,5,3.3295455)"> + style="fill:#000000"> diff --git a/linphone-app/assets/images/tel_keypad_normal.svg b/linphone-app/assets/images/tel_keypad_normal.svg deleted file mode 100644 index aac9b4a1e..000000000 --- a/linphone-app/assets/images/tel_keypad_normal.svg +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - image/svg+xml - - dialer_dtmf - - - - - - dialer_dtmf - Created with Sketch. - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/tel_keypad_pressed.svg b/linphone-app/assets/images/tel_keypad_pressed.svg deleted file mode 100644 index 8a9c4fb8e..000000000 --- a/linphone-app/assets/images/tel_keypad_pressed.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - image/svg+xml - - dialer_dtmf - - - - - - dialer_dtmf - Created with Sketch. - - - - - - - - - - - - - - - - - - - diff --git a/linphone-app/assets/images/textfield_close.svg b/linphone-app/assets/images/textfield_close.svg deleted file mode 100644 index c2366eeb3..000000000 --- a/linphone-app/assets/images/textfield_close.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/timeline_close.svg b/linphone-app/assets/images/timeline_close.svg deleted file mode 100644 index 97cc19996..000000000 --- a/linphone-app/assets/images/timeline_close.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/timeline_filter.svg b/linphone-app/assets/images/timeline_filter.svg deleted file mode 100644 index d2cd7a860..000000000 --- a/linphone-app/assets/images/timeline_filter.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/timeline_history.svg b/linphone-app/assets/images/timeline_history.svg deleted file mode 100644 index def6ac17b..000000000 --- a/linphone-app/assets/images/timeline_history.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - history - Created with Sketch. - - - - - - - diff --git a/linphone-app/assets/images/timeline_search.svg b/linphone-app/assets/images/timeline_search.svg deleted file mode 100644 index 32e842dc7..000000000 --- a/linphone-app/assets/images/timeline_search.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/timer.svg b/linphone-app/assets/images/timer.svg deleted file mode 100644 index 5d55601c2..000000000 --- a/linphone-app/assets/images/timer.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - diff --git a/linphone-app/assets/images/timer_custom.svg b/linphone-app/assets/images/timer_custom.svg new file mode 100644 index 000000000..ef9a0b159 --- /dev/null +++ b/linphone-app/assets/images/timer_custom.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + diff --git a/linphone-app/assets/images/timer_light.svg b/linphone-app/assets/images/timer_light.svg deleted file mode 100644 index 2b92e2f77..000000000 --- a/linphone-app/assets/images/timer_light.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - diff --git a/linphone-app/assets/images/tooltip_arrow_bottom.svg b/linphone-app/assets/images/tooltip_arrow_bottom_custom.svg similarity index 98% rename from linphone-app/assets/images/tooltip_arrow_bottom.svg rename to linphone-app/assets/images/tooltip_arrow_bottom_custom.svg index b68fc3045..586cf60e7 100644 --- a/linphone-app/assets/images/tooltip_arrow_bottom.svg +++ b/linphone-app/assets/images/tooltip_arrow_bottom_custom.svg @@ -59,7 +59,7 @@ transform="translate(0,2)"> + style="fill:#000000"> diff --git a/linphone-app/assets/images/tooltip_arrow_left.svg b/linphone-app/assets/images/tooltip_arrow_left_custom.svg similarity index 98% rename from linphone-app/assets/images/tooltip_arrow_left.svg rename to linphone-app/assets/images/tooltip_arrow_left_custom.svg index 2f48a2651..df28f699b 100644 --- a/linphone-app/assets/images/tooltip_arrow_left.svg +++ b/linphone-app/assets/images/tooltip_arrow_left_custom.svg @@ -58,7 +58,7 @@ style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"> + style="fill:#000000"> diff --git a/linphone-app/assets/images/tooltip_arrow_right.svg b/linphone-app/assets/images/tooltip_arrow_right_custom.svg similarity index 98% rename from linphone-app/assets/images/tooltip_arrow_right.svg rename to linphone-app/assets/images/tooltip_arrow_right_custom.svg index 07ffa2b08..2e56db246 100644 --- a/linphone-app/assets/images/tooltip_arrow_right.svg +++ b/linphone-app/assets/images/tooltip_arrow_right_custom.svg @@ -59,7 +59,7 @@ transform="translate(2)"> + style="fill:#000000"> diff --git a/linphone-app/assets/images/tooltip_arrow_top.svg b/linphone-app/assets/images/tooltip_arrow_top_custom.svg similarity index 98% rename from linphone-app/assets/images/tooltip_arrow_top.svg rename to linphone-app/assets/images/tooltip_arrow_top_custom.svg index 31f693237..a07c1acad 100644 --- a/linphone-app/assets/images/tooltip_arrow_top.svg +++ b/linphone-app/assets/images/tooltip_arrow_top_custom.svg @@ -58,7 +58,7 @@ style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"> + style="fill:#000000"> diff --git a/linphone-app/assets/images/transfer_custom.svg b/linphone-app/assets/images/transfer_custom.svg new file mode 100644 index 000000000..1c518bbbc --- /dev/null +++ b/linphone-app/assets/images/transfer_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/transfer_hovered.svg b/linphone-app/assets/images/transfer_hovered.svg deleted file mode 100644 index f330b0239..000000000 --- a/linphone-app/assets/images/transfer_hovered.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - transfer_over - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/transfer_normal.svg b/linphone-app/assets/images/transfer_normal.svg deleted file mode 100644 index 1b597189b..000000000 --- a/linphone-app/assets/images/transfer_normal.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - transfer_default - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/transfer_pressed.svg b/linphone-app/assets/images/transfer_pressed.svg deleted file mode 100644 index b4de5de6c..000000000 --- a/linphone-app/assets/images/transfer_pressed.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - transfer_clic - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_accept_custom.svg b/linphone-app/assets/images/video_call_accept_custom.svg new file mode 100644 index 000000000..409fc950e --- /dev/null +++ b/linphone-app/assets/images/video_call_accept_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/video_call_accept_hovered.svg b/linphone-app/assets/images/video_call_accept_hovered.svg deleted file mode 100644 index dbff9f81d..000000000 --- a/linphone-app/assets/images/video_call_accept_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_accept_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_accept_normal.svg b/linphone-app/assets/images/video_call_accept_normal.svg deleted file mode 100644 index 7e55595ee..000000000 --- a/linphone-app/assets/images/video_call_accept_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_accept_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_accept_pressed.svg b/linphone-app/assets/images/video_call_accept_pressed.svg deleted file mode 100644 index 8277f2345..000000000 --- a/linphone-app/assets/images/video_call_accept_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_accept_clic - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_custom.svg b/linphone-app/assets/images/video_call_custom.svg new file mode 100644 index 000000000..409fc950e --- /dev/null +++ b/linphone-app/assets/images/video_call_custom.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/linphone-app/assets/images/video_call_hovered.svg b/linphone-app/assets/images/video_call_hovered.svg deleted file mode 100644 index 81b4c9ad1..000000000 --- a/linphone-app/assets/images/video_call_hovered.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_over - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_normal.svg b/linphone-app/assets/images/video_call_normal.svg deleted file mode 100644 index b6d8b5ed6..000000000 --- a/linphone-app/assets/images/video_call_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_default - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/linphone-app/assets/images/video_call_pressed.svg b/linphone-app/assets/images/video_call_pressed.svg deleted file mode 100644 index 98f100e8e..000000000 --- a/linphone-app/assets/images/video_call_pressed.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - video_call_clic - Created with Sketch. - - - - - - - - - - diff --git a/linphone-app/resources.qrc b/linphone-app/resources.qrc index 73f6be649..55fd5035e 100644 --- a/linphone-app/resources.qrc +++ b/linphone-app/resources.qrc @@ -8,267 +8,134 @@ assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf - assets/images/add_disabled.svg - assets/images/add_hovered.svg - assets/images/add_normal.svg - assets/images/add_pressed.svg - assets/images/add_participant_hovered.svg - assets/images/add_participant_normal.svg - assets/images/add_participant_pressed.svg - assets/images/admin_selected.svg - assets/images/attachment_disabled.svg - assets/images/attachment_hovered.svg - assets/images/attachment_normal.svg - assets/images/attachment_pressed.svg - assets/images/auto_answer.svg - assets/images/burger_menu_hovered.svg - assets/images/burger_menu_light_hovered.svg - assets/images/burger_menu_light_normal.svg - assets/images/burger_menu_light_pressed.svg - assets/images/burger_menu_normal.svg - assets/images/burger_menu_pressed.svg - assets/images/call_accept_hovered.svg - assets/images/call_accept_normal.svg - assets/images/call_accept_pressed.svg - assets/images/call_chat_secure_hovered.svg - assets/images/call_chat_secure_normal.svg - assets/images/call_chat_secure_pressed.svg - assets/images/call_chat_unsecure_hovered.svg - assets/images/call_chat_unsecure_normal.svg - assets/images/call_chat_unsecure_pressed.svg - assets/images/call_hovered.svg - assets/images/call_normal.svg - assets/images/call_pressed.svg - assets/images/call_quality_0.svg - assets/images/call_quality_1.svg - assets/images/call_quality_2.svg - assets/images/call_quality_3.svg + assets/images/add_custom.svg + assets/images/add_participant_custom.svg + assets/images/admin_selected_custom.svg + assets/images/attachment_custom.svg + assets/images/auto_answer_custom.svg + assets/images/burger_menu_custom.svg + assets/images/call_accept_custom.svg + assets/images/call_chat_secure_custom.svg + assets/images/call_chat_unsecure_custom.svg + assets/images/call_custom.svg + assets/images/call_quality_custom.svg assets/images/call_sign_connected.svg assets/images/call_sign_ended.svg assets/images/call_sign_incoming.svg assets/images/call_sign_outgoing.svg assets/images/call_sign_paused.svg - assets/images/camera_off_hovered.svg - assets/images/camera_off_normal.svg - assets/images/camera_off_pressed.svg - assets/images/camera_off_updating.svg - assets/images/camera_on_hovered.svg - assets/images/camera_on_normal.svg - assets/images/camera_on_pressed.svg - assets/images/camera_on_updating.svg - assets/images/camera.svg - assets/images/cancel_hovered.svg - assets/images/cancel_normal.svg - assets/images/cancel_pressed.svg + assets/images/camera_off_custom.svg + assets/images/camera_on_custom.svg + assets/images/cancel_custom.svg + assets/images/chat_custom.svg assets/images/chat_amount.svg assets/images/chat_count.svg - assets/images/chat_disabled.svg - assets/images/chat_delivered.svg + assets/images/chat_delivered.svg assets/images/chat_error.svg - assets/images/chat_hovered.svg - assets/images/chat_menu_hovered.svg - assets/images/chat_menu_normal.svg - assets/images/chat_menu_pressed.svg + assets/images/chat_menu_custom.svg assets/images/chat_is_composing_0.svg assets/images/chat_is_composing_1.svg assets/images/chat_is_composing_2.svg assets/images/chat_is_composing_3.svg - assets/images/chat_micro.svg - assets/images/chat_normal.svg - assets/images/chat_pressed.svg + assets/images/chat_micro_custom.svg assets/images/chat_read.svg - assets/images/chat_room.svg - assets/images/chat_room_light.svg - assets/images/close.svg - assets/images/collapse.svg - assets/images/collapsed.svg - assets/images/conferences_normal.svg - assets/images/conferences_selected.svg - assets/images/contact_add_hovered.svg - assets/images/contact_add_normal.svg - assets/images/contact_add_pressed.svg - assets/images/contact_add.svg - assets/images/contact_card_photo_disabled.svg - assets/images/contact_card_photo_hovered.svg - assets/images/contact_card_photo_normal.svg - assets/images/contact_card_photo_pressed.svg - assets/images/contact_edit_hovered.svg - assets/images/contact_edit_normal.svg - assets/images/contact_edit_pressed.svg - assets/images/contact_disabled.svg - assets/images/contact_normal.svg - assets/images/contact_selected.svg - assets/images/copy_light.svg + assets/images/chat_room_custom.svg + assets/images/close_custom.svg + assets/images/collapsed_custom.svg + assets/images/contact_add_custom.svg + assets/images/contact_card_photo_custom.svg + assets/images/contact_custom.svg + assets/images/contact_delete_custom.svg + assets/images/contact_edit_custom.svg + assets/images/contact_view_custom.svg + assets/images/copy_custom.svg assets/images/current_account_status_online.svg assets/images/current_account_status_offline.svg assets/images/current_account_status_dnd.svg assets/images/current_account_status_busy.svg - assets/images/declined_incoming_call.svg - assets/images/declined_outgoing_call.svg - assets/images/delete_hovered.svg - assets/images/delete_normal.svg - assets/images/delete_pressed.svg - assets/images/download.svg - assets/images/drop_down.svg - assets/images/edit_hovered.svg - assets/images/edit_normal.svg - assets/images/edit_pressed.svg - assets/images/ended_call.svg - assets/images/expanded.svg - assets/images/file_hovered.svg - assets/images/file_normal.svg - assets/images/file_pressed.svg + assets/images/declined_incoming_call_custom.svg + assets/images/declined_outgoing_call_custom.svg + assets/images/delete_custom.svg + assets/images/download_custom.svg + assets/images/drop_down_custom.svg + assets/images/edit_custom.svg + assets/images/ended_call_custom.svg + assets/images/expanded_custom.svg + assets/images/file_custom.svg assets/images/file_sign.svg - assets/images/filter.svg - assets/images/folder_hovered.svg - assets/images/folder_normal.svg - assets/images/folder_pressed.svg - assets/images/fullscreen_hovered.svg - assets/images/fullscreen_normal.svg - assets/images/fullscreen_pressed.svg - assets/images/generic_error_hovered.svg - assets/images/generic_error_normal.svg - assets/images/generic_error_pressed.svg + assets/images/filter_custom.svg + assets/images/filter_params_custom.svg + assets/images/folder_custom.svg + assets/images/fullscreen_custom.svg assets/images/generic_error.svg - assets/images/group_chat_hovered.svg - assets/images/group_chat_normal.svg - assets/images/group_chat_pressed.svg - assets/images/hangup_hovered.svg - assets/images/hangup_normal.svg - assets/images/hangup_pressed.svg - assets/images/history_hovered.svg - assets/images/history_normal.svg - assets/images/history_pressed.svg - assets/images/history.svg + assets/images/group_chat_custom.svg + assets/images/hangup_custom.svg + assets/images/history_custom.svg assets/images/home_account_assistant.svg + assets/images/home_custom.svg assets/images/home_invite_friends.svg - assets/images/home_normal.svg - assets/images/home_pressed.svg - assets/images/home_hovered.svg - assets/images/home_disabled.svg assets/images/home_use_linphone.svg - assets/images/incoming_call.svg + assets/images/incoming_call_custom.svg assets/images/led_green.svg assets/images/led_orange.svg assets/images/led_red.svg assets/images/led_white.svg - assets/images/menu_copy_text.svg - assets/images/menu_delete.svg - assets/images/menu_imdn_info.svg - assets/images/menu_vdots_normal.svg - assets/images/menu_vdots_hovered.svg - assets/images/menu_vdots_pressed.svg - assets/images/menu_infos.svg - assets/images/menu_infos_selected.svg - assets/images/menu_devices.svg - assets/images/menu_devices_selected.svg - assets/images/menu_ephemeral.svg - assets/images/menu_ephemeral_selected.svg + assets/images/menu_copy_text_custom.svg + assets/images/menu_imdn_info_custom.svg + assets/images/menu_vdots_custom.svg + assets/images/menu_info_custom.svg + assets/images/menu_devices_custom.svg + assets/images/menu_ephemeral_custom.svg assets/images/message_sign.svg - assets/images/micro_off_hovered.svg - assets/images/micro_off_normal.svg - assets/images/micro_off_pressed.svg - assets/images/micro_on_hovered.svg - assets/images/micro_on_normal.svg - assets/images/micro_on_pressed.svg - assets/images/micro.svg - assets/images/missed_incoming_call.svg - assets/images/missed_outgoing_call.svg - assets/images/new_call_hovered.svg - assets/images/new_call_normal.svg - assets/images/new_call_pressed.svg - assets/images/new_chat_hovered.svg - assets/images/new_chat_normal.svg - assets/images/new_chat_pressed.svg - assets/images/new_chat_group_hovered.svg - assets/images/new_chat_group_normal.svg - assets/images/new_chat_group_pressed.svg - assets/images/new_conference_hovered.svg - assets/images/new_conference_normal.svg - assets/images/new_conference_pressed.svg - assets/images/options_hovered.svg - assets/images/options_normal.svg - assets/images/options_pressed.svg - assets/images/outgoing_call.svg - assets/images/panel_arrow.svg + assets/images/micro_off_custom.svg + assets/images/micro_on_custom.svg + assets/images/missed_incoming_call_custom.svg + assets/images/missed_outgoing_call_custom.svg + assets/images/new_call_custom.svg + assets/images/new_chat_group_custom.svg + assets/images/new_conference_custom.svg + assets/images/options_custom.svg + assets/images/outgoing_call_custom.svg + assets/images/panel_arrow_custom.svg assets/images/panel_hidden_normal.svg assets/images/panel_hidden_hovered.svg assets/images/panel_hidden_pressed.svg assets/images/panel_shown_normal.svg assets/images/panel_shown_hovered.svg assets/images/panel_shown_pressed.svg - assets/images/pause_off_hovered.svg - assets/images/pause_off_normal.svg - assets/images/pause_off_pressed.svg - assets/images/pause_off_updating.svg - assets/images/pause_on_hovered.svg - assets/images/pause_on_normal.svg - assets/images/pause_on_pressed.svg - assets/images/pause_on_updating.svg - assets/images/plus_disabled.svg - assets/images/plus_hovered.svg - assets/images/plus_normal.svg - assets/images/plus_pressed.svg + assets/images/pause_custom.svg + assets/images/play_custom.svg assets/images/recording_sign.svg - assets/images/record_off.svg - assets/images/record_on.svg - assets/images/remove_participant_hovered.svg - assets/images/remove_participant_normal.svg - assets/images/remove_participant_pressed.svg - assets/images/screenshot_hovered.svg - assets/images/screenshot_normal.svg - assets/images/screenshot_pressed.svg - assets/images/search.svg + assets/images/record_custom.svg + assets/images/remove_participant_custom.svg + assets/images/screenshot_custom.svg + assets/images/search_custom.svg assets/images/secure_level_unsafe.svg assets/images/secure_level_1.svg assets/images/secure_level_2.svg assets/images/secure_off.svg assets/images/secure_on.svg - assets/images/send.svg - assets/images/settings_advanced_normal.svg - assets/images/settings_advanced_selected.svg - assets/images/settings_audio_normal.svg - assets/images/settings_audio_selected.svg - assets/images/settings_call_normal.svg - assets/images/settings_call_selected.svg - assets/images/settings_network_normal.svg - assets/images/settings_network_selected.svg - assets/images/settings_sip_accounts_normal.svg - assets/images/settings_sip_accounts_selected.svg - assets/images/settings_video_normal.svg - assets/images/settings_video_selected.svg + assets/images/send_custom.svg + assets/images/settings_advanced_custom.svg + assets/images/settings_audio_custom.svg + assets/images/settings_call_custom.svg + assets/images/settings_network_custom.svg + assets/images/settings_sip_accounts_custom.svg + assets/images/settings_video_custom.svg assets/images/snapshot_sign.svg - assets/images/speaker_off_hovered.svg - assets/images/speaker_off_normal.svg - assets/images/speaker_off_pressed.svg - assets/images/speaker_on_hovered.svg - assets/images/speaker_on_normal.svg - assets/images/speaker_on_pressed.svg - assets/images/speaker.svg - assets/images/timer.svg - assets/images/timer_light.svg - assets/images/tel_keypad_hovered.svg - assets/images/tel_keypad_normal.svg - assets/images/tel_keypad_pressed.svg - assets/images/textfield_close.svg - assets/images/timeline_history.svg - assets/images/timeline_filter.svg - assets/images/timeline_search.svg - assets/images/timeline_close.svg - assets/images/tooltip_arrow_bottom.svg - assets/images/tooltip_arrow_left.svg - assets/images/tooltip_arrow_right.svg - assets/images/tooltip_arrow_top.svg - assets/images/transfer_hovered.svg - assets/images/transfer_normal.svg - assets/images/transfer_pressed.svg - assets/images/update_sign.svg - assets/images/video_call_accept_hovered.svg - assets/images/video_call_accept_normal.svg - assets/images/video_call_accept_pressed.svg - assets/images/video_call_hovered.svg - assets/images/video_call_normal.svg - assets/images/video_call_pressed.svg + assets/images/speaker_off_custom.svg + assets/images/speaker_on_custom.svg + assets/images/stop_fullscreen_custom.svg + assets/images/timer_custom.svg + assets/images/tel_keypad_custom.svg + assets/images/tooltip_arrow_bottom_custom.svg + assets/images/tooltip_arrow_left_custom.svg + assets/images/tooltip_arrow_right_custom.svg + assets/images/tooltip_arrow_top_custom.svg + assets/images/transfer_custom.svg + assets/images/update_sign.svg + assets/images/video_call_accept_custom.svg + assets/images/video_call_custom.svg assets/images/warning.svg ui/modules/Common/Animations/BusyIndicator.qml ui/modules/Common/Constants/Constants.qml @@ -341,6 +208,7 @@ ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml ui/modules/Common/Styles/Dialog/DialogStyle.qml ui/modules/Common/Styles/Form/ActionBarStyle.qml + ui/modules/Common/Styles/Form/ActionSwitchStyle.qml ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml @@ -541,6 +409,7 @@ ui/views/App/Settings/SettingsVideo.qml ui/views/App/Settings/SettingsWindow.qml ui/views/App/Styles/Calls/CallStyle.qml + ui/views/App/Styles/Calls/CallFullscreenStyle.qml ui/views/App/Styles/Calls/CallsWindowStyle.qml ui/views/App/Styles/Calls/ConferenceStyle.qml ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml @@ -562,7 +431,9 @@ ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml + ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml + ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml ui/views/App/Styles/Main/HomeStyle.qml ui/views/App/Styles/Main/InviteFriendsStyle.qml ui/views/App/Styles/Main/HistoryViewStyle.qml @@ -572,6 +443,7 @@ ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml ui/views/App/Styles/Settings/SettingsAudioStyle.qml + ui/views/App/Styles/Settings/SettingsUiStyle.qml ui/views/App/Styles/Settings/SettingsWindowStyle.qml assets/images/linphone_logo.svg ui/dev-modules/Units/Units.qml diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 0bfbb0a8f..1fcd660e6 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -157,13 +157,6 @@ static inline string getConfigPathIfExists (const QCommandLineParser &parser) { return configPath; } -static inline shared_ptr getConfigIfExists (const string &configPath) { - string factoryPath(Paths::getFactoryConfigFilePath()); - if (!Paths::filePathExists(factoryPath)) - factoryPath.clear(); - - return linphone::Config::newWithFactory(configPath, factoryPath); -} bool App::setFetchConfig (QCommandLineParser *parser) { bool fetched = false; QString filePath = parser->value("fetch-config"); @@ -208,7 +201,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U mParser->process(*this); // Initialize logger. - shared_ptr config = getConfigIfExists(getConfigPathIfExists(*mParser)); + shared_ptr config = Utils::getConfigIfExists (QString::fromStdString(getConfigPathIfExists(*mParser))); Logger::init(config); if (mParser->isSet("verbose")) Logger::getInstance()->setVerbose(true); @@ -321,11 +314,11 @@ void App::initContentApp () { mTranslator = new DefaultTranslator(this); mDefaultTranslator = new DefaultTranslator(this); configPath = getConfigPathIfExists(*mParser); - config = getConfigIfExists(configPath); + config = Utils::getConfigIfExists (QString::fromStdString(configPath)); initLocale(config); } else { configPath = getConfigPathIfExists(*mParser); - config = getConfigIfExists(configPath); + config = Utils::getConfigIfExists(QString::fromStdString(configPath)); // Update and download codecs. VideoCodecsModel::updateCodecs(); VideoCodecsModel::downloadUpdatableCodecs(this); @@ -608,6 +601,7 @@ void App::registerTypes () { registerType("ColorProxyModel"); + registerType("ImageColorsProxyModel"); registerType("ImageProxyModel"); registerType("TimelineProxyModel"); registerType("ParticipantProxyModel"); diff --git a/linphone-app/src/components/Components.hpp b/linphone-app/src/components/Components.hpp index 37688b1e8..617412500 100644 --- a/linphone-app/src/components/Components.hpp +++ b/linphone-app/src/components/Components.hpp @@ -84,6 +84,7 @@ #include "other/colors/ColorModel.hpp" #include "other/colors/ColorListModel.hpp" #include "other/colors/ColorProxyModel.hpp" +#include "other/colors/ImageColorsProxyModel.hpp" #include "other/clipboard/Clipboard.hpp" #include "other/desktop-tools/DesktopTools.hpp" #include "other/images/ImageModel.hpp" diff --git a/linphone-app/src/components/other/colors/ColorListModel.cpp b/linphone-app/src/components/other/colors/ColorListModel.cpp index 55af6e1ea..d3aa928e2 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.cpp +++ b/linphone-app/src/components/other/colors/ColorListModel.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2021 Belledonne Communications SARL. * * This file is part of linphone-desktop @@ -24,7 +24,7 @@ #include #include #if LINPHONE_FRIDAY - #include +#include #endif // if LINPHONE_FRIDAY @@ -36,15 +36,38 @@ #include "components/Components.hpp" namespace { - constexpr char ColorsSection[] = "ui_colors"; +constexpr char ColorsSection[] = "ui_colors"; } // ============================================================================= ColorListModel::ColorListModel ( QObject *parent) : QAbstractListModel(parent) { + initKeywords(); init(); } +void ColorListModel::initKeywords(){ + mKeywordsMap["s"] = "standard"; + mKeywordsMap["ma"] = "main"; + mKeywordsMap["l"] = "list"; + mKeywordsMap["sc"] = "screen"; + mKeywordsMap["me"] = "menu"; + + mKeywordsMap["n"] = "normal"; + mKeywordsMap["d"] = "disabled"; + mKeywordsMap["h"] = "hovered"; + mKeywordsMap["p"] = "pressed"; + mKeywordsMap["u"] = "updating"; + mKeywordsMap["c"] = "checked"; + + mKeywordsMap["b"] = "button"; + + mKeywordsMap["inv"] = "inverse"; + + mKeywordsMap["bg"] = "background"; + mKeywordsMap["fg"] = "foreground"; +} + int ColorListModel::rowCount (const QModelIndex &index) const{ return mList.count(); } @@ -52,6 +75,8 @@ int ColorListModel::rowCount (const QModelIndex &index) const{ QHash ColorListModel::roleNames () const { QHash roles; roles[Qt::DisplayRole] = "$color"; + roles[Qt::UserRole] = "id"; + roles[Qt::UserRole+1] = "modelData"; return roles; } @@ -61,12 +86,17 @@ QVariant ColorListModel::data (const QModelIndex &index, int role) const { if (!index.isValid() || row < 0 || row >= mList.count()) return QVariant(); - //if (role == Qt::DisplayRole) - return QVariant::fromValue(mList[row].get()); + if (role >= Qt::UserRole) + return mList[row]->getName(); + return QVariant::fromValue(mList[row].get()); //return QVariant(); } +ColorModel *ColorListModel::getAt(const int& index){ + return mList[index].get(); +} + void ColorListModel::add(std::shared_ptr color){ int row = mList.count(); @@ -98,15 +128,28 @@ ColorModel * ColorListModel::add(const QString& id, const QString& idLink, QStri } if( description == ""){ description = id; - description.replace("_", " "); + QStringList tokens = description.split('_'); + for(int index = 0 ; index < tokens.size() ; ++index) + if(mKeywordsMap.contains(tokens[index])) + tokens[index] = mKeywordsMap[tokens[index]]; + description = tokens.join(' '); + description[0] = description[0].toUpper(); } auto colorShared = std::make_shared(id, colorValue, description); add(colorShared); color = colorShared.get(); + emit colorChanged(); } return color; } +ColorModel * ColorListModel::addImageColor(const QString& id, const QString& imageId, const QString& idLink, QString description, QString color){ + ColorModel * model = add(id, idLink, description, color); + model->setLinkedToImage(imageId); + imageLinks[imageId].push_back(model); + return model; +} + void ColorListModel::addLink(const QString& a, const QString& b){ int index = 0; if( mColorLinkIndexes.contains(b)){ @@ -125,6 +168,16 @@ void ColorListModel::removeLink(const QString& a){ mColorLinkIndexes.remove(a); } +void ColorListModel::updateLink(const QString& id, const QString& newLink){ + removeLink(id); + if( newLink != "" ){ + addLink(id, newLink); + ColorModel * linkModel = getColor(newLink); + ColorModel * idModel = getColor(id); + idModel->setColor(linkModel->getColor()); + } +} + bool ColorListModel::removeRow (int row, const QModelIndex &parent){ return removeRows(row, 1, parent); } @@ -143,24 +196,24 @@ bool ColorListModel::removeRows (int row, int count, const QModelIndex &parent) } void ColorListModel::useConfig (const std::shared_ptr &config) { - #if LINPHONE_FRIDAY - if (!isLinphoneFriday()) - overrideColors(config); - #else - overrideColors(config); - #endif // if LINPHONE_FRIDAY +#if LINPHONE_FRIDAY + if (!isLinphoneFriday()) + overrideColors(config); +#else + overrideColors(config); +#endif // if LINPHONE_FRIDAY } QString ColorListModel::getNames(){ QStringList names; const QMetaObject *info = metaObject(); - - for (int i = info->propertyOffset(); i < info->propertyCount(); ++i) { + + for (int i = info->propertyOffset(); i < info->propertyCount(); ++i) { const QMetaProperty metaProperty = info->property(i); const std::string colorName = metaProperty.name(); names << QString::fromStdString(colorName); - } - return names.join(", "); + } + return names.join(", "); } ColorModel * ColorListModel::getColor(const QString& id){ @@ -170,6 +223,10 @@ ColorModel * ColorListModel::getColor(const QString& id){ return nullptr; } +QVector ColorListModel::getColorIdLinks(){ + return mColorLinks; +} + QQmlPropertyMap * ColorListModel::getQmlData() { return &mData; } @@ -185,24 +242,73 @@ int ColorListModel::getLinkIndex(const QString& id){ return -1; } -void ColorListModel::overrideColors (const std::shared_ptr &config) { - if (!config) - return; +void ColorListModel::overrideColors (const std::shared_ptr &colorsConfig) { + if (!colorsConfig) + return; + std::list colorsIds = colorsConfig->getKeysNamesList(ColorsSection); + for(auto configId : colorsIds){ + if(configId == "ColorLinks"){ + std::list colorString = colorsConfig->getStringList(ColorsSection, configId, std::list()); + QVector colorLinks; + QMap colorLinksIndexes; + for(auto color : colorString){ + QStringList pair = QString::fromStdString(color).split(";"); + if(pair.size() == 2){ + QString id = pair.front(); + int index = pair.back().toInt(); + colorLinksIndexes[id] = index; + colorLinks.resize(index+1); + colorLinks[index].append(id); + } + } + mColorLinks = colorLinks; + mColorLinkIndexes = colorLinksIndexes; + }else{ + bool haveColor = false; + QString qtConfigId = QString::fromStdString(configId); + QString colorName = QString::fromStdString(colorsConfig->getString(ColorsSection, configId, "")); + for(auto color : mList){ + QString name = color->getName(); + if( name == qtConfigId) { + color->setColor(QColor(colorName)); + haveColor = true; + } + } + if(!haveColor){ + add(qtConfigId, "", "Added from Configuration", colorName); + } + } + } + + /* for(auto color : mList){ QString name = color->getName(); const std::string colorValue = config->getString(ColorsSection, name.toStdString(), ""); if(!colorValue.empty()){ color->setColor(QColor(QString::fromStdString(colorValue))); } - } + }*/ } +std::shared_ptr ColorListModel::getConfigColors(const QString filename){ + std::shared_ptr config = linphone::Factory::get()->createConfig(filename.toStdString()); +// Colors links + std::list links; + for(auto link = mColorLinkIndexes.begin() ; link != mColorLinkIndexes.end() ; ++link) { + links.push_back((link.key()+";"+QString::number(link.value())).toStdString()); + } + config->setStringList(ColorsSection, "ColorLinks", links); + for(auto color : mList){ + config->setString(ColorsSection, color->getName().toStdString(), color->getColor().name(QColor::HexArgb).toStdString()); + } + return config; +} void ColorListModel::handleUiColorChanged(const QString& id, const QColor& color){ if( mColorLinkIndexes.contains(id)){ int index = mColorLinkIndexes[id]; for(int i = 0 ; i < mColorLinks[index].size() ; ++i){ - auto colorToUpdate =getColor(mColorLinks[index][i]); + auto colorToUpdate = getColor(mColorLinks[index][i]); if(colorToUpdate) colorToUpdate->setInternalColor(color); } diff --git a/linphone-app/src/components/other/colors/ColorListModel.hpp b/linphone-app/src/components/other/colors/ColorListModel.hpp index 4680603e8..dde23d657 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.hpp +++ b/linphone-app/src/components/other/colors/ColorListModel.hpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2021 Belledonne Communications SARL. * * This file is part of linphone-desktop @@ -34,6 +34,9 @@ #define ADD_COLOR(COLOR, VALUE, DESCRIPTION) \ color = std::make_shared(COLOR, VALUE, DESCRIPTION); \ add(color); + +#define ADD_COLOR_WITH_LINK(COLOR, VALUE, DESCRIPTION, LINK) \ + add(COLOR,LINK,DESCRIPTION,VALUE); // Alpha is in percent. #define ADD_COLOR_WITH_ALPHA(COLOR, ALPHA, DESCRIPTION) \ @@ -57,7 +60,7 @@ class ColorListModel : public QAbstractListModel { ADD_COLOR("e", "#F3F3F3", "Chat text area Background") ADD_COLOR("f", "#E8E8E8", "Border color") ADD_COLOR("g", "#6B7A86", "SIP Address; Text of Contact, question popup; Selected button.") - ADD_COLOR("h", "#687680", "") + ADD_COLOR("h", "#687680", "Others") // Primary color. ADD_COLOR("i", "#FE5E00", "Primary color.") @@ -101,10 +104,171 @@ class ColorListModel : public QAbstractListModel { ADD_COLOR("af", "#9FA6AB", "Admin Status") ADD_COLOR("ag", "#EBEBEB", "Line between items in list") ADD_COLOR("ah", "#F5F5F5", "Main List item background") - ADD_COLOR("slider_background", "#bdbebf", "Slider background") + ADD_COLOR("ai", "#FFFFFF", "Foreground color on buttons") + ADD_COLOR("slider_bg", "#bdbebf", "Slider background") ADD_COLOR("slider_low", "#21be2b", "Slider low value") ADD_COLOR("slider_high", "#ff0000", "Slider high value") + ADD_COLOR("event_neutral", "#424242", "Event colors that are neutral") + ADD_COLOR("event_in", "#96C11F", "Event colors that are incoming") + ADD_COLOR("event_out", "#18A7AF", "Event colors that are outgoing") + +// Standard actions +// +// Keywords: 'mKeywordsMap' +// s=standard, ma=main, l=list, sc=screen, me=menu +// n=normal, d=disabled, h=hovered, p=pressed, u=updating, c=checked +// b=button +// inv=inverse +// bg=background, fg=foreground + ADD_COLOR("s_n_b_bg", "#96A5B1", "[M] Standard normal button : background") + ADD_COLOR("s_d_b_bg", "#D0D8DE", "[M] Standard disabled button : background") + ADD_COLOR("s_h_b_bg", "#4B5964", "[M] Standard hovered button : background") + ADD_COLOR("s_p_b_bg", "#FF5E00", "[M] Standard pressed button : background") + ADD_COLOR("s_n_b_fg", "white", "[M] Standard normal button : foreground") + ADD_COLOR("s_d_b_fg", "white", "[M] Standard disabled button : foreground") + ADD_COLOR("s_h_b_fg", "white", "[M] Standard hovered button : foreground") + ADD_COLOR("s_p_b_fg", "white", "[M] Standard pressed button : foreground") + /* +// Inverse + ADD_COLOR("s_n_b_inv_bg", "transparent", "Standard normal button : inverse background") + ADD_COLOR("s_d_b_inv_bg", "transparent", "Standard disabled button : inverse background") + ADD_COLOR("s_h_b_inv_bg", "transparent", "Standard hovered button : inverse background") + ADD_COLOR("s_p_b_inv_bg", "transparent", "Standard pressed button : inverse background") + + ADD_COLOR("s_n_b_inv_fg", "black", "Standard normal button : inverse foreground") + ADD_COLOR("s_d_b_inv_fg", "black", "Standard disabled button : inverse foreground") + ADD_COLOR("s_h_b_inv_fg", "black", "Standard hovered button : inverse foreground") + ADD_COLOR("s_p_b_inv_fg", "black", "Standard pressed button : inverse foreground") + */ +//---------------------------- +// Main Actions + ADD_COLOR("ma_n_b_bg", "#FF5E00", "[M] Main normal button : background") + ADD_COLOR("ma_d_b_bg", "#FFCEB2", "[M] Main disabled button : background") + ADD_COLOR("ma_h_b_bg", "#4B5964", "[M] Main hovered button : background") + ADD_COLOR("ma_p_b_bg", "#DC4100", "[M] Main pressed button : background") + + ADD_COLOR("ma_n_b_fg", "white", "[M] Main normal button : foreground") + ADD_COLOR("ma_d_b_fg", "white", "[M] Main disabled button : foreground") + ADD_COLOR("ma_h_b_fg", "white", "[M] Main hovered button : foreground") + ADD_COLOR("ma_p_b_fg", "white", "[M] Main pressed button : foreground") +//------------------------------------- +// Accept Actions + ADD_COLOR("a_n_b_bg", "#9ECD1D", "[M] Accept normal button : background") + ADD_COLOR("a_d_b_bg", "#809ECD1D", "[M] Accept disabled button : background") + ADD_COLOR("a_h_b_bg", "#7D9F21", "[M] Accept hovered button : background") + ADD_COLOR("a_p_b_bg", "#9ECD1D", "[M] Accept pressed button : background") + + ADD_COLOR("a_n_b_fg", "white", "[M] Accept normal button : foreground") + ADD_COLOR("a_d_b_fg", "white", "[M] Accept disabled button : foreground") + ADD_COLOR("a_h_b_fg", "white", "[M] Accept hovered button : foreground") + ADD_COLOR("a_p_b_fg", "white", "[M] Accept pressed button : foreground") +//------------------------------------- +// Reject Actions + ADD_COLOR("r_n_b_bg", "#FF5E00", "[M] Reject normal button : background") + ADD_COLOR("r_d_b_bg", "#80FF5E00", "[M] Reject disabled button : background") + ADD_COLOR("r_h_b_bg", "#DC4100", "[M] Reject hovered button : background") + ADD_COLOR("r_p_b_bg", "#FF5E00", "[M] Reject pressed button : background") + + ADD_COLOR("r_n_b_fg", "white", "[M] Reject normal button : foreground") + ADD_COLOR("r_d_b_fg", "white", "[M] Reject disabled button : foreground") + ADD_COLOR("r_h_b_fg", "white", "[M] Reject hovered button : foreground") + ADD_COLOR("r_p_b_fg", "white", "[M] Reject pressed button : foreground") +//------------------------------------- +// List Actions + ADD_COLOR("l_n_b_bg", "transparent", "[M] List normal button : background") + ADD_COLOR("l_d_b_bg", "transparent", "[M] List disabled button : background") + ADD_COLOR("l_h_b_bg", "transparent", "[M] List hovered button : background") + ADD_COLOR("l_p_b_bg", "transparent", "[M] List pressed button : background") + + ADD_COLOR("l_n_b_fg", "#96A5B1", "[M] List normal button : foreground") + ADD_COLOR("l_d_b_fg", "#8096A5B1", "[M] List disabled button : foreground") + ADD_COLOR("l_h_b_fg", "#4B5964", "[M] List hovered button : foreground") + ADD_COLOR("l_p_b_fg", "#FF5E00", "[M] List pressed button : foreground") +//------------------------------------- +// Screen Actions + ADD_COLOR("sc_n_b_bg", "#E8E8E8", "[M] Screen normal button : background") + ADD_COLOR("sc_d_b_bg", "#80E8E8E8", "[M] Screen disabled button : background") + ADD_COLOR("sc_h_b_bg", "#E8E8E8", "[M] Screen hovered button : background") + ADD_COLOR("sc_p_b_bg", "#FF5E00", "[M] Screen pressed button : background") + + ADD_COLOR("sc_n_b_fg", "#6B7A86", "[M] Screen normal button : foreground") + ADD_COLOR("sc_d_b_fg", "#806B7A86", "[M] Screen disabled button : foreground") + ADD_COLOR("sc_h_b_fg", "#FF5E00", "[M] Screen hovered button : foreground") + ADD_COLOR("sc_p_b_fg", "white", "[M] Screen pressed button : foreground") +//------------------------------------- +// Menu Actions + ADD_COLOR("me_n_b_bg", "transparent", "[M] Menu normal button : background") + ADD_COLOR("me_d_b_bg", "transparent", "[M] Menu disabled button : background") + ADD_COLOR("me_h_b_bg", "transparent", "[M] Menu hovered button : background") + ADD_COLOR("me_p_b_bg", "transparent", "[M] Menu pressed button : background") + + ADD_COLOR("me_n_b_fg", "#96A5B1", "[M] Menu normal button : foreground") + ADD_COLOR("me_d_b_fg", "#8096A5B1", "[M] Menu disabled button : foreground") + ADD_COLOR("me_h_b_fg", "#4B5964", "[M] Menu hovered button : foreground") + ADD_COLOR("me_p_b_fg", "#FF5E00", "[M] Menu pressed button : foreground") +// Inverse + ADD_COLOR("me_n_b_inv_bg", "transparent", "[M] Menu normal button : inverse background") + ADD_COLOR("me_d_b_inv_bg", "transparent", "[M] Menu disabled button : inverse background") + ADD_COLOR("me_h_b_inv_bg", "transparent", "[M] Menu hovered button : inverse background") + ADD_COLOR("me_p_b_inv_bg", "transparent", "[M] Menu pressed button : inverse background") + + ADD_COLOR("me_n_b_inv_fg", "white", "[M] Menu normal button : inverse foreground") + ADD_COLOR("me_d_b_inv_fg", "#80FFFFFF", "[M] Menu disabled button : inverse foreground") + ADD_COLOR("me_h_b_inv_fg", "#B0FFFFFF", "[M] Menu hovered button : inverse foreground") + ADD_COLOR("me_p_b_inv_fg", "white", "[M] Menu pressed button : inverse foreground") + + +//-------------------------------------------------------------------------------------------------------------------- +/* + ADD_COLOR("m_b_bg_h", "#4B5964", "Main color for hovered buttons(background)") + ADD_COLOR("m_b_bg_p", "#DC4100", "Main color for pressed buttons(background)") + ADD_COLOR("m_b_fg_n", "#FFFFFF", "Main color for normal buttons(foreground)") + ADD_COLOR_WITH_LINK("m_b_fg_h", "", "Main color for hovered buttons(foreground)", "m_b_fg_n") + ADD_COLOR_WITH_LINK("m_b_fg_p", "", "Main color for pressed buttons(foreground)", "m_b_fg_n") + + + + ADD_COLOR_WITH_LINK("m_b_bg_n", "", "Main color for normal buttons(background)", "i") + ADD_COLOR("m_b_bg_h", "#4B5964", "Main color for hovered buttons(background)") + ADD_COLOR("m_b_bg_p", "#DC4100", "Main color for pressed buttons(background)") + ADD_COLOR("m_b_fg_n", "#FFFFFF", "Main color for normal buttons(foreground)") + ADD_COLOR_WITH_LINK("m_b_fg_h", "", "Main color for hovered buttons(foreground)", "m_b_fg_n") + ADD_COLOR_WITH_LINK("m_b_fg_p", "", "Main color for pressed buttons(foreground)", "m_b_fg_n") + + ADD_COLOR("action_b_bg_n", "#96A6B1", "Action color for normal buttons(background)") + ADD_COLOR("action_b_bg_h", "#4B5964", "Action color for hovered buttons(background)") + ADD_COLOR("action_b_bg_p", "#FE5E00", "Action color for pressed buttons(background)") + ADD_COLOR("action_b_fg_n", "white", "Action color for normal buttons(foreground)") + ADD_COLOR_WITH_LINK("action_b_fg_h", "", "Action color for hovered buttons(foreground)", "action_b_fg_n") + ADD_COLOR_WITH_LINK("action_b_fg_p", "", "Action color for pressed buttons(foreground)", "action_b_fg_n") + + ADD_COLOR("noBackground_b_n", "transparent", "Buttons with no background(normal)") + ADD_COLOR_WITH_LINK("noBackground_b_h", "", "Buttons with no background(hovered)", "noBackground_b_n") + ADD_COLOR_WITH_LINK("noBackground_b_p", "", "Buttons with no background(pressed)", "noBackground_b_n") + ADD_COLOR("foreground_noBackground_b_n", "#96A6B1", "Normal buttons without background(foreground)") + ADD_COLOR("foreground_noBackground_b_h", "#4B5964", "Hovered buttons without background(foreground)") + ADD_COLOR("foreground_noBackground_b_p", "#DC4100", "Pressed buttons without background(foreground)") + ADD_COLOR("foreground_noBackground_b_activated", "#FF5E00", "Activated buttons without background(foreground)") + + ADD_COLOR("inv_noBackground_b_n", "transparent", "Inverse color for normal buttons with no background(normal)") + ADD_COLOR_WITH_LINK("inv_noBackground_b_h", "", "Inverse color for hovered buttons with no background(hovered)", "inv_noBackground_b_n") + ADD_COLOR_WITH_LINK("inv_noBackground_b_p", "", "Inverse color for pressed buttons with no background(pressed)", "inv_noBackground_b_n") + ADD_COLOR_WITH_LINK("inv_fg_noBackground_b_n", "", "Inverse color for normal buttons(foreground)", "foreground_noBackground_b_n") + ADD_COLOR("inv_fg_noBackground_b_h", "white", "Inverse color for hovered buttons(foreground)") + ADD_COLOR_WITH_LINK("inv_fg_noBackground_b_p", "", "Inverse color for pressed buttons(foreground)", "foreground_noBackground_b_p") + ADD_COLOR_WITH_LINK("inv_fg_noBackground_b_activated", "", "Inverse color for activated buttons without background(foreground)", "foreground_noBackground_b_activated") + + ADD_COLOR("inv_fg_noBackground_b_h", "white", "Inverse color for hovered buttons(foreground)") + + + ADD_COLOR("noBackground_b_n", "transparent", "Buttons with no background(normal)") + ADD_COLOR_WITH_LINK("noBackground_b_h", "", "Buttons with no background(hovered)", "noBackground_b_n") + ADD_COLOR_WITH_LINK("noBackground_b_p", "", "Buttons with no background(pressed)", "noBackground_b_n") + ADD_COLOR("foreground_noBackground_b_n", "#96A6B1", "Inverse color for normal buttons(foreground)") + ADD_COLOR("foreground_noBackground_b_h", "#4B5964", "Inverse color for hovered buttons(foreground)") + ADD_COLOR("foreground_noBackground_b_p", "#DC4100", "Inverse color for pressed buttons(foreground)") +*/ ADD_COLOR("border", "black", "Borders") @@ -120,34 +284,45 @@ class ColorListModel : public QAbstractListModel { ADD_COLOR_WITH_ALPHA("l", 50, "") ADD_COLOR_WITH_ALPHA("l", 80, "") ADD_COLOR_WITH_ALPHA("q", 50, "") + + ADD_COLOR_WITH_LINK("event_bad", "", "Event colors that are bad", "error") } public: ColorListModel (QObject *parent = nullptr); + void initKeywords(); int rowCount (const QModelIndex &index = QModelIndex()) const override; virtual QHash roleNames () const override; virtual QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const override; + ColorModel *getAt(const int& index); void useConfig (const std::shared_ptr &config); Q_INVOKABLE QString getNames(); ColorModel * getColor(const QString& id); + QVector getColorIdLinks(); // id: set an ID. If the ID already exist, the funtion return the item instead of create one. // color : if empty, use the color from link // description : describe the color // idLink : link this color with another ID Q_INVOKABLE ColorModel * add(const QString& id, const QString& idLink, QString description = "", QString color = ""); + Q_INVOKABLE ColorModel * addImageColor(const QString& id, const QString& imageId, const QString& idLink, QString description = "", QString color = ""); void addLink(const QString& a, const QString& b); void removeLink(const QString& a); + Q_INVOKABLE void updateLink(const QString& id, const QString& newLink); QQmlPropertyMap * getQmlData(); const QQmlPropertyMap * getQmlData() const; int getLinkIndex(const QString& id); + + void overrideColors (const std::shared_ptr &config); + std::shared_ptr getConfigColors(const QString filename); + public slots: void handleUiColorChanged(const QString& id, const QColor& color); @@ -161,13 +336,13 @@ private: QList> mList; - void overrideColors (const std::shared_ptr &config); - QStringList getColorNames () const; QQmlPropertyMap mData; QVector mColorLinks; QMap mColorLinkIndexes;// Optimization for access + QMap > imageLinks; + QMap mKeywordsMap; // Convert keyword into description }; #undef ADD_COLOR diff --git a/linphone-app/src/components/other/colors/ColorModel.cpp b/linphone-app/src/components/other/colors/ColorModel.cpp index 375363e8e..613d684b8 100644 --- a/linphone-app/src/components/other/colors/ColorModel.cpp +++ b/linphone-app/src/components/other/colors/ColorModel.cpp @@ -48,7 +48,9 @@ QColor ColorModel::getColor() const{ QString ColorModel::getDescription() const{ return mDescription; } - +QString ColorModel::getLinkedToImage() const{ + return mLinkedToImage; +} void ColorModel::setColor(const QColor& color){ if(color != mColor){ @@ -76,3 +78,7 @@ void ColorModel::setDescription(const QString& description){ emit descriptionChanged(); } } + +void ColorModel::setLinkedToImage(const QString& id){ + mLinkedToImage = id; +} diff --git a/linphone-app/src/components/other/colors/ColorModel.hpp b/linphone-app/src/components/other/colors/ColorModel.hpp index b8a33539d..0b5a6f1a8 100644 --- a/linphone-app/src/components/other/colors/ColorModel.hpp +++ b/linphone-app/src/components/other/colors/ColorModel.hpp @@ -42,12 +42,14 @@ public: QColor getColor() const; QString getDescription() const; QString getName() const; - + Q_INVOKABLE QString toString(){return getName();} + QString getLinkedToImage() const; void setColor(const QColor& color); void setInternalColor(const QColor& color); void setAlpha(const int& alpha); void setDescription(const QString& description); + void setLinkedToImage(const QString& id); signals: void colorChanged(); @@ -58,6 +60,7 @@ private: QString mName; QColor mColor; QString mDescription; + QString mLinkedToImage; }; Q_DECLARE_METATYPE(std::shared_ptr); diff --git a/linphone-app/src/components/other/colors/ColorProxyModel.cpp b/linphone-app/src/components/other/colors/ColorProxyModel.cpp index bbea353d1..5e890651e 100644 --- a/linphone-app/src/components/other/colors/ColorProxyModel.cpp +++ b/linphone-app/src/components/other/colors/ColorProxyModel.cpp @@ -32,17 +32,29 @@ ColorProxyModel::ColorProxyModel (QObject *parent) : QSortFilterProxyModel(parent){ setSourceModel(App::getInstance()->getColorListModel()); + mSortMode = 0; sort(0); } +void ColorProxyModel::updateLink(const QString& id, const QString& newLink){ + App::getInstance()->getColorListModel()->updateLink(id, newLink); + invalidate(); +} + +void ColorProxyModel::changeSort(){ + mSortMode = (mSortMode+1)%3; + invalidate(); +} + bool ColorProxyModel::filterAcceptsRow ( int sourceRow, const QModelIndex &sourceParent ) const { Q_UNUSED(sourceRow) Q_UNUSED(sourceParent) - //const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); - //const ParticipantDeviceModel *device = index.data().value(); + const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); + const ColorModel *model= index.data().value(); + //return model->getLinkedToImage() == "";// Remove linked to image from list return true; } @@ -50,8 +62,15 @@ bool ColorProxyModel::lessThan (const QModelIndex &left, const QModelIndex &righ ColorListModel * model = static_cast(sourceModel()); const ColorModel *a = model->data(left).value(); const ColorModel *b = model->data(right).value(); - - return model->getLinkIndex(a->getName()) < model->getLinkIndex(b->getName()); - //return a->getName() < b->getName() ; + switch(mSortMode){ + case 0 : + return model->getLinkIndex(a->getName()) < model->getLinkIndex(b->getName()); + case 1: + return a->getName() < b->getName(); + case 2: + return a->getDescription() < b->getDescription(); + default: + return a->getName() < b->getName(); + } } //--------------------------------------------------------------------------------- diff --git a/linphone-app/src/components/other/colors/ColorProxyModel.hpp b/linphone-app/src/components/other/colors/ColorProxyModel.hpp index 954e09523..06b23debf 100644 --- a/linphone-app/src/components/other/colors/ColorProxyModel.hpp +++ b/linphone-app/src/components/other/colors/ColorProxyModel.hpp @@ -38,11 +38,17 @@ class ColorProxyModel : public QSortFilterProxyModel { public: ColorProxyModel (QObject *parent = nullptr); + Q_INVOKABLE void updateLink(const QString& id, const QString& newLink); + Q_INVOKABLE void changeSort(); + protected: virtual bool filterAcceptsRow (int sourceRow, const QModelIndex &sourceParent) const override; virtual bool lessThan (const QModelIndex &left, const QModelIndex &right) const override; +private: + int mSortMode; + }; #endif diff --git a/linphone-app/src/components/other/colors/ImageColorsProxyModel.cpp b/linphone-app/src/components/other/colors/ImageColorsProxyModel.cpp new file mode 100644 index 000000000..be326aa8c --- /dev/null +++ b/linphone-app/src/components/other/colors/ImageColorsProxyModel.cpp @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2021 Belledonne Communications SARL. + * + * This file is part of linphone-desktop + * (see https://www.linphone.org). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "ImageColorsProxyModel.hpp" +#include + +#include "app/App.hpp" + +#include "utils/Utils.hpp" + +#include "components/Components.hpp" +#include "ColorListModel.hpp" +#include "ColorModel.hpp" + +// ============================================================================= + +ImageColorsProxyModel::ImageColorsProxyModel (QObject *parent) : QSortFilterProxyModel(parent){ + setSourceModel(App::getInstance()->getColorListModel()); + sort(0); +} + +void ImageColorsProxyModel::setImageId(const QString& imageId){ + if(mImageId != imageId){ + mImageId = imageId; + emit imageIdChanged(); + invalidate(); + } +} + +//--------------------------------------------------------------------------------- +bool ImageColorsProxyModel::filterAcceptsRow ( + int sourceRow, + const QModelIndex &sourceParent + ) const { + Q_UNUSED(sourceRow) + Q_UNUSED(sourceParent) + const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); + const ColorModel *model= index.data().value(); + return mImageId != "" && model->getLinkedToImage() == mImageId;// Remove linked to image from list +} + +bool ImageColorsProxyModel::lessThan (const QModelIndex &left, const QModelIndex &right) const { + ColorListModel * model = static_cast(sourceModel()); + const ColorModel *a = model->data(left).value(); + const ColorModel *b = model->data(right).value(); + + //return model->getLinkIndex(a->getName()) < model->getLinkIndex(b->getName()); + return a->getName() < b->getName() ; +} +//--------------------------------------------------------------------------------- diff --git a/linphone-app/src/components/other/colors/ImageColorsProxyModel.hpp b/linphone-app/src/components/other/colors/ImageColorsProxyModel.hpp new file mode 100644 index 000000000..c003d4e20 --- /dev/null +++ b/linphone-app/src/components/other/colors/ImageColorsProxyModel.hpp @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021 Belledonne Communications SARL. + * + * This file is part of linphone-desktop + * (see https://www.linphone.org). + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef IMAGE_COLORS_PROXY_MODEL_H_ +#define IMAGE_COLORS_PROXY_MODEL_H_ + + +#include +// ============================================================================= +#include +#include +#include +#include + +class ColorListModel; +class ChatMessageModel; + +class ImageColorsProxyModel : public QSortFilterProxyModel { + Q_OBJECT + +public: + ImageColorsProxyModel (QObject *parent = nullptr); + Q_PROPERTY(QString imageId MEMBER mImageId WRITE setImageId NOTIFY imageIdChanged) + + void setImageId(const QString& imageId); +signals: + void imageIdChanged(); + +protected: + virtual bool filterAcceptsRow (int sourceRow, const QModelIndex &sourceParent) const override; + virtual bool lessThan (const QModelIndex &left, const QModelIndex &right) const override; + +private: + QString mImageId; + +}; + +#endif diff --git a/linphone-app/src/utils/Utils.cpp b/linphone-app/src/utils/Utils.cpp index 82199fafe..b21c1e397 100644 --- a/linphone-app/src/utils/Utils.cpp +++ b/linphone-app/src/utils/Utils.cpp @@ -30,6 +30,7 @@ #include "components/contacts/ContactsListModel.hpp" #include "components/contact/ContactModel.hpp" #include "components/contact/VcardModel.hpp" +#include "app/paths/Paths.hpp" // ============================================================================= @@ -506,3 +507,11 @@ QString Utils::getDisplayName(const std::shared_ptr& ad } return displayName; } + +std::shared_ptr Utils::getConfigIfExists (const QString &configPath) { + std::string factoryPath(Paths::getFactoryConfigFilePath()); + if (!Paths::filePathExists(factoryPath)) + factoryPath.clear(); + + return linphone::Config::newWithFactory(configPath.toStdString(), factoryPath); +} \ No newline at end of file diff --git a/linphone-app/src/utils/Utils.hpp b/linphone-app/src/utils/Utils.hpp index d88924e81..710033544 100644 --- a/linphone-app/src/utils/Utils.hpp +++ b/linphone-app/src/utils/Utils.hpp @@ -126,6 +126,7 @@ public: static QString getCountryName(const QLocale::Country& country); static void copyDir(QString from, QString to);// Copy a folder recursively without erasing old file static QString getDisplayName(const std::shared_ptr& address); // Get the displayname from addres in this order : Friends, Contact, Display address, Username address + static std::shared_ptr getConfigIfExists (const QString& configPath); }; #endif // UTILS_H_ diff --git a/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml b/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml index 471975018..99b5c59f5 100644 --- a/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml +++ b/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml @@ -23,8 +23,8 @@ Item { Rectangle{ anchors.fill:parent gradient: Gradient { - GradientStop { position: 0.0; color: ColorsList.add("Dialog_title_gradient_low", "y").color } - GradientStop { position: 1.0; color: ColorsList.add("Dialog_title_gradient_high", "z").color} + GradientStop { position: 0.0; color: DialogStyle.title.lowGradient } + GradientStop { position: 1.0; color: DialogStyle.title.highGradient } } visible:showBar } @@ -49,10 +49,12 @@ Item { anchors.right:parent.right anchors.rightMargin: 14 anchors.top:parent.top - anchors.bottom:parent.bottom - icon: 'close' - iconSize: 12 - useStates: false + anchors.topMargin: 5 + height: DialogStyle.closeButton.iconSize + isCustom: true + backgroundRadius: 90 + colorSet: DialogStyle.closeButton + visible:mainItem.showCloseCross onClicked: close() diff --git a/linphone-app/ui/modules/Common/Form/ActionButton.qml b/linphone-app/ui/modules/Common/Form/ActionButton.qml index f43e240b1..ab5b861c6 100644 --- a/linphone-app/ui/modules/Common/Form/ActionButton.qml +++ b/linphone-app/ui/modules/Common/Form/ActionButton.qml @@ -9,89 +9,227 @@ import Common 1.0 // ============================================================================= Item { - id: wrappedButton - - // --------------------------------------------------------------------------- - - property bool enabled: true - property bool updating: false - property bool useStates: true - //property bool autoIcon : false // hovered/pressed : use an automatic layer instead of specific icon image - property int iconSize // Optional. - readonly property alias hovered: button.hovered - property alias text: button.text - property alias tooltipText : tooltip.text - - // If `useStates` = true, the used icons are: - // `icon`_pressed, `icon`_hovered and `icon`_normal. - property string icon - - // --------------------------------------------------------------------------- - - signal clicked - - // --------------------------------------------------------------------------- - - function _getIcon () { - if(wrappedButton.icon == '') - return wrappedButton.icon; - if (wrappedButton.updating) { - return wrappedButton.icon + '_updating' - } - - if (!useStates) { - return wrappedButton.icon - } - - if (!wrappedButton.enabled) { - return wrappedButton.icon + '_disabled' - } - // if(!autoIcon) { - return wrappedButton.icon + ( - button.down - ? '_pressed' - : (button.hovered ? '_hovered' : '_normal') - ) - // } - // return wrappedButton.icon; - } - - // --------------------------------------------------------------------------- - - height: iconSize || parent.iconSize || parent.height - width: iconSize || parent.iconSize || parent.width - - Button { - id: button - - anchors.fill: parent - background: Rectangle { - color: 'transparent' - } - hoverEnabled: !wrappedButton.updating//|| wrappedButton.autoIcon - - onClicked: !wrappedButton.updating && wrappedButton.enabled && wrappedButton.clicked() - - Icon { - id: icon - - anchors.centerIn: parent - icon: Images[_getIcon()].id - iconSize: wrappedButton.iconSize || ( - parent.width > parent.height ? parent.height : parent.width - ) - MouseArea{ - anchors.fill:parent - hoverEnabled: true - acceptedButtons: Qt.NoButton - cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor - } - } - TooltipArea { - id:tooltip - text: '' - visible:text!='' - } - } - + id: wrappedButton + + // --------------------------------------------------------------------------- + property QtObject colorSet: QtObject { + property int iconSize: 30 + property string icon : '' + property color backgroundNormalColor : "white" + property color backgroundDisabledColor : "white" + property color backgroundHoveredColor : "white" + property color backgroundUpdatingColor : "white" + property color backgroundPressedColor : "white" + // Color for shown part + property color foregroundNormalColor : "black" + property color foregroundDisabledColor : "black" + property color foregroundHoveredColor : "black" + property color foregroundUpdatingColor : "black" + property color foregroundPressedColor : "black" + } + property bool isCustom : false + property bool enabled: true + property bool updating: false + property bool useStates: true + //property bool autoIcon : false // hovered/pressed : use an automatic layer instead of specific icon image + property int iconSize : colorSet.iconSize + readonly property alias hovered: button.hovered + property alias text: button.text + // Tooltip aliases + property alias tooltipText : tooltip.text + property alias tooltipIsClickable : tooltip.isClickable + property alias tooltipMaxWidth: tooltip.maxWidth + property alias tooltipVisible: tooltip.visible + // Custom mode + + property alias backgroundRadius : backgroundColor.radius + + +// AutoColor for hide part alpha /4 + property color foregroundHiddenPartNormalColor : colorSet.foregroundNormalColor ? Qt.rgba(colorSet.foregroundNormalColor.r, colorSet.foregroundNormalColor.g, colorSet.foregroundNormalColor.b, colorSet.foregroundNormalColor.a/4) : 'transparent' + property color foregroundHiddenPartDisabledColor : colorSet.foregroundDisabledColor ? Qt.rgba(colorSet.foregroundDisabledColor.r, colorSet.foregroundDisabledColor.g, colorSet.foregroundDisabledColor.b, colorSet.foregroundDisabledColor.a/4): 'transparent' + property color foregroundHiddenPartHoveredColor : colorSet.foregroundHoveredColor ? Qt.rgba(colorSet.foregroundHoveredColor.r, colorSet.foregroundHoveredColor.g, colorSet.foregroundHoveredColor.b, colorSet.foregroundHoveredColor.a/4): 'transparent' + property color foregroundHiddenPartUpdatingColor : colorSet.foregroundUpdatingColor ? Qt.rgba(colorSet.foregroundUpdatingColor.r, colorSet.foregroundUpdatingColor.g, colorSet.foregroundUpdatingColor.b, colorSet.foregroundUpdatingColor.a/4): 'transparent' + property color foregroundHiddenPartPressedColor : colorSet.foregroundPressedColor ? Qt.rgba(colorSet.foregroundPressedColor.r, colorSet.foregroundPressedColor.g, colorSet.foregroundPressedColor.b, colorSet.foregroundPressedColor.a/4): 'transparent' + + property int percentageDisplayed : 100 + + + // If `useStates` = true, the used icons are: + // `icon`_pressed, `icon`_hovered and `icon`_normal. + property string icon : colorSet.icon + + // --------------------------------------------------------------------------- + + signal clicked + + // --------------------------------------------------------------------------- + + function _getIcon () { + if(isCustom) + return wrappedButton.icon + if(wrappedButton.icon == '') + return wrappedButton.icon; + if (wrappedButton.updating) { + return wrappedButton.icon + '_updating' + } + + if (!useStates) { + return wrappedButton.icon + } + + if (!wrappedButton.enabled) { + return wrappedButton.icon + '_disabled' + } + // if(!autoIcon) { + return wrappedButton.icon + ( + button.down + ? '_pressed' + : (button.hovered ? '_hovered' : '_normal') + ) + // } + // return wrappedButton.icon; + } + function getBackgroundColor(){ + if(isCustom){ + if(wrappedButton.icon == '') + return wrappedButton.colorSet.backgroundNormalColor + if (wrappedButton.updating) + return wrappedButton.colorSet.backgroundUpdatingColor + if (!useStates) + return wrappedButton.colorSet.backgroundNormalColor + if (!wrappedButton.enabled) + return wrappedButton.colorSet.backgroundDisabledColor + return button.down ? wrappedButton.colorSet.backgroundPressedColor + : (button.hovered ? wrappedButton.colorSet.backgroundHoveredColor: wrappedButton.colorSet.backgroundNormalColor) + }else + return 'transparent' + } + function getForegroundColor(){ + if(isCustom){ + if(wrappedButton.icon == '') + return wrappedButton.colorSet.foregroundNormalColor + if (wrappedButton.updating) + return wrappedButton.colorSet.foregroundUpdatingColor + if (!useStates) + return wrappedButton.colorSet.foregroundNormalColor + if (!wrappedButton.enabled) + return wrappedButton.colorSet.foregroundDisabledColor + return button.down ? wrappedButton.colorSet.foregroundPressedColor + : (button.hovered ? wrappedButton.colorSet.foregroundHoveredColor: wrappedButton.colorSet.foregroundNormalColor) + }else + return "black" + } + function getForegroundHiddenPartColor(){ + if(isCustom){ + if(wrappedButton.icon == '') + return wrappedButton.foregroundHiddenPartNormalColor + if (wrappedButton.updating) + return wrappedButton.foregroundHiddenPartUpdatingColor + if (!useStates) + return wrappedButton.foregroundHiddenPartNormalColor + if (!wrappedButton.enabled) + return wrappedButton.foregroundHiddenPartDisabledColor + return button.down ? wrappedButton.foregroundHiddenPartPressedColor + : (button.hovered ? wrappedButton.foregroundHiddenPartHoveredColor: wrappedButton.foregroundHiddenPartNormalColor) + }else + return "#80FFFFFF" + } + // --------------------------------------------------------------------------- + + height: iconSize || parent.iconSize || parent.height + width: iconSize || parent.iconSize || parent.width + + Button { + id: button + + anchors.fill: parent + background: Rectangle { + id: backgroundColor + color: getBackgroundColor() + } + hoverEnabled: !wrappedButton.updating//|| wrappedButton.autoIcon + + onClicked: !wrappedButton.updating && wrappedButton.enabled && wrappedButton.clicked() + Rectangle{ + id: foregroundColor + anchors.fill:parent + visible: false + color: 'transparent' + Rectangle{ + anchors.fill:parent + color: getForegroundColor() + anchors.rightMargin: parent.width * ( 1 - wrappedButton.percentageDisplayed / 100 ) + } + } + Rectangle{ + id: foregroundHiddenPartColor + anchors.fill:parent + visible: false + color: 'transparent' + Rectangle{ + anchors.fill:parent + color: getForegroundHiddenPartColor() + anchors.leftMargin: parent.width * wrappedButton.percentageDisplayed / 100 + } + } + + + Icon { + id: icon + + anchors.centerIn: parent + icon: { + if(!Images[_getIcon()]) + console.log(_getIcon()) + return Images[_getIcon()].id + } + iconSize: wrappedButton.iconSize || ( + parent.width > parent.height ? parent.height : parent.width + ) + visible: !isCustom + } + + + OpacityMask{ + anchors.fill: foregroundColor + source: foregroundColor + maskSource: icon + visible: isCustom + MouseArea{ + anchors.fill:parent + hoverEnabled: true + acceptedButtons: Qt.NoButton + cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor + } + } + + + OpacityMask{ + id: mask + anchors.fill: foregroundHiddenPartColor + source: foregroundHiddenPartColor + maskSource: icon + visible: isCustom && percentageDisplayed != 100 + /* + layer { + enabled: true + effect: ColorOverlay { + color: "#80FFFFFF" + } + }*/ + MouseArea{ + anchors.fill:parent + hoverEnabled: true + acceptedButtons: Qt.NoButton + cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor + } + } + TooltipArea { + id:tooltip + text: '' + visible:text!='' + } + } + } diff --git a/linphone-app/ui/modules/Common/Form/ActionSwitch.qml b/linphone-app/ui/modules/Common/Form/ActionSwitch.qml index 88d86f23e..6e787e8d1 100644 --- a/linphone-app/ui/modules/Common/Form/ActionSwitch.qml +++ b/linphone-app/ui/modules/Common/Form/ActionSwitch.qml @@ -3,29 +3,35 @@ import QtQuick 2.7 // ============================================================================= Item { - property alias updating: actionButton.updating - property alias useStates: actionButton.useStates - property alias text: actionButton.text - property bool enabled: true - property int iconSize // Optionnal. - property string icon - - // --------------------------------------------------------------------------- - - signal clicked - - // --------------------------------------------------------------------------- - - height: iconSize || parent.iconSize || parent.height - width: iconSize || parent.iconSize || parent.width - - ActionButton { - id: actionButton - - anchors.fill: parent - icon: parent.icon + (parent.enabled ? '_on' : '_off') - iconSize: parent.iconSize - - onClicked: parent.clicked() - } + property alias updating: actionButton.updating + property alias useStates: actionButton.useStates + property alias text: actionButton.text + property bool enabled: true + + // Custom mode + property alias isCustom : actionButton.isCustom + property alias backgroundRadius : actionButton.backgroundRadius + + property alias colorSet : actionButton.colorSet + property alias iconSize : actionButton.iconSize + property alias icon : actionButton.icon + + // --------------------------------------------------------------------------- + + signal clicked + + // --------------------------------------------------------------------------- + + height: iconSize || parent.iconSize || parent.height + width: iconSize || parent.iconSize || parent.width + + ActionButton { + id: actionButton + + anchors.fill: parent + //icon: parent.icon// + (parent.enabled ? '_on' : '_off') + //iconSize: parent.iconSize + + onClicked: parent.clicked() + } } diff --git a/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml index 86e5e5949..9285e7d43 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml @@ -48,19 +48,11 @@ TextField { : FileChooserButtonStyle.tools.button.color.normal ) - Icon { + ActionButton { anchors.centerIn: parent - - icon: (textField.selectFolder ? 'folder' : 'file') + (mouseArea.pressed - ? '_pressed' - : ( - mouseArea.containsMouse - ? '_hovered' - : '_normal' - ) - ) - - iconSize: FileChooserButtonStyle.tools.button.iconSize + isCustom: true + backgroundRadius: 90 + colorSet: textField.selectFolder ? FileChooserButtonStyle.folder : FileChooserButtonStyle.file } } } diff --git a/linphone-app/ui/modules/Common/Form/ComboBox.qml b/linphone-app/ui/modules/Common/Form/ComboBox.qml index f382416c8..7722ca648 100644 --- a/linphone-app/ui/modules/Common/Form/ComboBox.qml +++ b/linphone-app/ui/modules/Common/Form/ComboBox.qml @@ -72,8 +72,9 @@ Controls.ComboBox { // --------------------------------------------------------------------------- indicator: Icon { - icon: 'drop_down' - iconSize: ComboBoxStyle.background.iconSize + icon: ComboBoxStyle.indicator.dropDown.icon + iconSize: ComboBoxStyle.indicator.dropDown.iconSize + overwriteColor: ComboBoxStyle.indicator.dropDown.color x: comboBox.width - width - comboBox.rightPadding y: comboBox.topPadding + (comboBox.availableHeight - height) / 2 diff --git a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml index 85e513354..5c98e449b 100644 --- a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml @@ -60,8 +60,10 @@ Item { Layout.alignment: Qt.AlignVCenter //anchors.verticalCenter: parent.verticalCenter enabled: droppableTextArea.dropEnabled - icon: 'attachment' - iconSize: DroppableTextAreaStyle.fileChooserButton.size + isCustom: true + backgroundRadius: 8 + colorSet: DroppableTextAreaStyle.fileChooserButton + visible: droppableTextArea.enabled onClicked: fileDialog.open() @@ -87,8 +89,10 @@ Item { Layout.alignment: Qt.AlignVCenter enabled: droppableTextArea.dropEnabled - icon: 'chat_micro' - iconSize: DroppableTextAreaStyle.fileChooserButton.size + isCustom: true + backgroundRadius: 8 + colorSet: DroppableTextAreaStyle.chatMicro + useStates:false onClicked: {console.log('Record audio request')} @@ -189,26 +193,22 @@ Item { Layout.leftMargin: 10 Layout.alignment: Qt.AlignVCenter visible: droppableTextArea.enabled - icon: 'send' - iconSize: DroppableTextAreaStyle.fileChooserButton.size - useStates:false + isCustom: true + backgroundRadius: 8 + colorSet: DroppableTextAreaStyle.send + onClicked: textArea.handleValidation() Icon{ visible:droppableTextArea.isEphemeral - icon:'timer' - iconSize:15 + icon: DroppableTextAreaStyle.ephemeralTimer.icon + overwriteColor: DroppableTextAreaStyle.ephemeralTimer.timerColor + iconSize: DroppableTextAreaStyle.ephemeralTimer.iconSize anchors.right:parent.right anchors.bottom : parent.bottom - anchors.rightMargin:-15 + anchors.rightMargin:-10 } } - }/* - MouseArea{ - anchors.top:parent.top - anchors.verticalCenter: parent.verticalCenter - //icon: 'burger_menu' - //iconSize: 5 - }*/ + } // Hovered style. Rectangle { id: hoverContent diff --git a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml index 40a098593..47b90fe18 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml @@ -14,6 +14,8 @@ Controls.TextField { // --------------------------------------------------------------------------- property alias icon: icon.icon + property alias iconSize: icon.iconSize + property alias overwriteColor: icon.overwriteColor property string error: '' property var tools property QtObject textFieldStyle : TextFieldStyle.normal diff --git a/linphone-app/ui/modules/Common/Form/ListForm.qml b/linphone-app/ui/modules/Common/Form/ListForm.qml index fca65cb8e..65226f0a0 100644 --- a/linphone-app/ui/modules/Common/Form/ListForm.qml +++ b/linphone-app/ui/modules/Common/Form/ListForm.qml @@ -9,132 +9,134 @@ import 'ListForm.js' as Logic // ============================================================================= RowLayout { - id: listForm - - // --------------------------------------------------------------------------- - - property alias placeholder: placeholder.text - property alias title: text.text - property bool readOnly: false - property int inputMethodHints - property var minValues - readonly property int count: values.count - - // --------------------------------------------------------------------------- - - signal changed (int index, string oldValue, string newValue) - signal removed (int index, string value) - - // --------------------------------------------------------------------------- - - function setData () { - Logic.setData.apply(this, arguments) - } - - function setInvalid () { - Logic.setInvalid.apply(this, arguments) - } - - function updateValue () { - Logic.updateValue.apply(this, arguments) - } - - // --------------------------------------------------------------------------- - - spacing: 0 - - // --------------------------------------------------------------------------- - // Title area. - // --------------------------------------------------------------------------- - - RowLayout { - Layout.alignment: Qt.AlignTop - Layout.preferredHeight: ListFormStyle.lineHeight - spacing: ListFormStyle.titleArea.spacing - - ActionButton { - id: addButton - - icon: 'add' - iconSize: ListFormStyle.titleArea.iconSize - opacity: !listForm.readOnly ? 1 : 0 - - onClicked: !listForm.readOnly && Logic.addValue('') - } - - Text { - id: text - - Layout.preferredWidth: ListFormStyle.titleArea.text.width - color: ListFormStyle.titleArea.text.color - elide: Text.ElideRight - - font { - bold: true - pointSize: ListFormStyle.titleArea.text.pointSize - } - } - } - - // --------------------------------------------------------------------------- - // Placeholder. - // --------------------------------------------------------------------------- - - Text { - id: placeholder - - Layout.fillWidth: true - Layout.preferredHeight: ListFormStyle.lineHeight - color: ListFormStyle.value.placeholder.color - - font { - italic: true - pointSize: ListFormStyle.value.placeholder.pointSize - } - - padding: ListFormStyle.value.text.padding - visible: values.model.count === 0 - verticalAlignment: Text.AlignVCenter - - MouseArea { - anchors.fill: parent - onClicked: !listForm.readOnly && Logic.addValue('') - } - } - - // --------------------------------------------------------------------------- - // Values. - // --------------------------------------------------------------------------- - - ListView { - id: values - - Layout.fillWidth: true - Layout.preferredHeight: count * ListFormStyle.lineHeight - interactive: false - visible: model.count > 0 - - delegate: Item { - implicitHeight: textInput.height - width: values.width - - TransparentTextInput { - id: textInput - - inputMethodHints: listForm.inputMethodHints - isInvalid: $isInvalid - readOnly: listForm.readOnly - text: $value - - height: ListFormStyle.lineHeight - width: parent.width - - Component.onCompleted: Logic.handleItemCreation.apply(this) - - onEditingFinished: Logic.handleEditionFinished(index, text) - } - } - - model: ListModel {} - } + id: listForm + + // --------------------------------------------------------------------------- + + property alias placeholder: placeholder.text + property alias title: text.text + property bool readOnly: false + property int inputMethodHints + property var minValues + readonly property int count: values.count + + // --------------------------------------------------------------------------- + + signal changed (int index, string oldValue, string newValue) + signal removed (int index, string value) + + // --------------------------------------------------------------------------- + + function setData () { + Logic.setData.apply(this, arguments) + } + + function setInvalid () { + Logic.setInvalid.apply(this, arguments) + } + + function updateValue () { + Logic.updateValue.apply(this, arguments) + } + + // --------------------------------------------------------------------------- + + spacing: 0 + + // --------------------------------------------------------------------------- + // Title area. + // --------------------------------------------------------------------------- + + RowLayout { + Layout.alignment: Qt.AlignTop + Layout.preferredHeight: ListFormStyle.lineHeight + spacing: ListFormStyle.titleArea.spacing + + ActionButton { + id: addButton + + colorSet: ListFormStyle.titleArea.add + isCustom: true + backgroundRadius: 90 + + opacity: !listForm.readOnly ? 1 : 0 + + onClicked: !listForm.readOnly && Logic.addValue('') + } + + Text { + id: text + + Layout.preferredWidth: ListFormStyle.titleArea.text.width + color: ListFormStyle.titleArea.text.color + elide: Text.ElideRight + + font { + bold: true + pointSize: ListFormStyle.titleArea.text.pointSize + } + } + } + + // --------------------------------------------------------------------------- + // Placeholder. + // --------------------------------------------------------------------------- + + Text { + id: placeholder + + Layout.fillWidth: true + Layout.preferredHeight: ListFormStyle.lineHeight + color: ListFormStyle.value.placeholder.color + + font { + italic: true + pointSize: ListFormStyle.value.placeholder.pointSize + } + + padding: ListFormStyle.value.text.padding + visible: values.model.count === 0 + verticalAlignment: Text.AlignVCenter + + MouseArea { + anchors.fill: parent + onClicked: !listForm.readOnly && Logic.addValue('') + } + } + + // --------------------------------------------------------------------------- + // Values. + // --------------------------------------------------------------------------- + + ListView { + id: values + + Layout.fillWidth: true + Layout.preferredHeight: count * ListFormStyle.lineHeight + interactive: false + visible: model.count > 0 + + delegate: Item { + implicitHeight: textInput.height + width: values.width + + TransparentTextInput { + id: textInput + + inputMethodHints: listForm.inputMethodHints + isInvalid: $isInvalid + readOnly: listForm.readOnly + text: $value + + height: ListFormStyle.lineHeight + width: parent.width + + Component.onCompleted: Logic.handleItemCreation.apply(this) + + onEditingFinished: Logic.handleEditionFinished(index, text) + } + } + + model: ListModel {} + } } diff --git a/linphone-app/ui/modules/Common/Form/Placements/Form.qml b/linphone-app/ui/modules/Common/Form/Placements/Form.qml index 13d251ba9..8b65d8f3d 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/Form.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/Form.qml @@ -7,63 +7,67 @@ import Common 1.0 // ============================================================================= Column { - property alias title: title.text - property int orientation: Qt.Horizontal - property bool addButton : false - signal addButtonClicked; - property bool removeButton : false - signal removeButtonClicked; - - // --------------------------------------------------------------------------- - - spacing: FormStyle.spacing - - // --------------------------------------------------------------------------- - - ColumnLayout { - spacing: FormStyle.header.spacing - visible: parent.title.length > 0 - width: parent.width - - Row{ - spacing:10 - Text { - id: title - anchors.verticalCenter: parent.verticalCenter + property alias title: title.text + property int orientation: Qt.Horizontal + property bool addButton : false + signal addButtonClicked; + property bool removeButton : false + signal removeButtonClicked; - color: FormStyle.header.title.color - font { - bold: true - pointSize: FormStyle.header.title.pointSize - } - } - ActionButton { - visible:addButton - anchors.verticalCenter: parent.verticalCenter - icon: 'add' - iconSize:38 - scale:0.8 - onClicked:addButtonClicked() - } - ActionButton { - visible:removeButton - anchors.verticalCenter: parent.verticalCenter - icon: 'delete' - iconSize:38 - scale:0.8 - onClicked:removeButtonClicked() - } - } - - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: FormStyle.header.separator.height - - color: FormStyle.header.separator.color - } - - Item { - height: FormStyle.header.bottomMargin - } - } + // --------------------------------------------------------------------------- + + spacing: FormStyle.spacing + + // --------------------------------------------------------------------------- + + ColumnLayout { + spacing: FormStyle.header.spacing + visible: parent.title.length > 0 + width: parent.width + + Row{ + spacing:10 + Text { + id: title + anchors.verticalCenter: parent.verticalCenter + + color: FormStyle.header.title.color + font { + bold: true + pointSize: FormStyle.header.title.pointSize + } + } + ActionButton { + visible:addButton + anchors.verticalCenter: parent.verticalCenter + isCustom: true + backgroundRadius: 90 + colorSet: FormStyle.header.add + + scale:0.8 + onClicked:addButtonClicked() + } + ActionButton { + visible:removeButton + anchors.verticalCenter: parent.verticalCenter + isCustom: true + backgroundRadius: 90 + + colorSet: FormStyle.header.deleteAction + scale:0.8 + onClicked:removeButtonClicked() + } + } + + Rectangle { + Layout.fillWidth: true + Layout.preferredHeight: FormStyle.header.separator.height + + color: FormStyle.header.separator.color + } + + Item { + height: FormStyle.header.bottomMargin + } + } } diff --git a/linphone-app/ui/modules/Common/Form/SearchBox.qml b/linphone-app/ui/modules/Common/Form/SearchBox.qml index ec4e297c9..1bf55eae6 100644 --- a/linphone-app/ui/modules/Common/Form/SearchBox.qml +++ b/linphone-app/ui/modules/Common/Form/SearchBox.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.2 as Controls import Common 1.0 import Utils 1.0 +import Common.Styles 1.0 // ============================================================================= @@ -74,7 +75,8 @@ Item { TextField { id: searchField - icon: 'search' + icon: 'search_custom' + overwriteColor: SearchBoxStyle.iconColor readOnly: !searchBox.enabled width: parent.width diff --git a/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml index 6a0a63353..ea218d718 100644 --- a/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml +++ b/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml @@ -8,101 +8,98 @@ import Common.Styles 1.0 // ============================================================================= Controls.TabButton { - id: button - - // --------------------------------------------------------------------------- - - property int iconSize: TabButtonStyle.icon.size - property string iconName - - readonly property bool _isSelected: parent.parent.currentItem === button - - // --------------------------------------------------------------------------- - - function _getBackgroundColor () { - if (_isSelected) { - return TabButtonStyle.backgroundColor.selected - } - - return button.enabled - ? ( - button.down - ? TabButtonStyle.backgroundColor.pressed - : ( - button.hovered - ? TabButtonStyle.backgroundColor.hovered - : TabButtonStyle.backgroundColor.normal - ) - ) - : TabButtonStyle.backgroundColor.disabled - } - - function _getTextColor () { - if (_isSelected) { - return TabButtonStyle.text.color.selected - } - - return button.enabled - ? ( - button.down - ? TabButtonStyle.text.color.pressed - : ( - button.hovered - ? TabButtonStyle.text.color.hovered - : TabButtonStyle.text.color.normal - ) - ) - : TabButtonStyle.text.color.disabled - } - - // --------------------------------------------------------------------------- - - background: Rectangle { - color: _getBackgroundColor() - implicitHeight: TabButtonStyle.text.height - } - - contentItem: RowLayout { - height: button.height - width: button.width - spacing: TabButtonStyle.spacing - - Icon { - id: icon - - Layout.fillHeight: true - Layout.leftMargin: TabButtonStyle.text.leftPadding - - icon: { - var iconName = button.iconName - return iconName.length - ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) - : '' - } - iconSize: button.iconSize - } - - Text { - Layout.fillWidth: true - Layout.fillHeight: true - - color: _getTextColor() - - font { - bold: true - pointSize: TabButtonStyle.text.pointSize - } - - elide: Text.ElideRight - - height: parent.height - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - rightPadding: TabButtonStyle.text.rightPadding - text: button.text - } - } - - hoverEnabled: true + id: button + + // --------------------------------------------------------------------------- + + property int iconSize: TabButtonStyle.icon.size + property string iconName + + readonly property bool _isSelected: parent.parent.currentItem === button + + // --------------------------------------------------------------------------- + + function _getBackgroundColor () { + if (_isSelected) { + return TabButtonStyle.backgroundColor.selected + } + + return button.enabled + ? ( + button.down + ? TabButtonStyle.backgroundColor.pressed + : ( + button.hovered + ? TabButtonStyle.backgroundColor.hovered + : TabButtonStyle.backgroundColor.normal + ) + ) + : TabButtonStyle.backgroundColor.disabled + } + + function _getTextColor () { + if (_isSelected) { + return TabButtonStyle.text.color.selected + } + + return button.enabled + ? ( + button.down + ? TabButtonStyle.text.color.pressed + : ( + button.hovered + ? TabButtonStyle.text.color.hovered + : TabButtonStyle.text.color.normal + ) + ) + : TabButtonStyle.text.color.disabled + } + + // --------------------------------------------------------------------------- + + background: Rectangle { + color: _getBackgroundColor() + implicitHeight: TabButtonStyle.text.height + } + + contentItem: RowLayout { + height: button.height + width: button.width + spacing: TabButtonStyle.spacing + + Icon { + id: icon + + Layout.fillHeight: true + Layout.leftMargin: TabButtonStyle.text.leftPadding + overwriteColor: textItem.color + + icon: button.iconName + iconSize: button.iconSize + } + + Text { + id: textItem + Layout.fillWidth: true + Layout.fillHeight: true + + color: _getTextColor() + + font { + bold: true + pointSize: TabButtonStyle.text.pointSize + } + + elide: Text.ElideRight + + height: parent.height + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + rightPadding: TabButtonStyle.text.rightPadding + text: button.text + } + } + + hoverEnabled: true } diff --git a/linphone-app/ui/modules/Common/Image/Icon.qml b/linphone-app/ui/modules/Common/Image/Icon.qml index a88a72316..39eff1bc5 100644 --- a/linphone-app/ui/modules/Common/Image/Icon.qml +++ b/linphone-app/ui/modules/Common/Image/Icon.qml @@ -1,4 +1,5 @@ import QtQuick 2.7 +import QtGraphicalEffects 1.12 import Common 1.0 import Utils 1.0 @@ -8,34 +9,47 @@ import Utils 1.0 // ============================================================================= Item { - property var iconSize // Required. - property string icon - - height: iconSize - width: iconSize - - Image { - id:image - mipmap: Qt.platform.os === 'osx' - cache: Images.areReadOnlyImages - function getIconSize () { - Utils.assert( - (icon == null || icon == '' || iconSize != null && iconSize >= 0), - '`iconSize` must be defined and must be positive. (icon=`' + - icon + '`, iconSize=' + iconSize + ')' - ) - - return iconSize - } - - anchors.centerIn: parent - - width: iconSize - height: iconSize - - fillMode: Image.PreserveAspectFit - source: Utils.resolveImageUri(icon) - sourceSize.width: getIconSize() - sourceSize.height: getIconSize() - } + id: mainItem + property var iconSize // Required. + property string icon + property color overwriteColor +// Use this slot because of testing overwriteColor in layer doesn't seem to work + onOverwriteColorChanged: if(overwriteColor) + image.colorOverwriteEnabled = true + else + image.colorOverwriteEnabled = false + height: iconSize + width: iconSize + + Image { + id:image + property bool colorOverwriteEnabled : false + mipmap: Qt.platform.os === 'osx' + cache: Images.areReadOnlyImages + function getIconSize () { + Utils.assert( + (icon == null || icon == '' || iconSize != null && iconSize >= 0), + '`iconSize` must be defined and must be positive. (icon=`' + + icon + '`, iconSize=' + iconSize + ')' + ) + + return iconSize + } + + anchors.centerIn: parent + + width: iconSize + height: iconSize + + fillMode: Image.PreserveAspectFit + source: Utils.resolveImageUri(icon) + sourceSize.width: getIconSize() + sourceSize.height: getIconSize() + layer { + enabled: image.colorOverwriteEnabled + effect: ColorOverlay { + color: mainItem.overwriteColor + } + } + } } diff --git a/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml b/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml index 06b9cdae1..eb29511bb 100644 --- a/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml +++ b/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml @@ -16,6 +16,7 @@ Rectangle { readonly property bool isSelected: parent.parent._selected === this property alias iconSize : mainIcon.iconSize + property alias overwriteColor: mainIcon.overwriteColor // --------------------------------------------------------------------------- @@ -68,11 +69,7 @@ Rectangle { Icon { id:mainIcon - icon: entry.icon + ( - entry.isSelected - ? '_selected' - : '_normal' - ) + icon: entry.icon iconSize: ApplicationMenuStyle.entry.iconSize } diff --git a/linphone-app/ui/modules/Common/Menus/Menu.qml b/linphone-app/ui/modules/Common/Menus/Menu.qml index b06ea282f..4cc756dc9 100644 --- a/linphone-app/ui/modules/Common/Menus/Menu.qml +++ b/linphone-app/ui/modules/Common/Menus/Menu.qml @@ -11,7 +11,7 @@ Controls.Menu { property var menuStyle : MenuStyle.normal background: Rectangle { - implicitWidth: menuStyle.width + implicitWidth: menu.width color: menuStyle.color radius: menuStyle.radius diff --git a/linphone-app/ui/modules/Common/Menus/MenuItem.qml b/linphone-app/ui/modules/Common/Menus/MenuItem.qml index 4ed98f3d5..4f1bdb4d6 100644 --- a/linphone-app/ui/modules/Common/Menus/MenuItem.qml +++ b/linphone-app/ui/modules/Common/Menus/MenuItem.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.2 as Controls +import QtQuick.Controls 2.3 as Controls //2.3 for menu property (Qt 5.10) import QtQuick.Layouts 1.3 import Common 1.0 @@ -15,6 +15,7 @@ Controls.MenuItem { id: button property alias iconMenu : iconArea.icon property alias iconSizeMenu : iconArea.iconSize + property alias iconOverwriteColorMenu: iconArea.overwriteColor property alias iconLayoutDirection : rowArea.layoutDirection property var menuItemStyle : MenuItemStyle.normal @@ -24,6 +25,8 @@ Controls.MenuItem { height:visible?undefined:0 + Component.onCompleted: menu.width = Math.max(menu.width, implicitWidth) + background: Rectangle { color: button.down ? menuItemStyle.background.color.pressed @@ -36,13 +39,22 @@ Controls.MenuItem { } contentItem:RowLayout{ id:rowArea - spacing:20 + spacing:15 Icon{ id: iconArea visible: icon width: icon?iconSize:0 Layout.leftMargin:(iconLayoutDirection == Qt.LeftToRight ? menuItemStyle.leftMargin : 0) Layout.rightMargin:(iconLayoutDirection == Qt.LeftToRight ? 0 : menuItemStyle.rightMargin) + overwriteColor: button.enabled + ? (button.down + ? menuItemStyle.text.color.pressed + : ( + button.hovered + ? menuItemStyle.text.color.hovered + : menuItemStyle.text.color.normal + )) + : menuItemStyle.text.color.disabled } Text { id:rowText @@ -52,12 +64,12 @@ Controls.MenuItem { Layout.rightMargin:(iconLayoutDirection == Qt.LeftToRight ? menuItemStyle.rightMargin : 0) color: button.enabled ? (button.down - ? menuItemStyle.text.color.pressed - : ( - button.hovered - ? menuItemStyle.text.color.hovered - : menuItemStyle.text.color.normal - )) + ? menuItemStyle.text.color.pressed + : ( + button.hovered + ? menuItemStyle.text.color.hovered + : menuItemStyle.text.color.normal + )) : menuItemStyle.text.color.disabled elide: Text.ElideRight @@ -84,7 +96,7 @@ Controls.MenuItem { propagateComposedEvents:true acceptedButtons: Qt.NoButton cursorShape: parent.hovered - ? Qt.PointingHandCursor - : Qt.ArrowCursor + ? Qt.PointingHandCursor + : Qt.ArrowCursor } } diff --git a/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml b/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml index fefaab20a..98aaaa2ed 100644 --- a/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml @@ -4,7 +4,8 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Busy_indicator", "i").color - property int duration: 1250 - property int nSpheres: 6 + property string sectionName: 'Busy' + property color color: ColorsList.add(sectionName+'_indicator', 'i').color + property int duration: 1250 + property int nSpheres: 6 } diff --git a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml index 2a2f60fc0..b36ccb900 100644 --- a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml @@ -7,31 +7,48 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Dialog", "k").color - - property QtObject buttons: QtObject { - property int bottomMargin: 30 - property int leftMargin: 50 - property int rightMargin: 50 - property int spacing: 20 - property int topMargin: 15 - } - - property QtObject confirmDialog: QtObject { - property int height: 200 - property int width: 400 - } - - property QtObject content: QtObject { - property int leftMargin: 25 - property int rightMargin: 25 - } - - property QtObject description: QtObject { - property color color: ColorsList.add("Dialog_description", "j").color - property int leftMargin: 50 - property int pointSize: Units.dp * 11 - property int rightMargin: 50 - property int verticalMargin: 25 - } + property string sectionName : 'Dialog' + property color color: ColorsList.add(sectionName, 'k').color + + property QtObject title: QtObject { + property color lowGradient: ColorsList.add(sectionName+'_title_gradient_low', 'y').color + property color highGradient: ColorsList.add(sectionName+'_title_gradient_high', 'z').color + } + + property QtObject buttons: QtObject { + property int bottomMargin: 30 + property int leftMargin: 50 + property int rightMargin: 50 + property int spacing: 20 + property int topMargin: 15 + } + + property QtObject confirmDialog: QtObject { + property int height: 200 + property int width: 400 + } + + property QtObject content: QtObject { + property int leftMargin: 25 + property int rightMargin: 25 + } + + property QtObject description: QtObject { + property color color: ColorsList.add(sectionName+'_description', 'j').color + property int leftMargin: 50 + property int pointSize: Units.dp * 11 + property int rightMargin: 50 + property int verticalMargin: 25 + } + property QtObject closeButton: QtObject { + property int iconSize: 20 + property string name : 'close' + property string icon : 'close_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg').color + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/ActionSwitchStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ActionSwitchStyle.qml new file mode 100644 index 000000000..9cf73a149 --- /dev/null +++ b/linphone-app/ui/modules/Common/Styles/Form/ActionSwitchStyle.qml @@ -0,0 +1,7 @@ +pragma Singleton +import QtQml 2.2 + +// ============================================================================= + +QtObject { +} diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml index a953d835a..0f48a97af 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml @@ -5,14 +5,15 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int buttonsSpacing: 8 - - property QtObject button: QtObject { - property QtObject color: QtObject { - property color hovered: ColorsList.add("Exclusive_button_hovered", "n").color - property color normal: ColorsList.add("Exclusive_button_normal", "x").color - property color pressed: ColorsList.add("Exclusive_button_pressed", "i").color - property color selected: ColorsList.add("Exclusive_button_selected", "g").color - } - } + property string sectionName: 'ExclusiveButtons' + property int buttonsSpacing: 8 + + property QtObject button: QtObject { + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_h', 'n').color + property color normal: ColorsList.add(sectionName+'_n', 'x').color + property color pressed: ColorsList.add(sectionName+'_p', 'i').color + property color selected: ColorsList.add(sectionName+'_c', 'g').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml index df73c3c46..49b63c3bb 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml @@ -5,17 +5,40 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject tools: QtObject { - property int width: 30 - - property QtObject button: QtObject { - property int iconSize: 16 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("FileChooser_hovered", "c").color - property color normal: ColorsList.add("FileChooser_normal", "f").color - property color pressed: ColorsList.add("FileChooser_pressed", "c").color - } - } - } + property string sectionName: 'FileChooser' + property QtObject tools: QtObject { + property int width: 30 + + property QtObject button: QtObject { + property int iconSize: 16 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_h', 'c').color + property color normal: ColorsList.add(sectionName+'_n', 'f').color + property color pressed: ColorsList.add(sectionName+'_p', 'c').color + } + } + } + property QtObject file: QtObject { + property int iconSize: 30 + property string name : 'file' + property string icon : 'file_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } + property QtObject folder: QtObject { + property int iconSize: 30 + property string name : 'folder' + property string icon : 'folder_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml index 0b8cdb01e..7224c1e81 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml @@ -7,22 +7,23 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int leftPadding: 5 - property int rightPadding: 5 - - property QtObject background: QtObject { - property int height: 22 - property int radius: 20 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("SmallButton_background_hovered", "c").color - property color normal: ColorsList.add("SmallButton_background_normal", "f").color - property color pressed: ColorsList.add("SmallButton_background_pressed", "i").color - } - } - - property QtObject text: QtObject { - property color color: ColorsList.add("SmallButton_text", "q").color - property int pointSize: Units.dp * 8 - } + property string sectionName: 'SmallButton' + property int leftPadding: 5 + property int rightPadding: 5 + + property QtObject background: QtObject { + property int height: 22 + property int radius: 20 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_bg_h', 'c').color + property color normal: ColorsList.add(sectionName+'_bg_n', 'f').color + property color pressed: ColorsList.add(sectionName+'_bg_p', 'i').color + } + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'q').color + property int pointSize: Units.dp * 8 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml index 0b32989de..ea0adee6b 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml @@ -6,18 +6,19 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'TextButtonA' property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add("TextButton_background_disabled", "o").color - property color hovered: ColorsList.add("TextButton_background_hovered", "j").color - property color normal: ColorsList.add("TextButton_background_normal", "r").color - property color pressed: ColorsList.add("TextButton_background_pressed", "i").color + property color disabled: ColorsList.add(sectionName+'_bg_d', 'o').color + property color hovered: ColorsList.add(sectionName+'_bg_h', 'j').color + property color normal: ColorsList.add(sectionName+'_bg_n', 'r').color + property color pressed: ColorsList.add(sectionName+'_bg_p', 'i').color } property QtObject textColor: QtObject { - property color disabled: ColorsList.add("TextButton_text_disabled", "q").color - property color hovered: ColorsList.add("TextButton_text_hovered", "q").color - property color normal: ColorsList.add("TextButton_text_normal", "q").color - property color pressed: ColorsList.add("TextButton_text_pressed", "q").color + property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color + property color normal: ColorsList.add(sectionName+'_text_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color } property QtObject borderColor : backgroundColor } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml index d578d9822..710527c77 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml @@ -5,18 +5,19 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add("TextButtonB_background_disabled", "i30").color - property color hovered: ColorsList.add("TextButtonB_background_hovered", "b").color - property color normal: ColorsList.add("TextButtonB_background_normal", "i").color - property color pressed: ColorsList.add("TextButtonB_background_pressed", "m").color - } - - property QtObject textColor: QtObject { - property color disabled: ColorsList.add("TextButtonB_text_disabled", "q").color - property color hovered: ColorsList.add("TextButtonB_text_hovered", "q").color - property color normal: ColorsList.add("TextButtonB_text_normal", "q").color - property color pressed: ColorsList.add("TextButtonB_text_pressed", "q").color - } - property QtObject borderColor : backgroundColor + property string sectionName: 'TextButtonB' + property QtObject backgroundColor: QtObject { + property color disabled: ColorsList.add(sectionName+'_bg_d', 'i30').color + property color hovered: ColorsList.add(sectionName+'_bg_h', 'b').color + property color normal: ColorsList.add(sectionName+'_bg_n', 'i').color + property color pressed: ColorsList.add(sectionName+'_bg_p', 'm').color + } + + property QtObject textColor: QtObject { + property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color + property color normal: ColorsList.add(sectionName+'_text_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color + } + property QtObject borderColor : backgroundColor } diff --git a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index e9f04069a..2ce766fe5 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -7,13 +7,14 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int pointSize: Units.dp * 10 - property int radius: 3 - property int size: 18 - - property QtObject color: QtObject { - property color pressed: ColorsList.add("CheckBox_pressed", "i").color - property color hovered: ColorsList.add("CheckBox_hovered", "h").color - property color normal: ColorsList.add("CheckBox_normal", "g").color - } + property string sectionName: 'CheckBox' + property int pointSize: Units.dp * 10 + property int radius: 3 + property int size: 18 + + property QtObject color: QtObject { + property color pressed: ColorsList.add(sectionName+'_p', 'i').color + property color hovered: ColorsList.add(sectionName+'_h', 'h').color + property color normal: ColorsList.add(sectionName+'_n', 'g').color + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml index 870e3ef19..769b6bcfa 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml @@ -6,31 +6,39 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject background: QtObject { - property int height: 36 - property int iconSize: 10 - property int radius: 4 - property int width: 200 - - property QtObject border: QtObject { - property color color: ColorsList.add("ComboBox_border_normal", "c").color - property int width: 1 - } - - property QtObject color: QtObject { - property color normal: ColorsList.add("ComboBox_normal", "q").color - property color readOnly: ColorsList.add("ComboBox_readonly", "e").color - } - } - - property QtObject contentItem: QtObject { - property int iconSize: 20 - property int leftMargin: 10 - property int spacing: 5 - - property QtObject text: QtObject { - property color color: ColorsList.add("ComboBox_text_normal", "d").color - property int pointSize: Units.dp * 10 - } - } + property string sectionName: 'ComboBox' + property QtObject indicator: QtObject{ + property QtObject dropDown : QtObject{ + property string icon: 'drop_down_custom' + property int iconSize: 20 + property color color: ColorsList.addImageColor(sectionName+'_indicator', icon, 'l_n_b_fg').color + } + } + property QtObject background: QtObject { + property int height: 36 + property int iconSize: 10 + property int radius: 4 + property int width: 200 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_border_n', 'c').color + property int width: 1 + } + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_normal', 'q').color + property color readOnly: ColorsList.add(sectionName+'_readonly', 'e').color + } + } + + property QtObject contentItem: QtObject { + property int iconSize: 20 + property int leftMargin: 10 + property int spacing: 5 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text_n', 'd').color + property int pointSize: Units.dp * 10 + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml index 13fbb278f..0de4f88f3 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml @@ -7,28 +7,29 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject color: QtObject { - property color hovered: ColorsList.add("CommonItem_hovered", "o").color - property color normal: ColorsList.add("CommonItem_normal", "q").color - } - - property QtObject contentItem: QtObject { - property int iconSize: 20 - property int spacing: 5 - - property QtObject text: QtObject { - property color color: ColorsList.add("CommonItem_text", "d").color - property int pointSize: Units.dp * 10 - } - } - - property QtObject indicator: QtObject { - property color color: ColorsList.add("CommonItem_indicator", "i").color - property int width: 5 - } - - property QtObject separator: QtObject { - property color color: ColorsList.add("CommonItem_separator", "c").color - property int height: 1 - } + property string sectionName: 'CommonItemDelegate' + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_h', 'o').color + property color normal: ColorsList.add(sectionName+'_n', 'q').color + } + + property QtObject contentItem: QtObject { + property int iconSize: 20 + property int spacing: 5 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'd').color + property int pointSize: Units.dp * 10 + } + } + + property QtObject indicator: QtObject { + property color color: ColorsList.add(sectionName+'_indicator', 'i').color + property int width: 5 + } + + property QtObject separator: QtObject { + property color color: ColorsList.add(sectionName+'_separator', 'c').color + property int height: 1 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml index 9f566f03d..fad890de4 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml @@ -7,25 +7,67 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("DroppableTextArea_Chat_background", "e").color - property color outsideBackgroundColor: ColorsList.add("DroppableTextArea_Chat_outsideBackground", "aa").color - - property QtObject fileChooserButton: QtObject { - property int margins: 6 - property int size: 20 - } - - property QtObject hoverContent: QtObject { - property color backgroundColor: ColorsList.add("DroppableTextArea_Chat_hoverContent_background", "q").color - - property QtObject text: QtObject { - property color color: ColorsList.add("DroppableTextArea_Chat_hoverContent_text", "i").color - property int pointSize: Units.dp * 11 - } - } - - property QtObject text: QtObject { - property color color: ColorsList.add("DroppableTextArea_Chat_text", "d").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'DroppableTextArea' + property color backgroundColor: ColorsList.add(sectionName+'_Chat_bg', 'e').color + property color outsideBackgroundColor: ColorsList.add(sectionName+'_Chat_outsideBackground', 'aa').color + + property QtObject ephemeralTimer: QtObject{ + property string icon: 'timer_custom' + property int iconSize : 30 + property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color + } + + property QtObject fileChooserButton: QtObject { + property int margins: 6 + property int iconSize: 40 + property string icon : 'attachment_custom' + property string name : 'attachment' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + + } + property QtObject chatMicro: QtObject { + property int margins: 6 + property int iconSize: 40 + property string name : 'micro' + property string icon : 'chat_micro_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + + } + property QtObject send: QtObject { + property int margins: 6 + property int iconSize: 40 + property string name : 'send' + property string icon : 'send_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + + } + + property QtObject hoverContent: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_Chat_hoverContent_bg', 'q').color + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_Chat_hoverContent_text', 'i').color + property int pointSize: Units.dp * 11 + } + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_Chat_text', 'd').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml index 4d41ad9f5..df6a2bf66 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml @@ -7,19 +7,20 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject tools: QtObject { - property int width: 20 - - property QtObject button: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("NumericField_normal", "f").color - property color pressed: ColorsList.add("NumericField_pressed", "c").color - } - - property QtObject text: QtObject { - property color color: ColorsList.add("NumericField_text", "d").color - property int pointSize: Units.dp * 9 - } - } - } + property string sectionName: 'NumericField' + property QtObject tools: QtObject { + property int width: 20 + + property QtObject button: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_n', 'f').color + property color pressed: ColorsList.add(sectionName+'_p', 'c').color + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'd').color + property int pointSize: Units.dp * 9 + } + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml index 5caa8c8e7..cdd004038 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml @@ -7,26 +7,27 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject background: QtObject { - property int height: 36 - property int width: 200 - - property int radius: 4 - - property QtObject border: QtObject { - property color color: ColorsList.add("TextAreaField_background_border", "c").color - property int width: 1 - } - - property QtObject color: QtObject { - property color normal: ColorsList.add("TextAreaField_background_normal", "q").color - property color readOnly: ColorsList.add("TextAreaField_background_reeadOnly", "e").color - } - } - - property QtObject text: QtObject { - property color color: ColorsList.add("TextAreaField_text", "d").color - property int pointSize: Units.dp * 10 - property int padding: 8 - } + property string sectionName: 'TextAreaField' + property QtObject background: QtObject { + property int height: 36 + property int width: 200 + + property int radius: 4 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_bg_border', 'c').color + property int width: 1 + } + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_bg_n', 'q').color + property color readOnly: ColorsList.add(sectionName+'_bg_readOnly', 'e').color + } + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'd').color + property int pointSize: Units.dp * 10 + property int padding: 8 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml index 5b399e9c9..76e6b3745 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml @@ -6,6 +6,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'TextField' property QtObject normal : QtObject { property QtObject background: QtObject { property int height: 36 @@ -15,22 +16,22 @@ QtObject { property QtObject border: QtObject { property QtObject color: QtObject { - property color error: ColorsList.add("TextField_normal_background_border_error", "error").color - property color normal: ColorsList.add("TextField_normal_background_border_normal", "c").color - property color selected: ColorsList.add("TextField_normal_background_border_selected", "i").color + property color error: ColorsList.add(sectionName+'_n_bg_border_error', 'error').color + property color normal: ColorsList.add(sectionName+'_n_bg_border_n', 'c').color + property color selected: ColorsList.add(sectionName+'_n_bg_border_c', 'i').color } property int width: 1 } property QtObject color: QtObject { - property color normal: ColorsList.add("TextField_normal_background_normal", "q").color - property color readOnly: ColorsList.add("TextField_normal_background_readonly", "e").color + property color normal: ColorsList.add(sectionName+'_n_bg_n', 'q').color + property color readOnly: ColorsList.add(sectionName+'_n_bg_readonly', 'e').color } } property QtObject text: QtObject { - property color color: ColorsList.add("TextField_normal_text", "d").color + property color color: ColorsList.add(sectionName+'_n_text', 'd').color property int pointSize: Units.dp * 10 property int rightPadding: 10 } @@ -44,22 +45,22 @@ QtObject { property QtObject border: QtObject { property QtObject color: QtObject { - property color error: "black" - property color normal: "black" - property color selected: "black" + property color error: 'black' + property color normal: 'black' + property color selected: 'black' } property int width: 0 } property QtObject color: QtObject { - property color normal: ColorsList.add("TextField_unbordered_background_normal", "q").color - property color readOnly: ColorsList.add("TextField_unbordered_background_readonly", "e").color + property color normal: ColorsList.add(sectionName+'_unbordered_bg_n', 'q').color + property color readOnly: ColorsList.add(sectionName+'_unbordered_bg_readonly', 'e').color } } property QtObject text: QtObject { - property color color: ColorsList.add("TextField_unbordered_text", "d").color + property color color: ColorsList.add(sectionName+'_unbordered_text', 'd').color property int pointSize: Units.dp * 10 property int rightPadding: 10 } @@ -73,22 +74,22 @@ QtObject { property QtObject border: QtObject { property QtObject color: QtObject { - property color error: "black" - property color normal: "black" - property color selected: "black" + property color error: 'black' + property color normal: 'black' + property color selected: 'black' } property int width: 0 } property QtObject color: QtObject { - property color normal: ColorsList.add("TextField_flat_background_normal", "q").color - property color readOnly: ColorsList.add("TextField_flat_background_readonly", "e").color + property color normal: ColorsList.add(sectionName+'_flat_bg_n', 'q').color + property color readOnly: ColorsList.add(sectionName+'_flat_bg_readonly', 'e').color } } property QtObject text: QtObject { - property color color: ColorsList.add("TextField_flat_text", "d").color + property color color: ColorsList.add(sectionName+'_flat_text', 'd').color property int pointSize: Units.dp * 10 property int rightPadding: 10 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml index 2fe287c0a..abe2e68b0 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -7,27 +7,39 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int lineHeight: 35 - - property QtObject value: QtObject { - property QtObject placeholder: QtObject { - property color color: ColorsList.add("ListForm_placeholder", "n").color - property int pointSize: Units.dp * 10 - } - - property QtObject text: QtObject { - property int padding: 10 - } - } - - property QtObject titleArea: QtObject { - property int spacing: 10 - property int iconSize: 18 - - property QtObject text: QtObject { - property color color: ColorsList.add("ListForm_text", "j").color - property int pointSize: Units.dp * 9 - property int width: 130 - } - } + property int lineHeight: 35 + property string sectionName : 'ListForm' + property QtObject value: QtObject { + property QtObject placeholder: QtObject { + property color color: ColorsList.add(sectionName+'_placeholder', 'n').color + property int pointSize: Units.dp * 10 + } + + property QtObject text: QtObject { + property int padding: 10 + } + } + + property QtObject titleArea: QtObject { + property int spacing: 10 + property int iconSize: 18 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'j').color + property int pointSize: Units.dp * 9 + property int width: 130 + } + property QtObject add: QtObject { + property int iconSize: 18 + property string name : 'add' + property string icon : 'add_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml index eb8c60175..af1f9ed22 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml @@ -7,16 +7,17 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 20 - - property QtObject content: QtObject { - property int maxWidth: 400 - } - - property QtObject legend: QtObject { - property color color: ColorsList.add("FormHGroup_legend", "j").color - property int pointSize: Units.dp * 10 - property int height: 36 - property int width: 200 - } + property string sectionName: 'FormHGroup' + property int spacing: 20 + + property QtObject content: QtObject { + property int maxWidth: 400 + } + + property QtObject legend: QtObject { + property color color: ColorsList.add(sectionName+'_legend', 'j').color + property int pointSize: Units.dp * 10 + property int height: 36 + property int width: 200 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml index 634db4bf9..9a1df36da 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml @@ -7,20 +7,44 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 10 - - property QtObject header: QtObject { - property int bottomMargin: 5 - property int spacing: 5 - - property QtObject separator: QtObject { - property color color: ColorsList.add("Form_header_separator", "i").color - property int height: 2 - } - - property QtObject title: QtObject { - property color color: ColorsList.add("Form_header_title", "i").color - property int pointSize: Units.dp * 12 - } - } + property int spacing: 10 + property string sectionName : 'Form' + + property QtObject header: QtObject { + property int bottomMargin: 5 + property int spacing: 5 + + property QtObject separator: QtObject { + property color color: ColorsList.add(sectionName+'_header_separator', 'i').color + property int height: 2 + } + + property QtObject title: QtObject { + property color color: ColorsList.add(sectionName+'_header_title', 'i').color + property int pointSize: Units.dp * 12 + } + property QtObject add: QtObject { + property int iconSize: 38 + property string name : 'add' + property string icon : 'add_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + + } + property QtObject deleteAction: QtObject { + property int iconSize: 38 + property string name : 'delete' + property string icon : 'delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml index 51c7d7cce..8ed4c0575 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml @@ -7,16 +7,17 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 10 - - property QtObject entry: QtObject { - property int height: 36 - property int width: 200 - property int maxWidth: 400 - - property QtObject text: QtObject { - property color color: ColorsList.add("Form_entry_text", "j").color - property int pointSize: Units.dp * 10 - } - } + property string sectionName: 'FormTable' + property int spacing: 10 + + property QtObject entry: QtObject { + property int height: 36 + property int width: 200 + property int maxWidth: 400 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_entry_text', 'j').color + property int pointSize: Units.dp * 10 + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml index 6703974dd..4a98eb8f3 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml @@ -7,20 +7,21 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 5 - - property QtObject content: QtObject { - property int maxWidth: 400 - } - - property QtObject error: QtObject { - property color color: ColorsList.add("FormV_error", "error").color - property int pointSize: Units.dp * 10 - property int height: 11 - } - - property QtObject legend: QtObject { - property color color: ColorsList.add("FormV_legend", "j").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'FormVGroup' + property int spacing: 5 + + property QtObject content: QtObject { + property int maxWidth: 400 + } + + property QtObject error: QtObject { + property color color: ColorsList.add(sectionName+'_error', 'error').color + property int pointSize: Units.dp * 10 + property int height: 11 + } + + property QtObject legend: QtObject { + property color color: ColorsList.add(sectionName+'_legend', 'j').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml index f94598233..16f544505 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml @@ -5,5 +5,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color shadowColor: ColorsList.add("SearchBox_shadow", "l").color + property string sectionName: 'SearchBox' + property color shadowColor: ColorsList.add(sectionName+'_shadow', 'l').color + property color iconColor: ColorsList.add(sectionName+'_icon', 'c').color } diff --git a/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml index 089fb9bbb..cdc48d136 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml @@ -5,33 +5,34 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject background: QtObject { - property color color: ColorsList.add("Slider_background", "c").color - property int height: 4 - property int radius: 2 - property int width: 200 - - property QtObject content: QtObject { - property color color: ColorsList.add("Slider_content", "m").color - property int radius: 2 - } - } - - property QtObject handle: QtObject { - property int height: 16 - property int radius: 13 - property int width: 16 - - property QtObject border: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("Slider_handle_border_normal", "c").color - property color pressed: ColorsList.add("Slider_handle_border_pressed", "c").color - } - } - - property QtObject color: QtObject { - property color normal: ColorsList.add("Slider_handle_normal", "e").color - property color pressed: ColorsList.add("Slider_handle_pressed", "f").color - } - } + property string sectionName: 'Slider' + property QtObject background: QtObject { + property color color: ColorsList.add(sectionName+'_bg', 'c').color + property int height: 4 + property int radius: 2 + property int width: 200 + + property QtObject content: QtObject { + property color color: ColorsList.add(sectionName+'_content', 'm').color + property int radius: 2 + } + } + + property QtObject handle: QtObject { + property int height: 16 + property int radius: 13 + property int width: 16 + + property QtObject border: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_handle_border_n', 'c').color + property color pressed: ColorsList.add(sectionName+'_handle_border_p', 'c').color + } + } + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_handle_n', 'e').color + property color pressed: ColorsList.add(sectionName+'_handle_p', 'f').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml index 89ee98103..28c0a37d4 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml @@ -4,6 +4,7 @@ import ColorsList 1.0 // ============================================================================= QtObject{ + property string sectionName: 'Switch' property QtObject normal :QtObject { property QtObject animation: QtObject { property int duration: 200 @@ -15,16 +16,16 @@ QtObject{ property int width: 48 property QtObject border: QtObject { property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_normal_indicator_border_checked", "i").color - property color disabled: ColorsList.add("Switch_normal_indicator_border_disabled", "c").color - property color normal: ColorsList.add("Switch_normal_indicator_border_normal", "c").color + property color checked: ColorsList.add(sectionName+'_n_indicator_border_c', 'i').color + property color disabled: ColorsList.add(sectionName+'_n_indicator_border_d', 'c').color + property color normal: ColorsList.add(sectionName+'_n_indicator_border_n', 'c').color } } property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_normal_indicator_checked", "i").color - property color disabled: ColorsList.add("Switch_normal_indicator_disabled", "e").color - property color normal: ColorsList.add("Switch_normal_indicator_normal", "q").color + property color checked: ColorsList.add(sectionName+'_n_indicator_c', 'i').color + property color disabled: ColorsList.add(sectionName+'_n_indicator_d', 'e').color + property color normal: ColorsList.add(sectionName+'_n_indicator_n', 'q').color } } @@ -33,17 +34,17 @@ QtObject{ property QtObject border: QtObject { property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_normal_sphere_border_checked", "i").color - property color disabled: ColorsList.add("Switch_normal_sphere_border_disabled", "c").color - property color normal: ColorsList.add("Switch_normal_sphere_border_normal", "n").color - property color pressed: ColorsList.add("Switch_normal_sphere_border_pressed", "n").color + property color checked: ColorsList.add(sectionName+'_n_sphere_border_c', 'i').color + property color disabled: ColorsList.add(sectionName+'_n_sphere_border_d', 'c').color + property color normal: ColorsList.add(sectionName+'_n_sphere_border_n', 'n').color + property color pressed: ColorsList.add(sectionName+'_n_sphere_border_p', 'n').color } } property QtObject color: QtObject { - property color pressed: ColorsList.add("Switch_normal_sphere_pressed", "c").color - property color disabled: ColorsList.add("Switch_normal_sphere_disabled", "e").color - property color normal: ColorsList.add("Switch_normal_sphere_normal", "q").color + property color pressed: ColorsList.add(sectionName+'_n_sphere_p', 'c').color + property color disabled: ColorsList.add(sectionName+'_n_sphere_d', 'e').color + property color normal: ColorsList.add(sectionName+'_n_sphere_n', 'q').color } } } @@ -58,16 +59,16 @@ QtObject{ property int width: 48 property QtObject border: QtObject { property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_aux_indicator_border_checked", "s").color - property color disabled: ColorsList.add("Switch_aux_indicator_border_disabled", "c").color - property color normal: ColorsList.add("Switch_aux_indicator_border_normal", "c").color + property color checked: ColorsList.add(sectionName+'_aux_indicator_border_c', 's').color + property color disabled: ColorsList.add(sectionName+'_aux_indicator_border_d', 'c').color + property color normal: ColorsList.add(sectionName+'_aux_indicator_border_n', 'c').color } } property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_aux_indicator_checked", "s").color - property color disabled: ColorsList.add("Switch_aux_indicator_disabled", "e").color - property color normal: ColorsList.add("Switch_aux_indicator_normal", "q").color + property color checked: ColorsList.add(sectionName+'_aux_indicator_c', 's').color + property color disabled: ColorsList.add(sectionName+'_aux_indicator_d', 'e').color + property color normal: ColorsList.add(sectionName+'_aux_indicator_n', 'q').color } } @@ -76,17 +77,17 @@ QtObject{ property QtObject border: QtObject { property QtObject color: QtObject { - property color checked: ColorsList.add("Switch_aux_sphere_border_checked", "s").color - property color disabled: ColorsList.add("Switch_aux_sphere_border_disabled", "c").color - property color normal: ColorsList.add("Switch_aux_sphere_border_normal", "n").color - property color pressed: ColorsList.add("Switch_aux_sphere_border_pressed", "n").color + property color checked: ColorsList.add(sectionName+'_aux_sphere_border_c', 's').color + property color disabled: ColorsList.add(sectionName+'_aux_sphere_border_d', 'c').color + property color normal: ColorsList.add(sectionName+'_aux_sphere_border_n', 'n').color + property color pressed: ColorsList.add(sectionName+'_aux_sphere_border_p', 'n').color } } property QtObject color: QtObject { - property color pressed: ColorsList.add("Switch_aux_sphere_pressed", "c").color - property color disabled: ColorsList.add("Switch_aux_sphere_disabled", "e").color - property color normal: ColorsList.add("Switch_aux_sphere_normal", "q").color + property color pressed: ColorsList.add(sectionName+'_aux_sphere_p', 'c').color + property color disabled: ColorsList.add(sectionName+'_aux_sphere_d', 'e').color + property color normal: ColorsList.add(sectionName+'_aux_sphere_n', 'q').color } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml index 8d5f037a1..29f96518e 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml @@ -7,32 +7,39 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 8 - - property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add("TabButton_background_disabled", "i30").color - property color hovered: ColorsList.add("TabButton_background_hovered", "b").color - property color normal: ColorsList.add("TabButton_background_normal", "i").color - property color pressed: ColorsList.add("TabButton_background_pressed", "m").color - property color selected: ColorsList.add("TabButton_background_selected", "k").color - } - - property QtObject icon: QtObject { - property int size: 20 - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 9 - property int height: 40 - property int leftPadding: 10 - property int rightPadding: 10 - - property QtObject color: QtObject { - property color disabled: ColorsList.add("TabButton_text_disabled", "q").color - property color hovered: ColorsList.add("TabButton_text_hovered", "q").color - property color normal: ColorsList.add("TabButton_text_normal", "q").color - property color pressed: ColorsList.add("TabButton_text_pressed", "q").color - property color selected: ColorsList.add("TabButton_text_selected", "i").color - } - } + property string sectionName: 'TabButton' + property int spacing: 8 + + property QtObject backgroundColor: QtObject { + property color disabled: ColorsList.add(sectionName+'_bg_d', 'i30').color + property color hovered: ColorsList.add(sectionName+'_bg_h', 'b').color + property color normal: ColorsList.add(sectionName+'_bg_n', 'i').color + property color pressed: ColorsList.add(sectionName+'_bg_p', 'm').color + property color selected: ColorsList.add(sectionName+'_bg_c', 'k').color + } + + property QtObject icon: QtObject { + property int size: 20 + property string sipAccountsIcon: 'settings_sip_accounts_custom' + property string audioIcon: 'settings_audio_custom' + property string videoIcon: 'settings_video_custom' + property string callIcon: 'settings_call_custom' + property string networkIcon: 'settings_network_custom' + property string advancedIcon: 'settings_advanced_custom' + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 9 + property int height: 40 + property int leftPadding: 10 + property int rightPadding: 10 + + property QtObject color: QtObject { + property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color + property color normal: ColorsList.add(sectionName+'_text_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color + property color selected: ColorsList.add(sectionName+'_text_c', 'i').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml index ddde5ee95..93b62988b 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml @@ -5,14 +5,15 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("TabContainer", "k").color - property int bottomMargin: 30 - property int leftMargin: 30 - property int rightMargin: 40 - property int topMargin: 30 - - property QtObject separator: QtObject { - property int height: 2 - property color color: ColorsList.add("TabContainer_separator", "f").color - } + property string sectionName: 'TabContainer' + property color color: ColorsList.add(sectionName+'', 'k').color + property int bottomMargin: 30 + property int leftMargin: 30 + property int rightMargin: 40 + property int topMargin: 30 + + property QtObject separator: QtObject { + property int height: 2 + property color color: ColorsList.add(sectionName+'_separator', 'f').color + } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml index f40b6d5d1..72aeb810b 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml @@ -7,21 +7,22 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("TabTransparentTextInput_background", "f").color - property int iconSize: 12 - property int padding: 10 - - property QtObject placeholder: QtObject { - property color color: ColorsList.add("TabTransparentTextInput_palceholder", "n").color - property int pointSize: Units.dp * 10 - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 10 - - property QtObject color: QtObject { - property color focused: ColorsList.add("TabTransparentTextInput_text_focused", "l").color - property color normal: ColorsList.add("TabTransparentTextInput_text_normal", "d").color - } - } + property string sectionName: 'TransparentTextInput' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color + property int iconSize: 12 + property int padding: 10 + + property QtObject placeholder: QtObject { + property color color: ColorsList.add(sectionName+'_palceholder', 'n').color + property int pointSize: Units.dp * 10 + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 10 + + property QtObject color: QtObject { + property color focused: ColorsList.add(sectionName+'_text_focused', 'l').color + property color normal: ColorsList.add(sectionName+'_text_n', 'd').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml index 828a8e7ce..84e381479 100644 --- a/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml @@ -6,32 +6,33 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 40 - property int width: 5 - - property QtObject high: QtObject { - property QtObject background: QtObject { - property QtObject color: QtObject { - property color disabled: ColorsList.add("VuMeter_background_disabled", "o").color - property color enabled: ColorsList.add("VuMeter_background_enabled", "n").color - } - } - - property QtObject contentItem: QtObject { - property color color: ColorsList.add("VuMeter_contentItem", "b").color - } - } - - property QtObject low: QtObject { - property QtObject background: QtObject { - property QtObject color: QtObject { - property color disabled: ColorsList.add("VuMeter_low_background_disabled", "o").color - property color enabled: ColorsList.add("VuMeter_low_background_enabled", "n").color - } - } - - property QtObject contentItem: QtObject { - property color color: ColorsList.add("VuMeter_low_contentItem", "j").color - } - } + property string sectionName: 'VuMeter' + property int height: 40 + property int width: 5 + + property QtObject high: QtObject { + property QtObject background: QtObject { + property QtObject color: QtObject { + property color disabled: ColorsList.add(sectionName+'_bg_d', 'o').color + property color enabled: ColorsList.add(sectionName+'_bg_enabled', 'n').color + } + } + + property QtObject contentItem: QtObject { + property color color: ColorsList.add(sectionName+'_contentItem', 'b').color + } + } + + property QtObject low: QtObject { + property QtObject background: QtObject { + property QtObject color: QtObject { + property color disabled: ColorsList.add(sectionName+'_low_bg_d', 'o').color + property color enabled: ColorsList.add(sectionName+'_low_bg_enabled', 'n').color + } + } + + property QtObject contentItem: QtObject { + property color color: ColorsList.add(sectionName+'_low_contentItem', 'j').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml index 3f50ff93a..46eb5b1c0 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml @@ -7,34 +7,35 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 1 - property color backgroundColor: ColorsList.add("ApplicationMenu_background", "n").color - - property QtObject entry: QtObject { - property int iconSize: 24 - property int leftMargin: 20 - property int rightMargin: 20 - property int spacing: 18 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("ApplicationMenu_entry_hovered", "h").color - property color normal: ColorsList.add("ApplicationMenu_entry_normal", "g").color - property color pressed: ColorsList.add("ApplicationMenu_entry_pressed", "i").color - property color selected: ColorsList.add("ApplicationMenu_entry_selected", "j").color - } - - property QtObject indicator: QtObject { - property color color: ColorsList.add("ApplicationMenu_entry_indicator", "i").color - property int width: 5 - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 10 - - property QtObject color: QtObject { - property color normal: ColorsList.add("ApplicationMenu_entry_text_normal", "q").color - property color selected: ColorsList.add("ApplicationMenu_entry_text_selected", "q").color - } - } - } + property string sectionName: 'ApplicationMenu' + property int spacing: 1 + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'n').color + + property QtObject entry: QtObject { + property int iconSize: 24 + property int leftMargin: 20 + property int rightMargin: 20 + property int spacing: 18 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_entry_h', 'h').color + property color normal: ColorsList.add(sectionName+'_entry_n', 'g').color + property color pressed: ColorsList.add(sectionName+'_entry_p', 'i').color + property color selected: ColorsList.add(sectionName+'_entry_selected', 'j').color + } + + property QtObject indicator: QtObject { + property color color: ColorsList.add(sectionName+'_entry_indicator', 'i').color + property int width: 5 + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 10 + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_entry_text_n', 'q').color + property color selected: ColorsList.add(sectionName+'_entry_text_c', 'q').color + } + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml index eec18bfa5..42d0d6ff2 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml @@ -7,21 +7,22 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 1 - - property QtObject entry: QtObject { - property int leftMargin: 18 - property int rightMargin: 8 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("DropDownMenu_entry_hovered", "j").color - property color normal: ColorsList.add("DropDownMenu_entry_normal", "g").color - property color pressed: ColorsList.add("DropDownMenu_entry_pressed", "i").color - } - - property QtObject text: QtObject { - property color color: ColorsList.add("DropDownMenu_entry_text", "q").color - property int pointSize: Units.dp * 9 - } - } + property string sectionName: 'DropDownStaticMenu' + property int spacing: 1 + + property QtObject entry: QtObject { + property int leftMargin: 18 + property int rightMargin: 8 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_entry_h', 'j').color + property color normal: ColorsList.add(sectionName+'_entry_n', 'g').color + property color pressed: ColorsList.add(sectionName+'_entry_p', 'i').color + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_entry_text', 'q').color + property int pointSize: Units.dp * 9 + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml index a73e61fd3..531eac7b7 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml @@ -8,6 +8,35 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'MenuItem' + + property QtObject speaker: QtObject { + property int iconSize: 30 + property string icon : 'speaker_on_custom' + } + property QtObject copy: QtObject { + property int iconSize: 30 + property string icon : 'menu_copy_text_custom' + } + property QtObject imdn: QtObject { + property int iconSize: 30 + property string icon : 'menu_imdn_info_custom' + } + property QtObject deleteEntry: QtObject { + property int iconSize: 30 + property string icon : 'delete_custom' + } + property QtObject info: QtObject { + property string icon : 'menu_info_custom' + } + property QtObject devices: QtObject { + property string icon : 'menu_devices_custom' + } + property QtObject ephemeral: QtObject { + property string icon : 'menu_ephemeral_custom' + } + + property QtObject normal : QtObject{ property int leftMargin: 5 property int rightMargin: 5 @@ -16,9 +45,9 @@ QtObject { property int height: 30 property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_normal_background_hovered", "o").color - property color normal: ColorsList.add("MenuItem_normal_background_normal", "q").color - property color pressed: ColorsList.add("MenuItem_normal_background_pressed", "o").color + property color hovered: ColorsList.add(sectionName+'_normal_bg_h', 'o').color + property color normal: ColorsList.add(sectionName+'_normal_bg_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_normal_bg_p', 'o').color } } @@ -27,10 +56,10 @@ QtObject { property int weight : Font.Bold property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_normal_text_hovered", "j").color - property color normal: ColorsList.add("MenuItem_normal_text_normal", "j").color - property color pressed: ColorsList.add("MenuItem_normal_text_pressed", "j").color - property color disabled: ColorsList.add("MenuItem_normal_text_disabled", "l50").color + property color hovered: ColorsList.add(sectionName+'_n_text_h', 'j').color + property color normal: ColorsList.add(sectionName+'_n_text_n', 'j').color + property color pressed: ColorsList.add(sectionName+'_n_text_p', 'j').color + property color disabled: ColorsList.add(sectionName+'_n_text_d', 'l50').color } } } @@ -42,9 +71,9 @@ QtObject { property int height: 40 property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_aux_background_hovered", "v").color - property color normal: ColorsList.add("MenuItem_aux_background_normal", "a").color - property color pressed: ColorsList.add("MenuItem_aux_background_pressed", "v").color + property color hovered: ColorsList.add(sectionName+'_aux_bg_h', 'v').color + property color normal: ColorsList.add(sectionName+'_aux_bg_n', 'a').color + property color pressed: ColorsList.add(sectionName+'_aux_bg_p', 'v').color } } @@ -53,10 +82,10 @@ QtObject { property int weight : Font.Normal property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_aux_text_hovered", "j").color - property color normal: ColorsList.add("MenuItem_aux_text_normal", "j").color - property color pressed: ColorsList.add("MenuItem_aux_text_pressed", "j").color - property color disabled: ColorsList.add("MenuItem_aux_text_disabled", "l50").color + property color hovered: ColorsList.add(sectionName+'_aux_text_h', 'j').color + property color normal: ColorsList.add(sectionName+'_aux_text_n', 'j').color + property color pressed: ColorsList.add(sectionName+'_aux_text_p', 'j').color + property color disabled: ColorsList.add(sectionName+'_aux_text_d', 'l50').color } } } @@ -68,9 +97,9 @@ QtObject { property int height: 40 property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_auxRed_background_hovered", "v").color - property color normal: ColorsList.add("MenuItem_auxRed_background_normal", "a").color - property color pressed: ColorsList.add("MenuItem_auxRed_background_pressed", "v").color + property color hovered: ColorsList.add(sectionName+'_auxRed_bg_h', 'v').color + property color normal: ColorsList.add(sectionName+'_auxRed_bg_n', 'a').color + property color pressed: ColorsList.add(sectionName+'_auxRed_bg_p', 'v').color } } @@ -79,10 +108,10 @@ QtObject { property int weight : Font.Normal property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_auxRed_text_hovered", "error").color - property color normal: ColorsList.add("MenuItem_auxRed_text_normal", "error").color - property color pressed: ColorsList.add("MenuItem_auxRed_text_pressed", "error").color - property color disabled: ColorsList.add("MenuItem_auxRed_text_disabled", "l50").color + property color hovered: ColorsList.add(sectionName+'_auxRed_text_h', 'error').color + property color normal: ColorsList.add(sectionName+'_auxRed_text_n', 'error').color + property color pressed: ColorsList.add(sectionName+'_auxRed_text_p', 'error').color + property color disabled: ColorsList.add(sectionName+'_auxRed_text_d', 'l50').color } } } @@ -94,9 +123,9 @@ QtObject { property int height: 50 property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_aux2_background_hovered", "w").color - property color normal: ColorsList.add("MenuItem_aux2_background_normal", "w").color - property color pressed: ColorsList.add("MenuItem_aux2_background_pressed", "v").color + property color hovered: ColorsList.add(sectionName+'_aux2_bg_h', 'w').color + property color normal: ColorsList.add(sectionName+'_aux2_bg_n', 'w').color + property color pressed: ColorsList.add(sectionName+'_aux2_bg_p', 'v').color } } @@ -105,10 +134,10 @@ QtObject { property int weight : Font.Normal property QtObject color: QtObject { - property color hovered: ColorsList.add("MenuItem_aux2_text_hovered", "m").color - property color normal: ColorsList.add("MenuItem_aux2_text_normal", "j").color - property color pressed: ColorsList.add("MenuItem_aux2_text_pressed", "m").color - property color disabled: ColorsList.add("MenuItem_aux2_text_disabled", "l50").color + property color hovered: ColorsList.add(sectionName+'_aux2_text_h', 'm').color + property color normal: ColorsList.add(sectionName+'_aux2_text_n', 'j').color + property color pressed: ColorsList.add(sectionName+'_aux2_text_p', 'm').color + property color disabled: ColorsList.add(sectionName+'_aux2_text_d', 'l50').color } } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml index 8261a1653..7a8e07ce0 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml @@ -6,36 +6,37 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'Menu' property QtObject normal : QtObject { - property color color: ColorsList.add("Menu_normal", "q").color + property color color: ColorsList.add(sectionName+'_n', 'q').color property int width: 130 property bool shadowEnabled: true property int radius : 0 property QtObject border : QtObject { - property color color: "black" + property color color: 'black' property int width: 0 } } property QtObject aux : QtObject { - property color color: ColorsList.add("Menu_aux", "q").color + property color color: ColorsList.add(sectionName+'_aux', 'q').color property int width: 200 property bool shadowEnabled: false property int radius : 5 property QtObject border : QtObject { - property color color: ColorsList.add("Menu_aux_border", "u").color + property color color: ColorsList.add(sectionName+'_aux_border', 'u').color property int width: 1 } } property QtObject aux2 : QtObject { - property color color: ColorsList.add("Menu_aux2", "q").color + property color color: ColorsList.add(sectionName+'_aux2', 'q').color property int width: 250 property bool shadowEnabled: false property int radius : 0 property QtObject border : QtObject { - property color color: "black" + property color color: 'black' property int width: 0 } } diff --git a/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml index fcc29e629..a779fa7aa 100644 --- a/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml @@ -5,8 +5,9 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'ForceScrollBar' property QtObject background : QtObject { - property color color: ColorsList.add("ForceScrollBar_background", "g20").color + property color color: ColorsList.add(sectionName+'_bg', 'g20').color property int radius : 10 } @@ -17,8 +18,8 @@ QtObject { } property QtObject color: QtObject { - property color hovered: ColorsList.add("ForceScrollBar_hovered", "h").color - property color normal: ColorsList.add("ForceScrollBar_normal", "g20").color - property color pressed: ColorsList.add("ForceScrollBar_pressed", "d").color + property color hovered: ColorsList.add(sectionName+'_h', 'h').color + property color normal: ColorsList.add(sectionName+'_n', 'g20').color + property color pressed: ColorsList.add(sectionName+'_p', 'd').color } } diff --git a/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml index 7f35fd05b..75c632500 100644 --- a/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml @@ -5,15 +5,16 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int transitionDuration: 200 - - property QtObject handle: QtObject { - property int width: 5 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("Paned_hovered", "h").color - property color normal: ColorsList.add("Paned_normal", "c").color - property color pressed: ColorsList.add("Paned_pressed", "d").color - } - } + property string sectionName: 'Paned' + property int transitionDuration: 200 + + property QtObject handle: QtObject { + property int width: 5 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_hovered', 'h').color + property color normal: ColorsList.add(sectionName+'_normal', 'c').color + property color pressed: ColorsList.add(sectionName+'_pressed', 'd').color + } + } } diff --git a/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml b/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml index 3947eeebe..562dd7328 100644 --- a/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml @@ -6,10 +6,11 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("Popup_background", "k").color + property string sectionName: 'Popup' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color property QtObject shadow: QtObject { - property color color: ColorsList.add("Popup_shadow", "l").color + property color color: ColorsList.add(sectionName+'_shadow', 'l').color property int horizontalOffset: 2 property int radius: 10 property int samples: 15 diff --git a/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml b/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml index 5bd6cedc2..7ace5344d 100644 --- a/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml @@ -7,13 +7,14 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("Tooltip_background", "g").color - property color color: ColorsList.add("Tooltip", "q").color - property int arrowSize: 8 - property int delay: 1000 - property int pointSize: Units.dp * 9 - property int margins: 8 - property int padding: 4 - property int radius: 4 - property int minWidth: 130 + property string sectionName: 'Tooltip' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'g').color + property color color: ColorsList.add(sectionName, 'q').color + property int arrowSize: 8 + property int delay: 1000 + property int pointSize: Units.dp * 9 + property int margins: 8 + property int padding: 4 + property int radius: 4 + property int minWidth: 130 } diff --git a/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml b/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml index 2e39c8fa4..b5f96ae86 100644 --- a/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml @@ -6,7 +6,8 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject transientWindow: QtObject { - property color color: ColorsList.add("Window_transient", "l80").color - } + property string sectionName: 'Window' + property QtObject transientWindow: QtObject { + property color color: ColorsList.add(sectionName+'_transient', 'l80').color + } } diff --git a/linphone-app/ui/modules/Common/Styles/qmldir b/linphone-app/ui/modules/Common/Styles/qmldir index c90816641..c9480c1c9 100644 --- a/linphone-app/ui/modules/Common/Styles/qmldir +++ b/linphone-app/ui/modules/Common/Styles/qmldir @@ -9,6 +9,7 @@ singleton BusyIndicatorStyle 1.0 Animations/BusyIndicatorStyle.qml singleton DialogStyle 1.0 Dialog/DialogStyle.qml singleton ActionBarStyle 1.0 Form/ActionBarStyle.qml +singleton ActionSwitchStyle 1.0 Form/ActionSwitchStyle.qml singleton CheckBoxTextStyle 1.0 Form/CheckBoxTextStyle.qml singleton ComboBoxStyle 1.0 Form/ComboBoxStyle.qml singleton DroppableTextAreaStyle 1.0 Form/DroppableTextAreaStyle.qml diff --git a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml index ad5ad5993..03bf102d7 100644 --- a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml +++ b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml @@ -1,5 +1,6 @@ import QtQuick 2.7 as Core import QtQuick.Controls 2.2 as Core +import QtGraphicalEffects 1.12 import Common 1.0 import Common.Styles 1.0 @@ -103,10 +104,16 @@ Core.ToolTip { fillMode: Core.Image.PreserveAspectFit height: TooltipStyle.arrowSize source: _edge - ? Utils.resolveImageUri('tooltip_arrow_' + _edge) + ? Utils.resolveImageUri('tooltip_arrow_' + _edge+'_custom') : '' sourceSize.height: height sourceSize.width: width + layer { + enabled: true + effect: ColorOverlay { + color: TooltipStyle.backgroundColor + } + } visible: tooltip.visible && _edge width: TooltipStyle.arrowSize z: Constants.zMax diff --git a/linphone-app/ui/modules/Linphone/Calls/Calls.js b/linphone-app/ui/modules/Linphone/Calls/Calls.js index f9915cb68..23c3b4325 100644 --- a/linphone-app/ui/modules/Linphone/Calls/Calls.js +++ b/linphone-app/ui/modules/Linphone/Calls/Calls.js @@ -107,7 +107,7 @@ function getParams (call) { return { component: callAction, handler: call.terminate, - icon: 'hangup', + useIcon: 1, string: 'outgoing' } } diff --git a/linphone-app/ui/modules/Linphone/Calls/Calls.qml b/linphone-app/ui/modules/Linphone/Calls/Calls.qml index 3d5eb79cb..44bce7676 100644 --- a/linphone-app/ui/modules/Linphone/Calls/Calls.qml +++ b/linphone-app/ui/modules/Linphone/Calls/Calls.qml @@ -3,186 +3,193 @@ import QtQuick 2.7 import Common 1.0 import Linphone 1.0 import Linphone.Styles 1.0 +import ColorsList 1.0 import 'Calls.js' as Logic // ============================================================================= ListView { - id: calls - - // --------------------------------------------------------------------------- - - readonly property var selectedCall: calls._selectedCall - - property var conferenceModel - - property var _selectedCall - - // --------------------------------------------------------------------------- - - boundsBehavior: Flickable.StopAtBounds - clip: true - spacing: 0 - - // --------------------------------------------------------------------------- - - onCountChanged: Logic.handleCountChanged(count) - - Connections { - target: model - - onCallRunning: Logic.handleCallRunning(callModel) - onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved(parent, first, last) - onRowsInserted: Logic.handleRowsInserted(parent, first, last) - } - - // --------------------------------------------------------------------------- - - Component { - id: callAction - - ActionButton { - icon: params.icon || 'generic_error' - iconSize: CallsStyle.entry.iconActionSize - - onClicked: params.handler() - } - } - - Component { - id: callActions - - ActionButton { - id: button - - icon: calls.currentIndex === callId && call.status !== CallModel.CallStatusEnded - ? 'burger_menu_light' - : 'burger_menu' - iconSize: CallsStyle.entry.iconMenuSize - - onClicked: menu.open() - - DropDownStaticMenu { - id: menu - - relativeTo: callControls - relativeX: callControls.width - - entryHeight: CallsStyle.entry.height - entryWidth: maxWidth - property int maxWidth : CallsStyle.entry.width - - Repeater { - model: params ? params.actions : [] - - DropDownStaticMenuEntry { - entryName: modelData.name - Component.onCompleted: if( menu.maxWidth < implicitWidth ) menu.maxWidth = implicitWidth - onClicked: { - menu.close() - params.actions[index].handler() - } - } - } - } - } - } - - // --------------------------------------------------------------------------- - // Conference. - // --------------------------------------------------------------------------- - - header: ConferenceControls { - readonly property bool isSelected: calls.currentIndex === -1 && calls._selectedCall == null - - height: visible ? ConferenceControlsStyle.height : 0 - width: parent.width - - visible: calls.conferenceModel.count > 0 - - color: isSelected - ? CallsStyle.entry.color.selected - : CallsStyle.entry.color.normal - - textColor: isSelected - ? CallsStyle.entry.usernameColor.selected - : CallsStyle.entry.usernameColor.normal - - onClicked: Logic.resetSelectedCall() - onVisibleChanged: !visible && Logic.handleCountChanged(calls.count) - } - - // --------------------------------------------------------------------------- - // Calls. - // --------------------------------------------------------------------------- - - delegate: CallControls { - id: _callControls - - // ------------------------------------------------------------------------- - - function useColorStatus () { - return calls.currentIndex === index && $call && $call.status !== CallModel.CallStatusEnded - } - - // ------------------------------------------------------------------------- - - color: useColorStatus() - ? CallsStyle.entry.color.selected - : CallsStyle.entry.color.normal - sipAddressColor: useColorStatus() - ? CallsStyle.entry.sipAddressColor.selected - : CallsStyle.entry.sipAddressColor.normal - usernameColor: useColorStatus() - ? CallsStyle.entry.usernameColor.selected - : CallsStyle.entry.usernameColor.normal - - signIcon: { - var params = loader.params - return params ? 'call_sign_' + params.string : '' - } - - entry: $call - - width: calls.width - - onClicked: { - if ($call.status !== CallModel.CallStatusEnded) { - Logic.updateSelectedCall($call, index) - } - } - - // ------------------------------------------------------------------------- - - Loader { - id: loader - - readonly property int callId: index - - readonly property var call: $call - readonly property var callControls: _callControls - readonly property var params: Logic.getParams($call) - - anchors.centerIn: parent - sourceComponent: params ? params.component : null - } - - SequentialAnimation on color { - loops: CallsStyle.entry.endCallAnimation.loops - running: !$call || $call.status === CallModel.CallStatusEnded - - ColorAnimation { - duration: CallsStyle.entry.endCallAnimation.duration - from: CallsStyle.entry.color.normal - to: CallsStyle.entry.endCallAnimation.blinkColor - } - - ColorAnimation { - duration: CallsStyle.entry.endCallAnimation.duration - from: CallsStyle.entry.endCallAnimation.blinkColor - to: CallsStyle.entry.color.normal - } - } - } + id: calls + + // --------------------------------------------------------------------------- + + readonly property var selectedCall: calls._selectedCall + + property var conferenceModel + + property var _selectedCall + + // --------------------------------------------------------------------------- + + boundsBehavior: Flickable.StopAtBounds + clip: true + spacing: 0 + + // --------------------------------------------------------------------------- + + onCountChanged: Logic.handleCountChanged(count) + + Connections { + target: model + + onCallRunning: Logic.handleCallRunning(callModel) + onRowsAboutToBeRemoved: Logic.handleRowsAboutToBeRemoved(parent, first, last) + onRowsInserted: Logic.handleRowsInserted(parent, first, last) + } + + // --------------------------------------------------------------------------- + + Component { + id: callAction + + ActionButton { + isCustom: true + backgroundRadius: 90 + Component.onCompleted: params.useIcon == 1 ? colorSet = CallsStyle.entry.hangup : errorIcon.visible=true + + onClicked: params.handler() + Icon{ + id: errorIcon + icon: 'generic_error' + iconSize: CallsStyle.entry.iconActionSize + visible: false + } + } + } + + Component { + id: callActions + + ActionButton { + id: button + property bool isSelected : calls.currentIndex === callId && call.status !== CallModel.CallStatusEnded + isCustom: true + backgroundRadius: 4 + colorSet: isSelected ? CallsStyle.entry.selectedBurgerMenu : CallsStyle.entry.burgerMenu + + onClicked: menu.open() + + DropDownStaticMenu { + id: menu + + relativeTo: callControls + relativeX: callControls.width + + entryHeight: CallsStyle.entry.height + entryWidth: maxWidth + property int maxWidth : CallsStyle.entry.width + + Repeater { + model: params ? params.actions : [] + + DropDownStaticMenuEntry { + entryName: modelData.name + Component.onCompleted: if( menu.maxWidth < implicitWidth ) menu.maxWidth = implicitWidth + onClicked: { + menu.close() + params.actions[index].handler() + } + } + } + } + } + } + + // --------------------------------------------------------------------------- + // Conference. + // --------------------------------------------------------------------------- + + header: ConferenceControls { + readonly property bool isSelected: calls.currentIndex === -1 && calls._selectedCall == null + + height: visible ? ConferenceControlsStyle.height : 0 + width: parent.width + + visible: calls.conferenceModel.count > 0 + + color: isSelected + ? CallsStyle.entry.color.selected + : CallsStyle.entry.color.normal + + textColor: isSelected + ? CallsStyle.entry.usernameColor.selected + : CallsStyle.entry.usernameColor.normal + + onClicked: Logic.resetSelectedCall() + onVisibleChanged: !visible && Logic.handleCountChanged(calls.count) + } + + // --------------------------------------------------------------------------- + // Calls. + // --------------------------------------------------------------------------- + + delegate: CallControls { + id: _callControls + + // ------------------------------------------------------------------------- + + function useColorStatus () { + return calls.currentIndex === index && $call && $call.status !== CallModel.CallStatusEnded + } + + // ------------------------------------------------------------------------- + + color: useColorStatus() + ? CallsStyle.entry.color.selected + : CallsStyle.entry.color.normal + sipAddressColor: useColorStatus() + ? CallsStyle.entry.sipAddressColor.selected + : CallsStyle.entry.sipAddressColor.normal + usernameColor: useColorStatus() + ? CallsStyle.entry.usernameColor.selected + : CallsStyle.entry.usernameColor.normal + + signIcon: { + var params = loader.params + return params ? 'call_sign_' + params.string : '' + } + + entry: $call + + width: calls.width + + onClicked: { + if ($call.status !== CallModel.CallStatusEnded) { + Logic.updateSelectedCall($call, index) + } + } + + // ------------------------------------------------------------------------- + + Loader { + id: loader + + readonly property int callId: index + + readonly property var call: $call + readonly property var callControls: _callControls + readonly property var params: Logic.getParams($call) + + anchors.centerIn: parent + sourceComponent: params ? params.component : null + } + + SequentialAnimation on color { + loops: CallsStyle.entry.endCallAnimation.loops + running: !$call || $call.status === CallModel.CallStatusEnded + + ColorAnimation { + duration: CallsStyle.entry.endCallAnimation.duration + from: CallsStyle.entry.color.normal + to: CallsStyle.entry.endCallAnimation.blinkColor + } + + ColorAnimation { + duration: CallsStyle.entry.endCallAnimation.duration + from: CallsStyle.entry.endCallAnimation.blinkColor + to: CallsStyle.entry.color.normal + } + } + } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml index 2daf13fdf..7e9ef14a5 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Chat.qml @@ -306,7 +306,8 @@ Rectangle { anchors.centerIn: parent spacing: 5 Icon{ - icon: "copy_light" + icon: ChatStyle.copyTextIcon + overwriteColor: ChatStyle.messageBanner.textColor iconSize: 20 } Text{ diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml index cc057d991..7f136e185 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml @@ -42,8 +42,8 @@ Item { text: (container.lastTextSelected == '' ? qsTr('menuCopyAll') //: 'Copy' : Text menu to copy selected text in message into clipboard : qsTr('menuCopy')) - iconMenu: 'menu_copy_text' - iconSizeMenu: 17 + iconMenu: MenuItemStyle.copy.icon + iconSizeMenu: MenuItemStyle.copy.iconSize iconLayoutDirection: Qt.RightToLeft menuItemStyle : MenuItemStyle.aux onTriggered: { @@ -61,8 +61,8 @@ Item { MenuItem { enabled: TextToSpeech.available text: qsTr('menuPlayMe') - iconMenu: 'speaker' - iconSizeMenu: 17 + iconMenu: MenuItemStyle.speaker.icon + iconSizeMenu: MenuItemStyle.speaker.iconSize iconLayoutDirection: Qt.RightToLeft menuItemStyle : MenuItemStyle.aux onTriggered: TextToSpeech.say(container.content) @@ -74,8 +74,8 @@ Item { //: 'Delivery status' : Item menu that lead to IMDN of a message : qsTr('menuDeliveryStatus') ) - iconMenu: 'menu_imdn_info' - iconSizeMenu: 17 + iconMenu: MenuItemStyle.imdn.icon + iconSizeMenu: MenuItemStyle.imdn.iconSize iconLayoutDirection: Qt.RightToLeft menuItemStyle : MenuItemStyle.aux visible: container.deliveryCount > 0 @@ -84,8 +84,8 @@ Item { MenuItem { //: 'Delete' : Item menu to delete a message text: qsTr('menuDelete') - iconMenu: 'menu_delete' - iconSizeMenu: 17 + iconMenu: MenuItemStyle.deleteEntry.icon + iconSizeMenu: MenuItemStyle.deleteEntry.iconSize iconLayoutDirection: Qt.RightToLeft menuItemStyle : MenuItemStyle.auxRed onTriggered: container.removeEntryRequested() diff --git a/linphone-app/ui/modules/Linphone/Chat/Event.qml b/linphone-app/ui/modules/Linphone/Chat/Event.qml index 206a5dedd..0f68090cf 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Event.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Event.qml @@ -9,34 +9,81 @@ import Utils 1.0 // ============================================================================= Row { - property string _type: { - var status = $chatEntry.status - if (status == LinphoneEnums.CallStatusSuccess) { - if (!$chatEntry.isStart) { - return 'ended_call' + id: mainItem + property QtObject iconData + property string translation + Component.onCompleted: { + if ($chatEntry.status == LinphoneEnums.CallStatusSuccess) { + if(!$chatEntry.isStart){ + iconData = ChatStyle.entry.event.endedCall + translation ='endedCall' + }else if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' } - return $chatEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' + }else if($chatEntry.status == LinphoneEnums.CallStatusDeclined) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusMissed) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.missedOutgoingCall + translation ='missedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.missedIncomingCall + translation ='missedIncomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusAborted) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusDeclined) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusEarlyAborted) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.missedOutgoingCall + translation ='missedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.missedIncomingCall + translation ='missedIncomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusAcceptedElsewhere) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' + } + }else if($chatEntry.status == LinphoneEnums.CallStatusDeclinedElsewhere) { + if($chatEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else { + iconData = ChatStyle.entry.event.unknownCallEvent + translation = 'unknownCallEvent' } - if (status == LinphoneEnums.CallStatusDeclined) { - return $chatEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' - } - if (status == LinphoneEnums.CallStatusMissed) { - return $chatEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' - } - if (status == LinphoneEnums.CallStatusAborted) { - return $chatEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' - } - if (status == LinphoneEnums.CallStatusEarlyAborted) { - return $chatEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' - } - if (status == LinphoneEnums.CallStatusAcceptedElsewhere) { - return $chatEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' - } - if (status == LinphoneEnums.CallStatusDeclinedElsewhere) { - return $chatEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' - } - - return 'unknown_call_event' } height: ChatStyle.entry.lineHeight @@ -44,7 +91,8 @@ Row { Icon { height: parent.height - icon: _type + icon: mainItem.iconData ? mainItem.iconData.icon : null + overwriteColor: mainItem.iconData ? mainItem.iconData.color: null iconSize: ChatStyle.entry.event.iconSize width: ChatStyle.entry.metaWidth } @@ -73,7 +121,7 @@ Row { pointSize: ChatStyle.entry.event.text.pointSize } height: parent.height - text: qsTr(Utils.snakeToCamel(_type)) + text: mainItem.translation ? qsTr(mainItem.translation) : '' verticalAlignment: Text.AlignVCenter ChatMenu{ id:chatMenu @@ -86,10 +134,11 @@ Row { } ActionButton { - height: ChatStyle.entry.lineHeight + height: ChatStyle.entry.menu.iconSize + isCustom: true + backgroundRadius: 8 + colorSet: ChatStyle.entry.menu - icon: 'chat_menu' - iconSize: ChatStyle.entry.deleteIconSize visible: isHoverEntry() onClicked: chatMenu.open() diff --git a/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml index 7438de146..f446c6308 100644 --- a/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml @@ -288,9 +288,10 @@ Row { rightMargin: ChatStyle.entry.message.file.margins } - icon: 'download' - iconSize: ChatStyle.entry.message.file.iconSize - visible: (rectangle.contentModel?!isOutgoing && !rectangle.contentModel.wasDownloaded : false) + icon: ChatStyle.entry.message.file.download.icon + iconSize: ChatStyle.entry.message.file.download.iconSize + overwriteColor: isOutgoing ? ChatStyle.entry.message.file.download.outgoingColor : ChatStyle.entry.message.file.download.incomingColor + visible: (rectangle.contentModel? !rectangle.contentModel.wasDownloaded : false) } MouseArea { @@ -331,7 +332,7 @@ Row { spacing:5 Text{ text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime) - color: ColorsList.add("FileMessage_ephemeral_text", "ad").color + color: ChatStyle.ephemeralTimer.timerColor font.pointSize: Units.dp * 8 Timer{ running:parent.visible @@ -341,8 +342,9 @@ Row { } } Icon{ - icon:'timer' - iconSize: 15 + icon: ChatStyle.ephemeralTimer.icon + overwriteColor: ChatStyle.ephemeralTimer.timerColor + iconSize: ChatStyle.ephemeralTimer.iconSize } } } @@ -358,14 +360,15 @@ Row { } ActionButton { - height: ChatStyle.entry.lineHeight anchors.left:rectangle.right anchors.leftMargin: -10 anchors.top:rectangle.top anchors.topMargin: 5 - icon: 'chat_menu' - iconSize: ChatStyle.entry.deleteIconSize + height: ChatStyle.entry.menu.iconSize + isCustom: true + backgroundRadius: 8 + colorSet: ChatStyle.entry.menu visible: isHoverEntry() onClicked: chatMenu.open() diff --git a/linphone-app/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml index af4645211..e850e5d05 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Message.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Message.qml @@ -38,8 +38,8 @@ Item { // --------------------------------------------------------------------------- implicitHeight: message.contentHeight - + (ephemeralTimerRow.visible? message.padding * 4 : message.padding * 2) - + (deliveryLayout.visible? deliveryLayout.height : 0) + + (ephemeralTimerRow.visible? message.padding * 4 : message.padding * 2) + + (deliveryLayout.visible? deliveryLayout.height : 0) Rectangle { @@ -57,14 +57,14 @@ Item { Row{ id:ephemeralTimerRow anchors.right:parent.right - anchors.bottom:parent.bottom - anchors.bottomMargin: 5 + anchors.bottom:parent.bottom anchors.rightMargin : 5 visible:$chatEntry.isEphemeral - spacing:5 Text{ + anchors.bottom: parent.bottom + anchors.bottomMargin: 5 text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime) - color: ColorsList.add("Message_ephemeral_text", "ad").color + color: ChatStyle.ephemeralTimer.timerColor font.pointSize: Units.dp * 8 Timer{ running:parent.visible @@ -74,8 +74,9 @@ Item { } } Icon{ - icon:'timer' - iconSize: 15 + icon: ChatStyle.ephemeralTimer.icon + overwriteColor: ChatStyle.ephemeralTimer.timerColor + iconSize: ChatStyle.ephemeralTimer.iconSize } } } @@ -159,18 +160,20 @@ Item { chatMessageModel: $chatEntry } - + ActionButton { - height: ChatStyle.entry.lineHeight - anchors.left:rectangle.right - anchors.leftMargin: -10 - anchors.top:rectangle.top - anchors.topMargin: 5 - - icon: 'chat_menu' - iconSize: ChatStyle.entry.deleteIconSize - visible: isHoverEntry() - - onClicked: chatMenu.open() + anchors.left:rectangle.right + anchors.leftMargin: -10 + anchors.top:rectangle.top + anchors.topMargin: 5 + + height: ChatStyle.entry.menu.iconSize + isCustom: true + backgroundRadius: 8 + + colorSet : ChatStyle.entry.menu + visible: isHoverEntry() + + onClicked: chatMenu.open() } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Notice.qml b/linphone-app/ui/modules/Linphone/Chat/Notice.qml index 2394e720f..49f9d3ccb 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Notice.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Notice.qml @@ -86,8 +86,9 @@ RowLayout{ } property bool isImportant: $chatEntry.eventLogType == LinphoneEnums.EventLogTypeConferenceTerminated property bool isError: $chatEntry.status == ChatNoticeModel.NoticeError - property color eventColor : (isError ? ColorsList.add("Notice_error", "error").color : ( isImportant ? ColorsList.add("Notice_important", "error").color : ColorsList.add("Notice", "ab").color )) - + property color eventColor : (isError ? ChatStyle.entry.event.notice.errorColor + : ( isImportant ? ChatStyle.entry.event.notice.importantColor + : ChatStyle.entry.event.notice.color )) Layout.preferredHeight: ChatStyle.entry.lineHeight spacing: ChatStyle.entry.message.extraContent.spacing diff --git a/linphone-app/ui/modules/Linphone/Contact/Contact.qml b/linphone-app/ui/modules/Linphone/Contact/Contact.qml index 9eb6a5b1a..9d4125670 100644 --- a/linphone-app/ui/modules/Linphone/Contact/Contact.qml +++ b/linphone-app/ui/modules/Linphone/Contact/Contact.qml @@ -72,8 +72,9 @@ Rectangle { anchors.fill: parent - icon: 'chat_room_light' - iconSize: 20 + icon: ContactStyle.groupChat.icon + overwriteColor: ContactStyle.groupChat.avatarColor + iconSize: ContactStyle.contentHeight visible: entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne } @@ -92,7 +93,8 @@ Rectangle { Layout.preferredHeight: ContactStyle.contentHeight Layout.preferredWidth: ContactStyle.contentHeight - icon:'chat_room' + icon: ContactStyle.groupChat.icon + overwriteColor: ContactStyle.groupChat.color iconSize: ContactStyle.contentHeight visible: false //entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne diff --git a/linphone-app/ui/modules/Linphone/History/Event.qml b/linphone-app/ui/modules/Linphone/History/Event.qml index 06983b187..283f92f42 100644 --- a/linphone-app/ui/modules/Linphone/History/Event.qml +++ b/linphone-app/ui/modules/Linphone/History/Event.qml @@ -3,6 +3,7 @@ import QtQuick 2.7 import Common 1.0 import Linphone 1.0 import LinphoneUtils 1.0 +import LinphoneEnums 1.0 import Linphone.Styles 1.0 import Utils 1.0 import UtilsCpp 1.0 @@ -10,97 +11,175 @@ import UtilsCpp 1.0 // ============================================================================= Row { - signal entryClicked(string sipAddress) - - readonly property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver($historyEntry.sipAddress, '') - - property string _type: { - var status = $historyEntry.status - - if (status === HistoryModel.CallStatusSuccess) { - if (!$historyEntry.isStart) { - return 'ended_call' - } - return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' - } - if (status === HistoryModel.CallStatusDeclined) { - return $historyEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' - } - if (status === HistoryModel.CallStatusMissed) { - return $historyEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' - } - if (status === HistoryModel.CallStatusAborted) { - return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' - } - if (status === HistoryModel.CallStatusEarlyAborted) { - return $historyEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' - } - if (status === HistoryModel.CallStatusAcceptedElsewhere) { - return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' - } - if (status === HistoryModel.CallStatusDeclinedElsewhere) { - return $historyEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' - } - - return 'unknown_call_event' - } - - height: HistoryStyle.entry.lineHeight - spacing: HistoryStyle.entry.message.extraContent.spacing - - Icon { - height: parent.height - icon: _type - iconSize: HistoryStyle.entry.event.iconSize - width: HistoryStyle.entry.metaWidth - } - - Text { - Component { - // Never created. - // Private data for `lupdate`. - Item { - property var i18n: [ - QT_TR_NOOP('declinedIncomingCall'), - QT_TR_NOOP('declinedOutgoingCall'), - QT_TR_NOOP('endedCall'), - QT_TR_NOOP('incomingCall'), - QT_TR_NOOP('missedIncomingCall'), - QT_TR_NOOP('missedOutgoingCall'), - QT_TR_NOOP('outgoingCall') - ] - } - } - - color: HistoryStyle.entry.event.text.color - font { - bold: true - pointSize: HistoryStyle.entry.event.text.pointSize - } - height: parent.height - text: qsTr(Utils.snakeToCamel(_type)) +' - ' - verticalAlignment: Text.AlignVCenter - } - Text { - color: HistoryStyle.entry.event.text.color - font { - bold: true - pointSize: HistoryStyle.entry.event.text.pointSize - } - height: parent.height - text: UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) - verticalAlignment: Text.AlignVCenter - MouseArea{ - anchors.fill:parent - onClicked:entryClicked($historyEntry.sipAddress) - } - } - ActionButton { - height: HistoryStyle.entry.lineHeight - icon: 'delete' - iconSize: HistoryStyle.entry.deleteIconSize - visible: isHoverEntry() - - onClicked: removeEntry() - } + id: mainItem + signal entryClicked(string sipAddress) + + readonly property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver($historyEntry.sipAddress, '') + property QtObject iconData + property string translation + Component.onCompleted: { + if ($historyEntry.status == LinphoneEnums.CallStatusSuccess) { + if(!$historyEntry.isStart){ + iconData = ChatStyle.entry.event.endedCall + translation ='endedCall' + }else if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusDeclined) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusMissed) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.missedOutgoingCall + translation ='missedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.missedIncomingCall + translation ='missedIncomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusAborted) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusDeclined) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusEarlyAborted) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.missedOutgoingCall + translation ='missedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.missedIncomingCall + translation ='missedIncomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusAcceptedElsewhere) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.outgoingCall + translation ='outgoingCall' + }else{ + iconData = ChatStyle.entry.event.incomingCall + translation ='incomingCall' + } + }else if($historyEntry.status == LinphoneEnums.CallStatusDeclinedElsewhere) { + if($historyEntry.isOutgoing ){ + iconData = ChatStyle.entry.event.declinedOutgoingCall + translation ='declinedOutgoingCall' + }else{ + iconData = ChatStyle.entry.event.declinedIncomingCall + translation ='declinedIncomingCall' + } + }else { + iconData = ChatStyle.entry.event.unknownCallEvent + translation = 'unknownCallEvent' + } + } + /* + property string _type: { + var status = $historyEntry.status + + if (status === HistoryModel.CallStatusSuccess) { + if (!$historyEntry.isStart) { + return 'ended_call' + } + return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' + } + if (status === HistoryModel.CallStatusDeclined) { + return $historyEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' + } + if (status === HistoryModel.CallStatusMissed) { + return $historyEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' + } + if (status === HistoryModel.CallStatusAborted) { + return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' + } + if (status === HistoryModel.CallStatusEarlyAborted) { + return $historyEntry.isOutgoing ? 'missed_outgoing_call' : 'missed_incoming_call' + } + if (status === HistoryModel.CallStatusAcceptedElsewhere) { + return $historyEntry.isOutgoing ? 'outgoing_call' : 'incoming_call' + } + if (status === HistoryModel.CallStatusDeclinedElsewhere) { + return $historyEntry.isOutgoing ? 'declined_outgoing_call' : 'declined_incoming_call' + } + + return 'unknown_call_event' + }*/ + + height: HistoryStyle.entry.lineHeight + spacing: HistoryStyle.entry.message.extraContent.spacing + + Icon { + height: parent.height + icon: mainItem.iconData ? mainItem.iconData.icon : null + overwriteColor: mainItem.iconData ? mainItem.iconData.color: null + iconSize: ChatStyle.entry.event.iconSize + width: HistoryStyle.entry.metaWidth + } + + Text { + Component { + // Never created. + // Private data for `lupdate`. + Item { + property var i18n: [ + QT_TR_NOOP('declinedIncomingCall'), + QT_TR_NOOP('declinedOutgoingCall'), + QT_TR_NOOP('endedCall'), + QT_TR_NOOP('incomingCall'), + QT_TR_NOOP('missedIncomingCall'), + QT_TR_NOOP('missedOutgoingCall'), + QT_TR_NOOP('outgoingCall') + ] + } + } + + color: HistoryStyle.entry.event.text.color + font { + bold: true + pointSize: HistoryStyle.entry.event.text.pointSize + } + height: parent.height + text: mainItem.translation ? qsTr(mainItem.translation) +' - ' : ' - ' + verticalAlignment: Text.AlignVCenter + } + Text { + color: HistoryStyle.entry.event.text.color + font { + bold: true + pointSize: HistoryStyle.entry.event.text.pointSize + } + height: parent.height + text: UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) + verticalAlignment: Text.AlignVCenter + MouseArea{ + anchors.fill:parent + onClicked:entryClicked($historyEntry.sipAddress) + } + } + ActionButton { + height: HistoryStyle.entry.lineHeight + isCustom: true + backgroundRadius: 8 + colorSet: ChatStyle.entry.deleteAction + visible: isHoverEntry() + + onClicked: removeEntry() + } } diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml index 1404bb841..3f6a399e4 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml @@ -8,79 +8,85 @@ import Linphone.Styles 1.0 // ============================================================================= Notification { - id: notification - - icon: 'call_sign_incoming' - - // --------------------------------------------------------------------------- - - readonly property var call: notificationData && notificationData.call - - // --------------------------------------------------------------------------- - - Loader { - active: Boolean(notification.call) - anchors { - fill: parent - - leftMargin: NotificationReceivedCallStyle.leftMargin - rightMargin: NotificationReceivedCallStyle.rightMargin - bottomMargin: NotificationReceivedCallStyle.bottomMargin - } - - sourceComponent: ColumnLayout { - spacing: NotificationReceivedCallStyle.spacing - - Contact { - Layout.fillWidth: true - property var peerAddress: notification.call ? notification.call.fullPeerAddress : '' - onPeerAddressChanged: { - entry=SipAddressesModel.getSipAddressObserver(peerAddress, notification.call ? notification.call.fullLocalAddress : '') + id: notification + + icon: 'call_sign_incoming' + + // --------------------------------------------------------------------------- + + readonly property var call: notificationData && notificationData.call + + // --------------------------------------------------------------------------- + + Loader { + active: Boolean(notification.call) + anchors { + fill: parent + + leftMargin: NotificationReceivedCallStyle.leftMargin + rightMargin: NotificationReceivedCallStyle.rightMargin + bottomMargin: NotificationReceivedCallStyle.bottomMargin } - entry: SipAddressesModel.getSipAddressObserver(peerAddress, notification.call ? notification.call.fullLocalAddress : '') - } - - // --------------------------------------------------------------------- - // Action buttons. - // --------------------------------------------------------------------- - - Item { - Layout.fillHeight: true - Layout.fillWidth: true - - ActionBar { - id: acceptActionBar - - anchors.centerIn: parent - iconSize: NotificationReceivedCallStyle.actionArea.iconSize - - ActionButton { - icon: 'video_call_accept' - visible: SettingsModel.videoSupported - - onClicked: notification._close(notification.call.acceptWithVideo) - } - - ActionButton { - icon: 'call_accept' - onClicked: notification._close(notification.call.accept) - } - } - - ActionBar { - anchors { - right: parent.right - rightMargin: NotificationReceivedCallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: NotificationReceivedCallStyle.actionArea.iconSize - - ActionButton { - icon: 'hangup' - onClicked: notification._close(notification.call.terminate) - } - } - } - } - } + + sourceComponent: ColumnLayout { + spacing: NotificationReceivedCallStyle.spacing + + Contact { + Layout.fillWidth: true + property var peerAddress: notification.call ? notification.call.fullPeerAddress : '' + onPeerAddressChanged: { + entry=SipAddressesModel.getSipAddressObserver(peerAddress, notification.call ? notification.call.fullLocalAddress : '') + } + entry: SipAddressesModel.getSipAddressObserver(peerAddress, notification.call ? notification.call.fullLocalAddress : '') + } + + // --------------------------------------------------------------------- + // Action buttons. + // --------------------------------------------------------------------- + + Item { + Layout.fillHeight: true + Layout.fillWidth: true + + ActionBar { + id: acceptActionBar + + anchors.centerIn: parent + iconSize: NotificationReceivedCallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: NotificationReceivedCallStyle.acceptVideoCall + visible: SettingsModel.videoSupported + + onClicked: notification._close(notification.call.acceptWithVideo) + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: NotificationReceivedCallStyle.acceptCall + onClicked: notification._close(notification.call.accept) + } + } + + ActionBar { + anchors { + right: parent.right + rightMargin: NotificationReceivedCallStyle.actionArea.rightButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + iconSize: NotificationReceivedCallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: NotificationReceivedCallStyle.hangup + onClicked: notification._close(notification.call.terminate) + } + } + } + } + } } diff --git a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index 960782197..d36f47063 100644 --- a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -59,7 +59,7 @@ SearchBox { id: view actions: [{ - icon: 'video_call', + colorSet: SipAddressesViewStyle.videoCall, secure: 0, visible: true, handler: function (entry) { @@ -68,7 +68,7 @@ SearchBox { }, visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton }, { - icon: 'call', + colorSet: SipAddressesViewStyle.call, secure: 0, visible: true, handler: function (entry) { @@ -77,7 +77,7 @@ SearchBox { }, visible: SettingsModel.outgoingCallsEnabled }, { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history', + colorSet: SettingsModel.getShowStartChatButton() ? SipAddressesViewStyle.chat : SipAddressesViewStyle.history, secure: 0, visible: SettingsModel.standardChatEnabled , handler: function (entry) { @@ -85,7 +85,7 @@ SearchBox { searchBox.launchChat(entry.sipAddress) } }, { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history', + colorSet: SettingsModel.getShowStartChatButton() ? SipAddressesViewStyle.chat : SipAddressesViewStyle.history, secure: 1, visible: SettingsModel.secureChatEnabled && AccountSettingsModel.conferenceURI != '', visibleHandler : function(entry) { @@ -103,7 +103,8 @@ SearchBox { ] headerButtonDescription: qsTr('addContact') - headerButtonIcon: 'contact_add' + headerButtonIcon: 'contact_add_custom' + headerButtonOverwriteColor: SipAddressesViewStyle.header.button.color headerButtonAction: SettingsModel.contactsEnabled && (function (sipAddress) { searchBox.closeMenu() searchBox.addContact(sipAddress) diff --git a/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml index a88055df7..cdedba019 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml @@ -7,25 +7,26 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int horizontalSpacing: 8 - property int verticalSpacing: 2 - - property QtObject presenceLevel: QtObject { - property int bottomMargin: 1 - property int size: 16 - } - - property QtObject sipAddress: QtObject { - property color color: ColorsList.add("Account_sipAddress", "g").color - property int pointSize: Units.dp * 10 - } - - property QtObject username: QtObject { - property color color: ColorsList.add("Account_username", "j").color - property int pointSize: Units.dp * 11 - } - property QtObject messageCounter: QtObject { - property int bottomMargin: 4 - property int size: 16 - } + property string sectionName: 'AccountStatus' + property int horizontalSpacing: 8 + property int verticalSpacing: 2 + + property QtObject presenceLevel: QtObject { + property int bottomMargin: 1 + property int size: 16 + } + + property QtObject sipAddress: QtObject { + property color color: ColorsList.add(sectionName+'_sipAddress', 'g').color + property int pointSize: Units.dp * 10 + } + + property QtObject username: QtObject { + property color color: ColorsList.add(sectionName+'_username', 'j').color + property int pointSize: Units.dp * 11 + } + property QtObject messageCounter: QtObject { + property int bottomMargin: 4 + property int size: 16 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml index 48fc9e905..a61d578e2 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml @@ -7,28 +7,29 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 30 - property int width: 200 - - property QtObject content: QtObject { - property int height: 40 - } - - property QtObject description: QtObject { - property color color: ColorsList.add("CardBlock_description", "n").color - property int pointSize: Units.dp * 10 - property int height: 40 - } - - property QtObject icon: QtObject { - property int bottomMargin: 20 - property int size: 148 - } - - property QtObject title: QtObject { - property color color: ColorsList.add("CardBlock_title", "j").color - property int bottomMargin: 10 - property int pointSize: Units.dp * 10 - property int height: 20 - } + property string sectionName: 'CardBlock' + property int spacing: 30 + property int width: 200 + + property QtObject content: QtObject { + property int height: 40 + } + + property QtObject description: QtObject { + property color color: ColorsList.add(sectionName+'_description', 'n').color + property int pointSize: Units.dp * 10 + property int height: 40 + } + + property QtObject icon: QtObject { + property int bottomMargin: 20 + property int size: 148 + } + + property QtObject title: QtObject { + property color color: ColorsList.add(sectionName+'_title', 'j').color + property int bottomMargin: 10 + property int pointSize: Units.dp * 10 + property int height: 20 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml index 5e527eb98..74732c5c3 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml @@ -7,16 +7,17 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 60 - - property QtObject error: QtObject { - property color color: ColorsList.add("RequestBlock_error", "error").color - property int pointSize: Units.dp * 11 - property int padding: 4 - } - - property QtObject loadingIndicator: QtObject { - property int height: 20 - property int width: 20 - } + property string sectionName: 'RequestBlock' + property int height: 60 + + property QtObject error: QtObject { + property color color: ColorsList.add(sectionName+'_error', 'error').color + property int pointSize: Units.dp * 11 + property int padding: 4 + } + + property QtObject loadingIndicator: QtObject { + property int height: 20 + property int width: 20 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml index afbc3832f..168613ec7 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml @@ -6,9 +6,10 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("CallControl", "e").color - property int height: 60 - property int leftMargin: 12 - property int rightMargin: 12 - property int signSize: 40 + property string sectionName: 'CallControl' + property color color: ColorsList.add(sectionName, 'e').color + property int height: 60 + property int leftMargin: 12 + property int rightMargin: 12 + property int signSize: 40 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml index 3b283ca57..f015675b8 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml @@ -7,27 +7,28 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("CallStats", "e").color - property int height: 280 - property int leftMargin: 12 - property int rightMargin: 12 - property int spacing: 8 - property int topMargin: 10 - - property QtObject title: QtObject { - property color color: ColorsList.add("CallStats_title", "d").color - property int bottomMargin: 20 - property int pointSize: Units.dp * 16 - } - - property QtObject key: QtObject { - property color color: ColorsList.add("CallStats_key", "d").color - property int pointSize: Units.dp * 10 - property int width: 200 - } - - property QtObject value: QtObject { - property color color: ColorsList.add("CallStats_value", "d").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'CallStats' + property color color: ColorsList.add(sectionName, 'e').color + property int height: 280 + property int leftMargin: 12 + property int rightMargin: 12 + property int spacing: 8 + property int topMargin: 10 + + property QtObject title: QtObject { + property color color: ColorsList.add(sectionName+'_title', 'd').color + property int bottomMargin: 20 + property int pointSize: Units.dp * 16 + } + + property QtObject key: QtObject { + property color color: ColorsList.add(sectionName+'_key', 'd').color + property int pointSize: Units.dp * 10 + property int width: 200 + } + + property QtObject value: QtObject { + property color color: ColorsList.add(sectionName+'_value', 'd').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml index 705b4a980..d2a89a808 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml @@ -6,31 +6,65 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject entry: QtObject { - property int iconActionSize: 35 - property int iconMenuSize: 17 - property int height: 30 - property int width: 200 - - property QtObject color: QtObject { - property color normal: ColorsList.add("Calls_entry_normal", "e").color - property color selected: ColorsList.add("Calls_entry_selected", "j").color - } - - property QtObject endCallAnimation: QtObject { - property color blinkColor: ColorsList.add("Calls_entry_end_blink", "i").color - property int duration: 300 - property int loops: 3 - } - - property QtObject sipAddressColor: QtObject { - property color normal: ColorsList.add("Calls_entry_sipAddress_normal", "n").color - property color selected: ColorsList.add("Calls_entry_sipAddress_selected", "q").color - } - - property QtObject usernameColor: QtObject { - property color normal: ColorsList.add("Calls_entry_username_normal", "j").color - property color selected: ColorsList.add("Calls_entry_username_selected", "q").color - } - } + property string sectionName : 'Calls' + property QtObject entry: QtObject { + property int iconActionSize: 35 + property int iconMenuSize: 35 + property int height: 30 + property int width: 200 + + property QtObject color: QtObject { + property color normal: ColorsList.add('Calls_entry_n', 'e').color + property color selected: ColorsList.add('Calls_entry_c', 'j').color + } + property QtObject burgerMenu: QtObject { + property string name : 'burgerMenu' + property string icon : 'burger_menu_custom' + property int iconSize: 35 + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject selectedBurgerMenu: QtObject { + property string name : 'selectedBurgerMenu' + property string icon : 'burger_menu_custom' + property int iconSize: 35 + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + } + property QtObject hangup: QtObject { + property int iconSize: 35 + property string icon : 'hangup_custom' + property string name : 'hangup' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + } + property QtObject endCallAnimation: QtObject { + property color blinkColor: ColorsList.add('Calls_entry_end_blink', 'i').color + property int duration: 300 + property int loops: 3 + } + + property QtObject sipAddressColor: QtObject { + property color normal: ColorsList.add('Calls_entry_sipAddress_n', 'n').color + property color selected: ColorsList.add('Calls_entry_sipAddress_selected', 'q').color + } + + property QtObject usernameColor: QtObject { + property color normal: ColorsList.add('Calls_entry_username_n', 'j').color + property color selected: ColorsList.add('Calls_entry_username_selected', 'q').color + } + + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml index 2bedb9001..fc1baf8d8 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml @@ -6,8 +6,9 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("ConferenceControls", "e").color - property int height: 60 - property int leftMargin: 12 - property int rightMargin: 12 + property string sectionName: 'ConferenceControls' + property color color: ColorsList.add(sectionName, 'e').color + property int height: 60 + property int leftMargin: 12 + property int rightMargin: 12 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml index f2827ff2d..aabfb4a4c 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml @@ -7,143 +7,218 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Chat", "q").color - - property QtObject sectionHeading: QtObject { - property int padding: 5 - property int bottomMargin: 20 - - property QtObject border: QtObject { - property color color: ColorsList.add("Chat_section_border", "g10").color - property int width: 1 - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 10 - property color color: ColorsList.add("Chat_section_text", "ab").color - } - } - - property QtObject sendArea: QtObject { - property int height: 80 - - property QtObject border: QtObject { - property color color: ColorsList.add("Chat_send_border", "f").color - property int width: 1 - } - } - - property QtObject composingText: QtObject { - property color color: ColorsList.add("Chat_composing_text", "d").color - property int height: 25 - property int leftPadding: 20 - property int pointSize: Units.dp * 9 - } - - property QtObject messageBanner: QtObject { - property color color: ColorsList.add("Chat_message_banner", "", "Background of message banner", "#9ecd1d").color - property color textColor: ColorsList.add("Chat_message_banner_text", "q", "Text of message banner").color - property int pointSize: Units.dp * 9 - } - - property QtObject entry: QtObject { - property int bottomMargin: 10 - property int deleteIconSize: 22 - property int leftMargin: 18 - property int rightMargin: 18 - property int lineHeight: 30 - property int metaWidth: 40 - - property QtObject event: QtObject { - property int iconSize: 18 - - property QtObject text: QtObject { - property color color: ColorsList.add("Chat_entry_text", "ac").color - property int pointSize: Units.dp * 10 - } - } - - property QtObject message: QtObject { - property int padding: 8 - property int radius: 4 - - property QtObject extraContent: QtObject { - property int leftMargin: 10 - property int spacing: 5 - property int rightMargin: 5 - } - - property QtObject file: QtObject { - property int height: 64 - property int iconSize: 18 - property int margins: 8 - property int spacing: 8 - property int width: 250 - - property QtObject animation: QtObject { - property int duration: 200 - property real to: 1.5 - } - - property QtObject extension: QtObject { - property QtObject background: QtObject { - property color color: ColorsList.add("Chat_file_extension_background", "l50").color - } - - property QtObject text: QtObject { - property color color: ColorsList.add("Chat_file_extension_text", "q").color - } - } - - property QtObject status: QtObject { - property int spacing: 4 - - property QtObject bar: QtObject { - property int height: 6 - property int radius: 3 - - property QtObject background: QtObject { - property color color: ColorsList.add("Chat_file_statusbar_background", "f").color - } - - property QtObject contentItem: QtObject { - property color color: ColorsList.add("Chat_file_statusbar_content", "p").color - } - } - } - } - - property QtObject images: QtObject { - property int height: 48 - } - - property QtObject incoming: QtObject { - property color backgroundColor: ColorsList.add("Chat_incoming_background", "o").color - property int avatarSize: 20 - - property QtObject text: QtObject { - property color color: ColorsList.add("Chat_incoming_text", "d").color - property int pointSize: Units.dp * 10 - } - } - - property QtObject outgoing: QtObject { - property color backgroundColor: ColorsList.add("Chat_outgoing_background", "e").color - property int areaSize: 16 - property int busyIndicatorSize: 16 - property int sendIconSize: 12 - - property QtObject text: QtObject { - property color color: ColorsList.add("Chat_outgoing_text", "d").color - property int pointSize: Units.dp * 10 - } - } - } - - property QtObject time: QtObject { - property color color: ColorsList.add("Chat_time", "d").color - property int pointSize: Units.dp * 10 - property int width: 44 - } - } + property string sectionName : 'Chat' + property color color: ColorsList.add(sectionName, 'q').color + property string copyTextIcon : 'copy_custom' + + property QtObject sectionHeading: QtObject { + property int padding: 5 + property int bottomMargin: 20 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_section_border', 'g10').color + property int width: 1 + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 10 + property color color: ColorsList.add(sectionName+'_section_text', 'ab').color + } + } + + property QtObject sendArea: QtObject { + property int height: 80 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_send_border', 'f').color + property int width: 1 + } + } + + property QtObject composingText: QtObject { + property color color: ColorsList.add(sectionName+'_composing_text', 'd').color + property int height: 25 + property int leftPadding: 20 + property int pointSize: Units.dp * 9 + } + + property QtObject messageBanner: QtObject { + property color color: ColorsList.add(sectionName+'_message_banner', '', 'Background of message banner', '#9ecd1d').color + property color textColor: ColorsList.add(sectionName+'_message_banner_text', 'q', 'Text of message banner').color + property int pointSize: Units.dp * 9 + } + property QtObject ephemeralTimer: QtObject{ + property string icon: 'timer_custom' + property int iconSize : 25 + property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color + } + + property QtObject entry: QtObject { + property int bottomMargin: 10 + property int deleteIconSize: 22 + property int leftMargin: 18 + property int rightMargin: 18 + property int lineHeight: 30 + property int metaWidth: 40 + + property QtObject menu: QtObject { + property int iconSize: 22 + property string name : 'menu' + property string icon : 'chat_menu_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759').color + + } + property QtObject deleteAction: QtObject { + property int iconSize: 22 + property string name : 'delete' + property string icon : 'delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759').color + + } + + property QtObject event: QtObject { + property int iconSize: 30 + property QtObject notice: QtObject{ + property color color: ColorsList.add(sectionName+'_entry_notice', 'ab').color + property color errorColor: ColorsList.add(sectionName+'_entry_notice_error', 'error').color + property color importantColor: ColorsList.add(sectionName+'_entry_notice_important', 'ae').color + property int pointSize: Units.dp * 10 + } + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_entry_text', 'ac').color + property int pointSize: Units.dp * 10 + } + property QtObject declinedIncomingCall: QtObject{ + property string icon: 'declined_incoming_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_declinedIncomingCall', icon, 'event_bad').color + } + property QtObject declinedOutgoingCall: QtObject{ + property string icon: 'declined_outgoing_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_declinedOutgoingCall', icon, 'event_bad').color + } + property QtObject endedCall: QtObject{ + property string icon: 'ended_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_endedCall', icon, 'event_neutral').color + } + property QtObject incomingCall: QtObject{ + property string icon: 'incoming_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_incomingCall', icon, 'event_in').color + } + property QtObject outgoingCall: QtObject{ + property string icon: 'outgoing_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_outgoingCall', icon, 'event_out').color + } + property QtObject missedIncomingCall: QtObject{ + property string icon: 'missed_incoming_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_missedIncominCall', icon, 'event_bad').color + } + property QtObject missedOutgoingCall: QtObject{ + property string icon: 'missed_outgoing_call_custom' + property color color: ColorsList.addImageColor(sectionName+'_missedOutgoingCall', icon, 'event_bad').color + } + property QtObject unknownCallEvent: QtObject{ + property string icon: 'unknown_call_event' + property color color: ColorsList.addImageColor(sectionName+'_unknownCallEvent', icon, 'event_bad').color + } + } + + property QtObject message: QtObject { + property int padding: 8 + property int radius: 4 + + property QtObject extraContent: QtObject { + property int leftMargin: 10 + property int spacing: 5 + property int rightMargin: 5 + } + + property QtObject file: QtObject { + property int height: 64 + property int iconSize: 18 + property int margins: 8 + property int spacing: 8 + property int width: 250 + property QtObject download: QtObject{ + property string icon: 'download_custom' + property int iconSize: 30 + property color outgoingColor: ColorsList.addImageColor(sectionName+'_download_out', icon, 'g').color + property color incomingColor: ColorsList.addImageColor(sectionName+'_download_in', icon, 'q').color + } + + property QtObject animation: QtObject { + property int duration: 200 + property real to: 1.5 + } + + property QtObject extension: QtObject { + property QtObject background: QtObject { + property color color: ColorsList.add(sectionName+'_file_extension_bg', 'l50').color + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_file_extension_text', 'q').color + } + } + + property QtObject status: QtObject { + property int spacing: 4 + + property QtObject bar: QtObject { + property int height: 6 + property int radius: 3 + + property QtObject background: QtObject { + property color color: ColorsList.add(sectionName+'_file_statusbar_bg', 'f').color + } + + property QtObject contentItem: QtObject { + property color color: ColorsList.add(sectionName+'_file_statusbar_content', 'p').color + } + } + } + } + + property QtObject images: QtObject { + property int height: 48 + } + + property QtObject incoming: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_incoming_bg', 'o').color + property int avatarSize: 20 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_incoming_text', 'd').color + property int pointSize: Units.dp * 10 + } + } + + property QtObject outgoing: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_outgoing_bg', 'e').color + property int areaSize: 16 + property int busyIndicatorSize: 16 + property int sendIconSize: 12 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_outgoing_text', 'd').color + property int pointSize: Units.dp * 10 + } + } + } + + property QtObject time: QtObject { + property color color: ColorsList.add(sectionName+'_time', 'd').color + property int pointSize: Units.dp * 10 + property int width: 44 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml index 66db86d61..da2922d2a 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml @@ -7,40 +7,41 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int leftMargin: 10 - - property QtObject attribute: QtObject { - property int height: 40 - - property QtObject background: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("Codecs_normal", "a").color - property color hovered: ColorsList.add("Codecs_hovered", "o").color - } - } - - property QtObject dropArea: QtObject { - property int margins: 5 - } - - property QtObject text: QtObject { - property color color: ColorsList.add("Codecs_text", "j").color - property int pointSize: Units.dp * 10 - } - } - - property QtObject column: QtObject { - property int bitrateWidth: 120 - property int clockRateWidth: 100 - property int encoderDescriptionWidth: 280 - property int mimeWidth: 100 - property int recvFmtpWidth: 200 - property int spacing: 10 - } - - property QtObject legend: QtObject { - property color color: ColorsList.add("Codecs_legend", "j").color - property int pointSize: Units.dp * 10 - property int height: 50 - } + property string sectionName: 'CodecsViewer' + property int leftMargin: 10 + + property QtObject attribute: QtObject { + property int height: 40 + + property QtObject background: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_n', 'a').color + property color hovered: ColorsList.add(sectionName+'_h', 'o').color + } + } + + property QtObject dropArea: QtObject { + property int margins: 5 + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'j').color + property int pointSize: Units.dp * 10 + } + } + + property QtObject column: QtObject { + property int bitrateWidth: 120 + property int clockRateWidth: 100 + property int encoderDescriptionWidth: 280 + property int mimeWidth: 100 + property int recvFmtpWidth: 200 + property int spacing: 10 + } + + property QtObject legend: QtObject { + property color color: ColorsList.add(sectionName+'_legend', 'j').color + property int pointSize: Units.dp * 10 + property int height: 50 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml index 29f08ca81..1327dfb4a 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml @@ -7,11 +7,12 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("Avatar_background", "d").color - - property QtObject initials: QtObject { - property color color: ColorsList.add("Avatar_initials", "q").color - property int pointSize: Units.dp * 10 - property int ratio: 30 - } + property string sectionName: 'Avatar' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'd').color + + property QtObject initials: QtObject { + property color color: ColorsList.add(sectionName+'_initials', 'q').color + property int pointSize: Units.dp * 10 + property int ratio: 30 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml index d7a1d6c63..2cd2f460e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml @@ -8,18 +8,19 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'ContactDescription' property QtObject sipAddress: QtObject { - property color color: ColorsList.add("ContactDescription_sipAddress", "n").color + property color color: ColorsList.add(sectionName+'_sipAddress', 'n').color property int pointSize: Units.dp * 10 property int weight: Font.Normal } property QtObject username: QtObject { - property color color: ColorsList.add("ContactDescription_username", "j").color + property color color: ColorsList.add(sectionName+'_username', 'j').color property int pointSize: Units.dp * 11 property int weight: Font.Bold property QtObject status : QtObject{ - property color color : ColorsList.add("ContactDescription_status", "g").color + property color color : ColorsList.add(sectionName+'_status', 'g').color property int pointSize : Units.dp * 9 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml index 6efcbefd1..0e25378c6 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml @@ -1,12 +1,20 @@ pragma Singleton import QtQml 2.2 +import ColorsList 1.0 // ============================================================================= QtObject { - property int contentHeight: 32 - property int height: 50 - property int leftMargin: 14 - property int rightMargin: 14 - property int spacing: 14 + property string sectionName: 'Contact' + property int contentHeight: 32 + property int height: 50 + property int leftMargin: 14 + property int rightMargin: 14 + property int spacing: 14 + + property QtObject groupChat: QtObject { + property string icon: 'chat_room_custom' + property color color: ColorsList.addImageColor(sectionName+'_groupChat', icon, 'g').color + property color avatarColor: ColorsList.addImageColor(sectionName+'_groupChat_onAvatar', icon, 'q').color + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml index c943806cd..4704b2d05 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml @@ -7,31 +7,32 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 200 - property int width: 400 - - property QtObject column: QtObject { - property int spacing: 6 - - property QtObject bar: QtObject { - property int height: 20 - property int radius: 6 - - property QtObject background: QtObject { - property color color: ColorsList.add("OnlineInstallerDialog_bar_background", "f").color - } - - property QtObject contentItem: QtObject { - property QtObject color: QtObject { - property color failed: ColorsList.add("OnlineInstallerDialog_bar_content_failed", "error").color - property color normal: ColorsList.add("OnlineInstallerDialog_bar_content_normal", "p").color - } - } - } - - property QtObject text: QtObject { - property color color: ColorsList.add("OnlineInstallerDialog_text", "d").color - property int pointSize: Units.dp * 11 - } - } + property string sectionName: 'OnlineInstallerDialog' + property int height: 200 + property int width: 400 + + property QtObject column: QtObject { + property int spacing: 6 + + property QtObject bar: QtObject { + property int height: 20 + property int radius: 6 + + property QtObject background: QtObject { + property color color: ColorsList.add(sectionName+'_bar_bg', 'f').color + } + + property QtObject contentItem: QtObject { + property QtObject color: QtObject { + property color failed: ColorsList.add(sectionName+'_bar_content_failed', 'error').color + property color normal: ColorsList.add(sectionName+'_bar_content_n', 'p').color + } + } + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'd').color + property int pointSize: Units.dp * 11 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml b/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml index c68e75ce1..1d46c37e0 100644 --- a/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml @@ -7,55 +7,56 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("History", "q").color - - property QtObject sectionHeading: QtObject { - property int padding: 5 - property int bottomMargin: 20 - - property QtObject border: QtObject { - property color color: ColorsList.add("History_section_border", "g10").color - property int width: 1 - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 10 - property color color: ColorsList.add("History_section_text", "g").color - } - } - - - property QtObject entry: QtObject { - property int bottomMargin: 10 - property int deleteIconSize: 22 - property int leftMargin: 18 - property int lineHeight: 30 - property int metaWidth: 40 - - property QtObject event: QtObject { - property int iconSize: 18 - - property QtObject text: QtObject { - property color color: ColorsList.add("History_event_text", "d").color - property int pointSize: Units.dp * 10 - } - } - - property QtObject message: QtObject { - property int padding: 8 - property int radius: 4 - - property QtObject extraContent: QtObject { - property int leftMargin: 10 - property int spacing: 5 - property int rightMargin: 5 - } - } - - property QtObject time: QtObject { - property color color: ColorsList.add("History_time", "d").color - property int pointSize: Units.dp * 10 - property int width: 44 - } - } + property string sectionName: 'History' + property color color: ColorsList.add(sectionName, 'q').color + + property QtObject sectionHeading: QtObject { + property int padding: 5 + property int bottomMargin: 20 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_section_border', 'g10').color + property int width: 1 + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 10 + property color color: ColorsList.add(sectionName+'_section_text', 'g').color + } + } + + + property QtObject entry: QtObject { + property int bottomMargin: 10 + property int deleteIconSize: 22 + property int leftMargin: 18 + property int lineHeight: 30 + property int metaWidth: 40 + + property QtObject event: QtObject { + property int iconSize: 18 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_event_text', 'd').color + property int pointSize: Units.dp * 10 + } + } + + property QtObject message: QtObject { + property int padding: 8 + property int radius: 4 + + property QtObject extraContent: QtObject { + property int leftMargin: 10 + property int spacing: 5 + property int rightMargin: 5 + } + } + + property QtObject time: QtObject { + property color color: ColorsList.add(sectionName+'_time', 'd').color + property int pointSize: Units.dp * 10 + property int width: 44 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml index 58fac0560..e87f57c2e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml @@ -8,24 +8,25 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 1 - property int maxHeight: 164 - - property QtObject entry: QtObject { - property int leftMargin: 18 - property int rightMargin: 8 - property int height: 40 - property int width: 300 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("SipAddressView_entry_hovered", "j").color - property color normal: ColorsList.add("SipAddressView_entry_normal", "g").color - property color pressed: ColorsList.add("SipAddressView_entry_pressed", "i").color - } - - property QtObject text: QtObject { - property color color: ColorsList.add("SipAddressView_entry_text", "q").color - property int pointSize: Units.dp * 10 - } - } + property string sectionName: 'SipAddressesMenu' + property int spacing: 1 + property int maxHeight: 164 + + property QtObject entry: QtObject { + property int leftMargin: 18 + property int rightMargin: 8 + property int height: 40 + property int width: 300 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_entry_h', 'j').color + property color normal: ColorsList.add(sectionName+'_entry_n', 'g').color + property color pressed: ColorsList.add(sectionName+'_entry_p', 'i').color + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_entry_text', 'q').color + property int pointSize: Units.dp * 10 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml index e1e54b7ed..067443948 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml @@ -8,13 +8,14 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject iconSize: QtObject { - property int amount: 12 - property int message: 18 - } - - property QtObject text: QtObject { - property color color: ColorsList.add("MessageCounter_text", "q").color - property int pointSize: Units.dp * 6 - } + property string sectionName: 'MessageCounter' + property QtObject iconSize: QtObject { + property int amount: 12 + property int message: 18 + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_text', 'q').color + property int pointSize: Units.dp * 6 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml index 1ef89432a..5369db52c 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml @@ -7,12 +7,13 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int leftMargin: 30 - property int rightMargin: 15 - property int overrodeHeight: 55 - - property QtObject message: QtObject { - property color color: ColorsList.add("Notification_basic_message", "h").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'NotificationBasic' + property int leftMargin: 30 + property int rightMargin: 15 + property int overrodeHeight: 55 + + property QtObject message: QtObject { + property color color: ColorsList.add(sectionName+'_message', 'h').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml index 03a3b6e43..2555eaa04 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml @@ -1,16 +1,50 @@ pragma Singleton import QtQml 2.2 - +import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 0 - property int bottomMargin: 15 - property int leftMargin: 15 - property int rightMargin: 15 - - property QtObject actionArea: QtObject { - property int iconSize: 40 - property int rightButtonsGroupMargin: 15 - } + property string sectionName: 'IncomingCallNotification' + property int spacing: 0 + property int bottomMargin: 15 + property int leftMargin: 15 + property int rightMargin: 15 + + property QtObject actionArea: QtObject { + property int iconSize: 40 + property int rightButtonsGroupMargin: 15 + } + property QtObject hangup: QtObject { + property int iconSize: 40 + property string icon : 'hangup_custom' + property string name : 'hangup' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + } + property QtObject acceptVideoCall: QtObject { + property int iconSize: 40 + property string icon : 'video_call_accept_custom' + property string name : 'videoCallAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } + property QtObject acceptCall: QtObject { + property int iconSize: 40 + property string icon : 'call_accept_custom' + property string name : 'callAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml index 47bbaaa7b..dd68f7454 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml @@ -7,20 +7,21 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("NorificationReceived_file", "k").color - property int leftMargin: 25 - property int overrodeHeight: 55 - property int rightMargin: 15 - property int spacing: 10 - - property QtObject fileName: QtObject { - property color color: ColorsList.add("NorificationReceived_file_name", "h").color - property int pointSize: Units.dp * 10 - } - - property QtObject fileSize: QtObject { - property color color: ColorsList.add("NorificationReceived_file_size", "h").color - property int pointSize: Units.dp * 9 - property int width: 100 - } + property string sectionName: 'NotificationReceived' + property color color: ColorsList.add(sectionName+'_file', 'k').color + property int leftMargin: 25 + property int overrodeHeight: 55 + property int rightMargin: 15 + property int spacing: 10 + + property QtObject fileName: QtObject { + property color color: ColorsList.add(sectionName+'_file_name', 'h').color + property int pointSize: Units.dp * 10 + } + + property QtObject fileSize: QtObject { + property color color: ColorsList.add(sectionName+'_file_size', 'h').color + property int pointSize: Units.dp * 9 + property int width: 100 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml index 5a3829ac4..980269b85 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml @@ -7,21 +7,22 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("NorificationReceived_message", "k").color - property int bottomMargin: 15 - property int leftMargin: 15 - property int overrodeHeight: 55 - property int rightMargin: 15 - property int spacing: 0 - - property QtObject messageContainer: QtObject { - property color color: ColorsList.add("NorificationReceived_message_container", "o").color - property int radius: 6 - property int margins: 10 - - property QtObject text: QtObject { - property color color: ColorsList.add("NorificationReceived_message_container_text", "l").color - property int pointSize: Units.dp * 9 - } - } + property string sectionName: 'NotificationReceivedMessage' + property color color: ColorsList.add(sectionName+'_message', 'k').color + property int bottomMargin: 15 + property int leftMargin: 15 + property int overrodeHeight: 55 + property int rightMargin: 15 + property int spacing: 0 + + property QtObject messageContainer: QtObject { + property color color: ColorsList.add(sectionName+'_message_container', 'o').color + property int radius: 6 + property int margins: 10 + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_message_container_text', 'l').color + property int pointSize: Units.dp * 9 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml index e6625c9fa..733acba29 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml @@ -6,13 +6,14 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Norification", "k").color - property int height: 120 - property int iconSize: 40 - property int width: 300 - - property QtObject border: QtObject { - property color color: ColorsList.add("Norification_border", "n").color - property int width: 1 - } + property string sectionName: 'Notification' + property color color: ColorsList.add(sectionName, 'k').color + property int height: 120 + property int iconSize: 40 + property int width: 300 + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_border', 'n').color + property int width: 1 + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml b/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml index f0ed030a5..1fb7b7f9b 100644 --- a/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml @@ -6,33 +6,34 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int columnSpacing: 0 - property int height: 180 - property int rowSpacing: 0 - property int width: 180 - property color color: ColorsList.add("TelKeypad", "k").color - property color selectedColor : ColorsList.add("TelKeypad_selected", "m").color - property int selectedBorderWidth: 2 - property real radius : 5.0 - - property QtObject button: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("TelKeypad_button_normal", "q").color - property color pressed: ColorsList.add("TelKeypad_button_pressed", "i").color - } - - property QtObject line: QtObject { - property color color: ColorsList.add("TelKeypad_button_line", "l50").color - property int bottomMargin: 4 - property int height: 2 - property int leftMargin: 8 - property int rightMargin: 8 - property int topMargin: 0 - } - - property QtObject text: QtObject { - property color color: ColorsList.add("TelKeypad_button_text", "d").color - property int pointSize: Units.dp * 11 - } - } + property string sectionName: 'TelKeypad' + property int columnSpacing: 0 + property int height: 180 + property int rowSpacing: 0 + property int width: 180 + property color color: ColorsList.add(sectionName+'', 'k').color + property color selectedColor : ColorsList.add(sectionName+'_c', 'm').color + property int selectedBorderWidth: 2 + property real radius : 5.0 + + property QtObject button: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_b_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_b_p', 'i').color + } + + property QtObject line: QtObject { + property color color: ColorsList.add(sectionName+'_b_line', 'l50').color + property int bottomMargin: 4 + property int height: 2 + property int leftMargin: 8 + property int rightMargin: 8 + property int topMargin: 0 + } + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_b_text', 'd').color + property int pointSize: Units.dp * 11 + } + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml index 52b6d7a9e..276b93aae 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml @@ -7,43 +7,59 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Timeline_background", "q").color - - property QtObject contact: QtObject { - property int height: 60 - - property QtObject backgroundColor: QtObject { - property color a: ColorsList.add("Timeline_contact_background_a", "g10").color - property color b: ColorsList.add("Timeline_contact_background_b", "a").color - property color selected: ColorsList.add("Timeline_contact_background_selected", "i").color - } - - property QtObject sipAddress: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("Timeline_contact_sipAddress_normal", "n").color - property color selected: ColorsList.add("Timeline_contact_sipAddress_selected", "q").color - } - } - - property QtObject username: QtObject { - property QtObject color: QtObject { - property color normal: ColorsList.add("Timeline_contact_username_normal", "j").color - property color selected: ColorsList.add("Timeline_contact_username_selected", "q").color - } - } - } - - property QtObject legend: QtObject { - property QtObject backgroundColor: QtObject { - property color normal: ColorsList.add("Timeline_contact_legend_background_normal", "f").color - property color hovered: ColorsList.add("Timeline_contact_legend_background_hovered", "c").color - } - property color color: ColorsList.add("Timeline_contact_legend", "d").color - property int pointSize: Units.dp * 10 - property int height: 30 - property int iconSize: 14 - property int leftMargin: 17 - property int rightMargin: 17 - property int spacing: 8 - } + property string sectionName: 'Timeline' + property color color: ColorsList.add(sectionName+'_bg', 'q').color + + property QtObject ephemeralTimer: QtObject{ + property string icon: 'timer_custom' + property int iconSize : 30 + property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color + property color selectedTimerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer_c', icon, 'q').color + } + + property QtObject contact: QtObject { + property int height: 60 + + property QtObject backgroundColor: QtObject { + property color a: ColorsList.add(sectionName+'_contact_bg_a', 'g10').color + property color b: ColorsList.add(sectionName+'_contact_bg_b', 'a').color + property color selected: ColorsList.add(sectionName+'_contact_bg_c', 'i').color + } + + property QtObject sipAddress: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_contact_sipAddress_n', 'n').color + property color selected: ColorsList.add(sectionName+'_contact_sipAddress_c', 'q').color + } + } + + property QtObject username: QtObject { + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_contact_username_n', 'j').color + property color selected: ColorsList.add(sectionName+'_contact_username_c', 'q').color + } + } + } + + property QtObject legend: QtObject { + property QtObject backgroundColor: QtObject { + property color normal: ColorsList.add(sectionName+'_legend_bg_n', 'f').color + property color hovered: ColorsList.add(sectionName+'_legend_bg_h', 'c').color + } + property color color: ColorsList.add(sectionName+'_legend', 'd').color + property int pointSize: Units.dp * 10 + property int height: 30 + property int iconSize: 28 + property int leftMargin: 17 + property int rightMargin: 17 + property int spacing: 1 + } + property QtObject filterField: QtObject { + property color borderColor: ColorsList.add(sectionName+'_filter_border', 'border').color + } + + property QtObject searchField: QtObject { + property color color: ColorsList.add(sectionName+'_searchField', 'c').color + property color borderColor: ColorsList.add(sectionName+'_searchField_border', 'border').color + } } diff --git a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml index ffdce74ce..1a21e49e0 100644 --- a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml @@ -7,10 +7,11 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'ParticipantsView' property QtObject entry: QtObject { property QtObject status: QtObject { - property color color : ColorsList.add("Participants_entry_status", "g").color + property color color : ColorsList.add(sectionName+'_entry_status', 'g').color property int pointSize : Units.dp * 8 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml index 9cb3e2b74..3567631c6 100644 --- a/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml @@ -7,48 +7,95 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject entry: QtObject { - property int height: 50 - property int iconSize: 36 - property int rightMargin: 10 - - property QtObject color: QtObject { - property color hovered: ColorsList.add("SipAddressesView_entry_hovered", "o").color - property color normal: ColorsList.add("SipAddressesView_entry_normal", "q").color - } - - property QtObject indicator: QtObject { - property color color: ColorsList.add("SipAddressesView_entry_indicator", "i").color - property int width: 5 - } - - property QtObject separator: QtObject { - property color color: ColorsList.add("SipAddressesView_entry_separator", "c").color - property int height: 1 - } - } - - property QtObject header: QtObject { - property int iconSize: 22 - property int leftMargin: 20 - property int rightMargin: 10 - - property QtObject button: QtObject { - property int height: 40 - } - - property QtObject color: QtObject { - property color normal: ColorsList.add("SipAddressesView_header_normal", "j").color - property color pressed: ColorsList.add("SipAddressesView_header_pressed", "i").color - } - - property QtObject text: QtObject { - property int pointSize: Units.dp * 9 - - property QtObject color: QtObject { - property color normal: ColorsList.add("SipAddressesView_header_text_normal", "q").color - property color pressed: ColorsList.add("SipAddressesView_header_text_pressed", "q").color - } - } - } + property string sectionName: 'SipAddressesView' + property QtObject entry: QtObject { + property int height: 50 + property int iconSize: 36 + property int rightMargin: 10 + + property QtObject color: QtObject { + property color hovered: ColorsList.add(sectionName+'_entry_h', 'o').color + property color normal: ColorsList.add(sectionName+'_entry_n', 'q').color + } + + property QtObject indicator: QtObject { + property color color: ColorsList.add(sectionName+'_entry_indicator', 'i').color + property int width: 5 + } + + property QtObject separator: QtObject { + property color color: ColorsList.add(sectionName+'_entry_separator', 'c').color + property int height: 1 + } + } + + property QtObject header: QtObject { + property int iconSize: 40 + property int leftMargin: 20 + property int rightMargin: 10 + + property QtObject button: QtObject { + property int height: 40 + property color color: ColorsList.add(sectionName+'_header_button', 'q').color + } + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_header_n', 'j').color + property color pressed: ColorsList.add(sectionName+'_header_p', 'i').color + } + + property QtObject text: QtObject { + property int pointSize: Units.dp * 9 + + property QtObject color: QtObject { + property color normal: ColorsList.add(sectionName+'_header_text_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_header_text_p', 'q').color + } + } + } + property QtObject videoCall: QtObject { + property int iconSize: 36 + property string name : 'videoCall' + property string icon : 'video_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject call: QtObject { + property int iconSize: 36 + property string name : 'call' + property string icon : 'call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject chat: QtObject { + property int iconSize: 36 + property string name : 'chat' + property string icon : 'chat_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject history: QtObject { + property int iconSize: 36 + property string icon : 'history_custom' + property string name : 'history' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + } diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml index d88c75c13..be0adffd3 100644 --- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml +++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml @@ -87,8 +87,9 @@ Rectangle { Icon { id:filterButton Layout.alignment: Qt.AlignRight - icon: 'timeline_filter' + icon: 'filter_params_custom' iconSize: TimelineStyle.legend.iconSize + overwriteColor: TimelineStyle.legend.color MouseArea{ anchors.fill:parent onClicked:{ @@ -108,9 +109,11 @@ Rectangle { Icon { id:searchButton anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - icon: (searchView.visible? 'timeline_close': 'timeline_search') + anchors.horizontalCenter: parent.horizontalCenter + property bool searching: searchView.visible + icon: (searchView.visible? 'close_custom': 'search_custom') iconSize: TimelineStyle.legend.iconSize + overwriteColor: TimelineStyle.legend.color } } } @@ -123,7 +126,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: filterChoices.height Layout.alignment: Qt.AlignCenter - border.color: ColorsList.add("Timeline_filter_border", "border").color + border.color: TimelineStyle.filterField.borderColor border.width: 2 visible:false @@ -192,7 +195,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 40 Layout.alignment: Qt.AlignCenter - border.color: ColorsList.add("Timeline_search_border", "border").color + border.color: TimelineStyle.searchField.borderColor border.width: 2 visible:false onVisibleChanged: if(visible){ @@ -209,7 +212,9 @@ Rectangle { margins: 7 } width: parent.width - 14 - icon: 'search' + icon: 'search_custom' + iconSize: 30 + overwriteColor: TimelineStyle.searchField.color //: 'Search in the list' : ths is a placeholder when searching something in the timeline list placeholderText: qsTr('timelineSearchPlaceholderText') @@ -257,8 +262,9 @@ Rectangle { isClickable: true } Icon{ - icon: modelData && modelData.selected ? 'timer_light' : 'timer' - iconSize: 15 + icon: TimelineStyle.ephemeralTimer.icon + iconSize: TimelineStyle.ephemeralTimer.iconSize + overwriteColor: modelData && modelData.selected ? TimelineStyle.ephemeralTimer.selectedTimerColor : TimelineStyle.ephemeralTimer.timerColor anchors.right:parent.right anchors.bottom:parent.bottom anchors.bottomMargin: 7 diff --git a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml index a5d7debef..1e35c1140 100644 --- a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml +++ b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml @@ -117,7 +117,9 @@ ScrollableListView { model: sipAddressesView.actions ActionButton { - icon: modelData.icon + isCustom: true + backgroundRadius: 90 + colorSet: modelData.colorSet visible: (sipAddressesView.actions[index].visibleHandler ? sipAddressesView.actions[index].visibleHandler($sipAddress) : sipAddressesView.actions[index].visible) onClicked: sipAddressesView.actions[index].handler({ @@ -275,7 +277,10 @@ ScrollableListView { model: sipAddressesView.actions ActionButton { - icon: modelData.icon + isCustom: true + backgroundRadius: 90 + colorSet: modelData.colorSet + anchors.verticalCenter: parent.verticalCenter tooltipText:modelData.tooltipText?modelData.tooltipText:'' visible: (sipAddressesView.actions[index].visibleHandler ? sipAddressesView.actions[index].visibleHandler($sipAddress) : sipAddressesView.actions[index].visible) onClicked: { diff --git a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml index 80b8d51e7..963778913 100644 --- a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml +++ b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml @@ -6,6 +6,7 @@ import Linphone 1.0 import LinphoneEnums 1.0 import UtilsCpp 1.0 +import App.Styles 1.0 import Linphone.Styles 1.0 import Common.Styles 1.0 @@ -27,6 +28,7 @@ ScrollableListView { // Optional parameters. property string headerButtonDescription property string headerButtonIcon + property color headerButtonOverwriteColor property var headerButtonAction property bool showHeader : true property bool showContactAddress : true @@ -116,7 +118,9 @@ ScrollableListView { model: sipAddressesView.actions ActionButton { - icon: modelData.icon + isCustom: true + backgroundRadius: 90 + colorSet: modelData.colorSet visible: (sipAddressesView.actions[index].visibleHandler ? sipAddressesView.actions[index].visibleHandler({ sipAddress : sipAddressesView.interpretableSipAddress}) : sipAddressesView.actions[index].visible) @@ -185,6 +189,7 @@ ScrollableListView { icon: sipAddressesView.headerButtonIcon iconSize: SipAddressesViewStyle.header.iconSize + overwriteColor: sipAddressesView.headerButtonOverwriteColor visible: icon.length > 0 } @@ -272,7 +277,9 @@ ScrollableListView { model: sipAddressesView.actions ActionButton { - icon: modelData.icon + isCustom: true + backgroundRadius: 90 + colorSet: modelData.colorSet tooltipText:modelData.tooltipText?modelData.tooltipText:'' visible: (sipAddressesView.actions[index].visibleHandler ? sipAddressesView.actions[index].visibleHandler($sipAddress) : sipAddressesView.actions[index].visible) onClicked: { diff --git a/linphone-app/ui/modules/Linphone/qmldir b/linphone-app/ui/modules/Linphone/qmldir index 1e1ae148d..096c3b498 100644 --- a/linphone-app/ui/modules/Linphone/qmldir +++ b/linphone-app/ui/modules/Linphone/qmldir @@ -38,4 +38,4 @@ Timeline 1.0 Timeline/Timeline.qml SipAddressesView 1.0 View/SipAddressesView.qml -ParticipantsView 1.0 View/ParticipantsView.qml +ParticipantsView 1.0 View/ParticipantsView.qml \ No newline at end of file diff --git a/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml b/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml index 717485e0b..ffec46621 100644 --- a/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml +++ b/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml @@ -12,118 +12,120 @@ import App.Styles 1.0 // ============================================================================= Rectangle { - property var call - - default property alias _actionArea: actionArea.data - property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver(call.fullPeerAddress, call.fullLocalAddress) - property alias showKeypad :telKeypadButton.visible - - // --------------------------------------------------------------------------- - - color: CallStyle.backgroundColor - - ColumnLayout { - anchors { - fill: parent - topMargin: CallStyle.header.topMargin - } - - spacing: 0 - - // ------------------------------------------------------------------------- - // Contact & Call type (animation). - // ------------------------------------------------------------------------- - - Column { - Layout.fillWidth: true - spacing: CallStyle.header.spacing - - ContactDescription { - id: contactDescription - anchors.horizontalCenter: parent.horizontalCenter - height: CallStyle.header.contactDescription.height - horizontalTextAlignment: Text.AlignHCenter - sipAddress: call.peerAddress - username: UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) - width: contentWidth - } - - BusyIndicator { - anchors.horizontalCenter: parent.horizontalCenter - color: CallStyle.header.busyIndicator.color - height: CallStyle.header.busyIndicator.height - width: CallStyle.header.busyIndicator.width - - visible: call.isOutgoing - } - } - - // ------------------------------------------------------------------------- - // Contact visual. - // ------------------------------------------------------------------------- - - Item { - id: container - - Layout.fillHeight: true - Layout.fillWidth: true - Layout.margins: CallStyle.container.margins - - Avatar { - id: avatar - - function _computeAvatarSize () { - var height = container.height - var width = container.width - - var size = height < CallStyle.container.avatar.maxSize && height > 0 - ? height - : CallStyle.container.avatar.maxSize - return size < width ? size : width - } - - anchors.centerIn: parent - backgroundColor: CallStyle.container.avatar.backgroundColor - image: _sipAddressObserver.contact && _sipAddressObserver.contact.vcard.avatar - username: contactDescription.username - - height: _computeAvatarSize() - width: height - } - } - - // ------------------------------------------------------------------------- - // Buttons. - // ------------------------------------------------------------------------- - - Item { - id: actionArea - - Layout.fillWidth: true - Layout.preferredHeight: CallStyle.actionArea.height - } - } - - ActionButton { - id:telKeypadButton - icon: 'tel_keypad' - visible:false - onClicked: telKeypad.visible = !telKeypad.visible - anchors.left:parent.left - anchors.top:parent.top - iconSize: CallStyle.header.iconSize - anchors.leftMargin: CallStyle.header.leftMargin - anchors.topMargin: CallStyle.header.topMargin - } - - // --------------------------------------------------------------------------- - // TelKeypad. - // --------------------------------------------------------------------------- - - TelKeypad { - id: telKeypad - - call: parent.call - visible: SettingsModel.showTelKeypadAutomatically - } + property var call + + default property alias _actionArea: actionArea.data + property var _sipAddressObserver: SipAddressesModel.getSipAddressObserver(call.fullPeerAddress, call.fullLocalAddress) + property alias showKeypad :telKeypadButton.visible + + // --------------------------------------------------------------------------- + + color: CallStyle.backgroundColor + + ColumnLayout { + anchors { + fill: parent + topMargin: CallStyle.header.topMargin + } + + spacing: 0 + + // ------------------------------------------------------------------------- + // Contact & Call type (animation). + // ------------------------------------------------------------------------- + + Column { + Layout.fillWidth: true + spacing: CallStyle.header.spacing + + ContactDescription { + id: contactDescription + anchors.horizontalCenter: parent.horizontalCenter + height: CallStyle.header.contactDescription.height + horizontalTextAlignment: Text.AlignHCenter + sipAddress: call.peerAddress + username: UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) + width: contentWidth + } + + BusyIndicator { + anchors.horizontalCenter: parent.horizontalCenter + color: CallStyle.header.busyIndicator.color + height: CallStyle.header.busyIndicator.height + width: CallStyle.header.busyIndicator.width + + visible: call.isOutgoing + } + } + + // ------------------------------------------------------------------------- + // Contact visual. + // ------------------------------------------------------------------------- + + Item { + id: container + + Layout.fillHeight: true + Layout.fillWidth: true + Layout.margins: CallStyle.container.margins + + Avatar { + id: avatar + + function _computeAvatarSize () { + var height = container.height + var width = container.width + + var size = height < CallStyle.container.avatar.maxSize && height > 0 + ? height + : CallStyle.container.avatar.maxSize + return size < width ? size : width + } + + anchors.centerIn: parent + backgroundColor: CallStyle.container.avatar.backgroundColor + image: _sipAddressObserver.contact && _sipAddressObserver.contact.vcard.avatar + username: contactDescription.username + + height: _computeAvatarSize() + width: height + } + } + + // ------------------------------------------------------------------------- + // Buttons. + // ------------------------------------------------------------------------- + + Item { + id: actionArea + + Layout.fillWidth: true + Layout.preferredHeight: CallStyle.actionArea.height + } + } + + ActionButton { + id:telKeypadButton + isCustom: true + backgroundRadius: 90 + + colorSet : CallStyle.buttons.telKeyad + visible:false + onClicked: telKeypad.visible = !telKeypad.visible + anchors.left:parent.left + anchors.top:parent.top + anchors.leftMargin: CallStyle.header.leftMargin + anchors.topMargin: CallStyle.header.topMargin + } + + // --------------------------------------------------------------------------- + // TelKeypad. + // --------------------------------------------------------------------------- + + TelKeypad { + id: telKeypad + + call: parent.call + visible: SettingsModel.showTelKeypadAutomatically + } } diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml index 838b3220c..9b804b4c5 100644 --- a/linphone-app/ui/views/App/Calls/CallsWindow.qml +++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml @@ -12,250 +12,254 @@ import 'CallsWindow.js' as Logic // ============================================================================= Window { - id: window - - // --------------------------------------------------------------------------- - - // `{}` is a workaround to avoid `TypeError: Cannot read property...` when calls list is empty - readonly property var call: ( calls.selectedCall?calls.selectedCall:{ - callError: '', - isOutgoing: true, - recording: false, - localSas: '', - peerAddress: '', - localAddress: '', - type: false, - updating: true, - videoEnabled: false, - chatRoomModel:null - }); - - readonly property bool chatIsOpened: !rightPaned.isClosed() - - - // --------------------------------------------------------------------------- - - function openChat () { - rightPaned.open() - } - - function closeChat () { - rightPaned.close() - } - - - function conferenceManagerResult(exitValue){ - window.detachVirtualWindow(); - if(exitValue == 0 && calls.count == 0) - close(); - } - - function openConferenceManager (params) { - Logic.openConferenceManager(params, conferenceManagerResult) - } - - function setHeight (height) { - window.height = (Window.screen && height > Window.screen.desktopAvailableHeight) - ? Window.screen.desktopAvailableHeight - : height - } - - // --------------------------------------------------------------------------- - - minimumHeight: CallsWindowStyle.minimumHeight - minimumWidth: CallsWindowStyle.minimumWidth - title: qsTr('callsTitle') - - // --------------------------------------------------------------------------- - - onClosing: Logic.handleClosing(close) - onDetachedVirtualWindow: Logic.tryToCloseWindow() - - // --------------------------------------------------------------------------- - - Paned { - anchors.fill: parent - defaultChildAWidth: CallsWindowStyle.callsList.defaultWidth - maximumLeftLimit: CallsWindowStyle.callsList.maximumWidth - minimumLeftLimit: CallsWindowStyle.callsList.minimumWidth - - // ------------------------------------------------------------------------- - // Calls list. - // ------------------------------------------------------------------------- - - childA: Rectangle { - anchors.fill: parent - color: CallsWindowStyle.callsList.color - - ColumnLayout { - anchors.fill: parent - spacing: 0 - - Item { - Layout.fillWidth: true - Layout.preferredHeight: CallsWindowStyle.callsList.header.height - - visible: SettingsModel.outgoingCallsEnabled || SettingsModel.conferenceEnabled - - LinearGradient { - anchors.fill: parent - - start: Qt.point(0, 0) - end: Qt.point(0, height) - - gradient: Gradient { - GradientStop { position: 0.0; color: CallsWindowStyle.callsList.header.color1 } - GradientStop { position: 1.0; color: CallsWindowStyle.callsList.header.color2 } - } - } - - ActionBar { - anchors { - left: parent.left - leftMargin: CallsWindowStyle.callsList.header.leftMargin - verticalCenter: parent.verticalCenter - } - - iconSize: CallsWindowStyle.callsList.header.iconSize - - ActionButton { - icon: 'new_call' - visible: SettingsModel.outgoingCallsEnabled - - onClicked: Logic.openCallSipAddress() - } - - ActionButton { - icon: 'new_conference' - visible: SettingsModel.conferenceEnabled - - onClicked: { - Logic.openConferenceManager() - } - } - } - } - - Calls { - id: calls - - Layout.fillHeight: true - Layout.fillWidth: true - - conferenceModel: ConferenceModel {} - model: CallsListProxyModel {} - } - } - } - - // ------------------------------------------------------------------------- - // Content. - // ------------------------------------------------------------------------- - - childB: Paned { - id: rightPaned - - anchors.fill: parent - closingEdge: Qt.RightEdge - defaultClosed: true - minimumLeftLimit: CallsWindowStyle.call.minimumWidth - minimumRightLimit: CallsWindowStyle.chat.minimumWidth - resizeAInPriority: true - - // ----------------------------------------------------------------------- - - Component { - id: incomingCall - - IncomingCall { - call: window.call - } - } - - Component { - id: outgoingCall - - OutgoingCall { - call: window.call - } - } - - Component { - id: incall - - Incall { - call: window.call - } - } - - Component { - id: endedCall - - EndedCall { - call: window.call - } - } - - Component { - id: chat - - Chat { - proxyModel: ChatRoomProxyModel { - Component.onCompleted: { - if (chatRoomModel - && (!chatRoomModel.haveEncryption && !SettingsModel.standardChatEnabled || chatRoomModel.haveEncryption && !SettingsModel.secureChatEnabled)) { - setEntryTypeFilter(ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) - } - } - chatRoomModel: window.call.chatRoomModel - peerAddress: window.call.peerAddress - fullPeerAddress: window.call.fullPeerAddress - fullLocalAddress: window.call.fullLocalAddress - localAddress: window.call.localAddress - - onChatRoomModelChanged: if(chatRoomModel) chatRoomModel.initEntries() - } - - Connections { - target: SettingsModel - onStandardChatEnabledChanged: if(!chatRoomModel.haveEncryption) proxyModel.setEntryTypeFilter(status ? ChatRoomModel.GenericEntry : ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) - onSecureChatEnabledChanged: if(chatRoomModel.haveEncryption) proxyModel.setEntryTypeFilter(status ? ChatRoomModel.GenericEntry : ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) - } - } - } - - Component { - id: conference - - Conference { - conferenceModel: calls.conferenceModel - } - } - - // ----------------------------------------------------------------------- - - childA: Loader { - anchors.fill: parent - sourceComponent: Logic.getContent() - onSourceComponentChanged: {rightPaned.childAItem.update()}// Force update when loading a new Content. It's just to be sure - } - - childB: Loader { - anchors.fill: parent - sourceComponent: window.call && window.call.peerAddress && window.call.localAddress ? chat : null - } - } - } - - // --------------------------------------------------------------------------- - // Handle transfer. - // Handle count changed. Not on proxy model!!! - // --------------------------------------------------------------------------- - - Connections { - target: CallsListModel - onCallTransferAsked: Logic.handleCallTransferAsked(callModel) - onCallAttendedTransferAsked: Logic.handleCallAttendedTransferAsked(callModel) - onRowsRemoved: Logic.tryToCloseWindow() - } + id: window + + // --------------------------------------------------------------------------- + + // `{}` is a workaround to avoid `TypeError: Cannot read property...` when calls list is empty + readonly property var call: ( calls.selectedCall?calls.selectedCall:{ + callError: '', + isOutgoing: true, + recording: false, + localSas: '', + peerAddress: '', + localAddress: '', + type: false, + updating: true, + videoEnabled: false, + chatRoomModel:null + }); + + readonly property bool chatIsOpened: !rightPaned.isClosed() + + + // --------------------------------------------------------------------------- + + function openChat () { + rightPaned.open() + } + + function closeChat () { + rightPaned.close() + } + + + function conferenceManagerResult(exitValue){ + window.detachVirtualWindow(); + if(exitValue == 0 && calls.count == 0) + close(); + } + + function openConferenceManager (params) { + Logic.openConferenceManager(params, conferenceManagerResult) + } + + function setHeight (height) { + window.height = (Window.screen && height > Window.screen.desktopAvailableHeight) + ? Window.screen.desktopAvailableHeight + : height + } + + // --------------------------------------------------------------------------- + + minimumHeight: CallsWindowStyle.minimumHeight + minimumWidth: CallsWindowStyle.minimumWidth + title: qsTr('callsTitle') + + // --------------------------------------------------------------------------- + + onClosing: Logic.handleClosing(close) + onDetachedVirtualWindow: Logic.tryToCloseWindow() + + // --------------------------------------------------------------------------- + + Paned { + anchors.fill: parent + defaultChildAWidth: CallsWindowStyle.callsList.defaultWidth + maximumLeftLimit: CallsWindowStyle.callsList.maximumWidth + minimumLeftLimit: CallsWindowStyle.callsList.minimumWidth + + // ------------------------------------------------------------------------- + // Calls list. + // ------------------------------------------------------------------------- + + childA: Rectangle { + anchors.fill: parent + color: CallsWindowStyle.callsList.color + + ColumnLayout { + anchors.fill: parent + spacing: 0 + + Item { + Layout.fillWidth: true + Layout.preferredHeight: CallsWindowStyle.callsList.header.height + + visible: SettingsModel.outgoingCallsEnabled || SettingsModel.conferenceEnabled + + LinearGradient { + anchors.fill: parent + + start: Qt.point(0, 0) + end: Qt.point(0, height) + + gradient: Gradient { + GradientStop { position: 0.0; color: CallsWindowStyle.callsList.header.color1 } + GradientStop { position: 1.0; color: CallsWindowStyle.callsList.header.color2 } + } + } + + ActionBar { + anchors { + left: parent.left + leftMargin: CallsWindowStyle.callsList.header.leftMargin + verticalCenter: parent.verticalCenter + } + + iconSize: CallsWindowStyle.callsList.header.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 4 + colorSet: CallsWindowStyle.callsList.newCall + visible: SettingsModel.outgoingCallsEnabled + + onClicked: Logic.openCallSipAddress() + } + + ActionButton { + isCustom: true + backgroundRadius: 4 + colorSet: CallsWindowStyle.callsList.newConference + visible: SettingsModel.conferenceEnabled + + onClicked: { + Logic.openConferenceManager() + } + } + } + } + + Calls { + id: calls + + Layout.fillHeight: true + Layout.fillWidth: true + + conferenceModel: ConferenceModel {} + model: CallsListProxyModel {} + } + } + } + + // ------------------------------------------------------------------------- + // Content. + // ------------------------------------------------------------------------- + + childB: Paned { + id: rightPaned + + anchors.fill: parent + closingEdge: Qt.RightEdge + defaultClosed: true + minimumLeftLimit: CallsWindowStyle.call.minimumWidth + minimumRightLimit: CallsWindowStyle.chat.minimumWidth + resizeAInPriority: true + + // ----------------------------------------------------------------------- + + Component { + id: incomingCall + + IncomingCall { + call: window.call + } + } + + Component { + id: outgoingCall + + OutgoingCall { + call: window.call + } + } + + Component { + id: incall + + Incall { + call: window.call + } + } + + Component { + id: endedCall + + EndedCall { + call: window.call + } + } + + Component { + id: chat + + Chat { + proxyModel: ChatRoomProxyModel { + Component.onCompleted: { + if (chatRoomModel + && (!chatRoomModel.haveEncryption && !SettingsModel.standardChatEnabled || chatRoomModel.haveEncryption && !SettingsModel.secureChatEnabled)) { + setEntryTypeFilter(ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) + } + } + chatRoomModel: window.call.chatRoomModel + peerAddress: window.call.peerAddress + fullPeerAddress: window.call.fullPeerAddress + fullLocalAddress: window.call.fullLocalAddress + localAddress: window.call.localAddress + + onChatRoomModelChanged: if(chatRoomModel) chatRoomModel.initEntries() + } + + Connections { + target: SettingsModel + onStandardChatEnabledChanged: if(!chatRoomModel.haveEncryption) proxyModel.setEntryTypeFilter(status ? ChatRoomModel.GenericEntry : ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) + onSecureChatEnabledChanged: if(chatRoomModel.haveEncryption) proxyModel.setEntryTypeFilter(status ? ChatRoomModel.GenericEntry : ChatRoomModel.CallEntry | ChatRoomModel.NoticeEntry) + } + } + } + + Component { + id: conference + + Conference { + conferenceModel: calls.conferenceModel + } + } + + // ----------------------------------------------------------------------- + + childA: Loader { + anchors.fill: parent + sourceComponent: Logic.getContent() + onSourceComponentChanged: {rightPaned.childAItem.update()}// Force update when loading a new Content. It's just to be sure + } + + childB: Loader { + anchors.fill: parent + sourceComponent: window.call && window.call.peerAddress && window.call.localAddress ? chat : null + } + } + } + + // --------------------------------------------------------------------------- + // Handle transfer. + // Handle count changed. Not on proxy model!!! + // --------------------------------------------------------------------------- + + Connections { + target: CallsListModel + onCallTransferAsked: Logic.handleCallTransferAsked(callModel) + onCallAttendedTransferAsked: Logic.handleCallAttendedTransferAsked(callModel) + onRowsRemoved: Logic.tryToCloseWindow() + } } diff --git a/linphone-app/ui/views/App/Calls/Conference.qml b/linphone-app/ui/views/App/Calls/Conference.qml index c14443710..051b505f4 100644 --- a/linphone-app/ui/views/App/Calls/Conference.qml +++ b/linphone-app/ui/views/App/Calls/Conference.qml @@ -13,259 +13,263 @@ import App.Styles 1.0 // ============================================================================= Rectangle { - id: conference - - property var conferenceModel - - // --------------------------------------------------------------------------- - - color: CallStyle.backgroundColor - - // --------------------------------------------------------------------------- - - ColumnLayout { - anchors { - fill: parent - topMargin: CallStyle.header.topMargin - } - - spacing: 0 - - // ------------------------------------------------------------------------- - // Conference info. - // ------------------------------------------------------------------------- - - Item { - id: info - - Layout.fillWidth: true - Layout.leftMargin: CallStyle.header.leftMargin - Layout.rightMargin: CallStyle.header.rightMargin - Layout.preferredHeight: ConferenceStyle.description.height - - ActionBar { - id: leftActions - - anchors.left: parent.left - iconSize: CallStyle.header.iconSize - } - - Text { - id: conferenceDescription - - anchors.centerIn: parent - - horizontalAlignment: Text.AlignHCenter - text: qsTr('conferenceTitle') - - color: ConferenceStyle.description.color - - font { - bold: true - pointSize: ConferenceStyle.description.pointSize - } - - height: parent.height - width: parent.width - rightActions.width - leftActions.width - ConferenceStyle.description.width - } - - - // ----------------------------------------------------------------------- - // Video actions. - // ----------------------------------------------------------------------- - - ActionBar { - id: rightActions - - anchors.right: parent.right - iconSize: CallStyle.header.buttonIconSize - - ActionSwitch { - enabled: conference.conferenceModel.recording - icon: 'record' - useStates: false - visible: SettingsModel.callRecorderEnabled - - onClicked: !enabled - ? conference.conferenceModel.startRecording() - : conference.conferenceModel.stopRecording() - } - } - } - - // ------------------------------------------------------------------------- - // Contacts visual. - // ------------------------------------------------------------------------- - - Item { - id: container - - Layout.fillWidth: true - Layout.fillHeight: true - Layout.margins: CallStyle.container.margins - - GridView { - id: grid - - anchors.fill: parent - - cellHeight: ConferenceStyle.grid.cell.height - cellWidth: ConferenceStyle.grid.cell.width - - model: conference.conferenceModel - - delegate: Item { - height: grid.cellHeight - width: grid.cellWidth - - Column { - readonly property string sipAddress: $call.peerAddress - property var _sipAddressObserver : SipAddressesModel.getSipAddressObserver($call.peerAddress, $call.localAddress) - - anchors { - fill: parent - margins: ConferenceStyle.grid.spacing - } - - spacing: ConferenceStyle.grid.cell.spacing - - ContactDescription { - id: contactDescription - - height: ConferenceStyle.grid.cell.contactDescription.height - width: parent.width - - horizontalTextAlignment: Text.AlignHCenter - sipAddress: parent.sipAddress - username: UtilsCpp.getDisplayName(parent._sipAddressObserver.peerAddress) - } - IncallAvatar { - - readonly property int size: Math.min( - parent.width, - parent.height - contactDescription.height - parent.spacing - ) - - anchors.horizontalCenter: parent.horizontalCenter - call: $call - onCallChanged: if(!call) conference.conferenceModel.invalidate() - - height: size - width: size - - BusyIndicator { - anchors { - horizontalCenter: parent.horizontalCenter - verticalCenter: parent.verticalCenter - } - - color: CallStyle.header.busyIndicator.color - height: CallStyle.header.busyIndicator.height - width: CallStyle.header.busyIndicator.width - - visible: $call && $call.status === CallModel.CallStatusOutgoing - } - } - } - - VuMeter { - anchors { - bottom: parent.bottom - left: parent.left - leftMargin: ConferenceStyle.grid.spacing - bottomMargin: ConferenceStyle.grid.spacing - } - enabled:!$call.speakerMuted - - Timer { - interval: 50 - repeat: true - running: true - onTriggered: parent.value = $call.speakerVu - } - } - MouseArea{ - anchors.fill:parent - onClicked:$call.toggleSpeakerMute() - } - } - } - } - - // ------------------------------------------------------------------------- - // Action Buttons. - // ------------------------------------------------------------------------- - - Item { - Layout.fillWidth: true - Layout.preferredHeight: CallStyle.actionArea.height - - GridLayout { - anchors { - left: parent.left - leftMargin: CallStyle.actionArea.leftButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - columns: incall.width < CallStyle.actionArea.lowWidth ? 2 : 4 - rowSpacing: ActionBarStyle.spacing - - Row { - spacing: CallStyle.actionArea.vu.spacing - - VuMeter { - Timer { - interval: 50 - repeat: true - running: micro.enabled - - onTriggered: parent.value = conference.conferenceModel.microVu - } - - enabled: micro.enabled - } - - ActionSwitch { - id: micro - enabled: !conference.conferenceModel.microMuted - - icon: 'micro' - iconSize: CallStyle.actionArea.iconSize - - onClicked: conference.conferenceModel.microMuted = !conference.conferenceModel.microMuted - } - } - } - - ActionBar { - anchors { - right: parent.right - rightMargin: CallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - iconSize: CallStyle.actionArea.iconSize - - ActionSwitch { - enabled: conference.conferenceModel.isInConf - icon: 'pause' - - onClicked: { - var model = conference.conferenceModel - if (model.isInConf) { - model.leave() - } else { - model.join() - } - } - } - - ActionButton { - icon: 'hangup' - - onClicked: conference.conferenceModel.terminate() - } - } - } - } + id: conference + + property var conferenceModel + + // --------------------------------------------------------------------------- + + color: CallStyle.backgroundColor + + // --------------------------------------------------------------------------- + + ColumnLayout { + anchors { + fill: parent + topMargin: CallStyle.header.topMargin + } + + spacing: 0 + + // ------------------------------------------------------------------------- + // Conference info. + // ------------------------------------------------------------------------- + + Item { + id: info + + Layout.fillWidth: true + Layout.leftMargin: CallStyle.header.leftMargin + Layout.rightMargin: CallStyle.header.rightMargin + Layout.preferredHeight: ConferenceStyle.description.height + + ActionBar { + id: leftActions + + anchors.left: parent.left + iconSize: CallStyle.header.iconSize + } + + Text { + id: conferenceDescription + + anchors.centerIn: parent + + horizontalAlignment: Text.AlignHCenter + text: qsTr('conferenceTitle') + + color: ConferenceStyle.description.color + + font { + bold: true + pointSize: ConferenceStyle.description.pointSize + } + + height: parent.height + width: parent.width - rightActions.width - leftActions.width - ConferenceStyle.description.width + } + + + // ----------------------------------------------------------------------- + // Video actions. + // ----------------------------------------------------------------------- + + ActionBar { + id: rightActions + + anchors.right: parent.right + iconSize: CallStyle.header.buttonIconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + property bool recording: conference.conferenceModel.recording + colorSet: recording ? CallStyle.buttons.recordOn : CallStyle.buttons.recordOff + visible: SettingsModel.callRecorderEnabled + + onClicked: !recording + ? conference.conferenceModel.startRecording() + : conference.conferenceModel.stopRecording() + } + } + } + + // ------------------------------------------------------------------------- + // Contacts visual. + // ------------------------------------------------------------------------- + + Item { + id: container + + Layout.fillWidth: true + Layout.fillHeight: true + Layout.margins: CallStyle.container.margins + + GridView { + id: grid + + anchors.fill: parent + + cellHeight: ConferenceStyle.grid.cell.height + cellWidth: ConferenceStyle.grid.cell.width + + model: conference.conferenceModel + + delegate: Item { + height: grid.cellHeight + width: grid.cellWidth + + Column { + readonly property string sipAddress: $call.peerAddress + property var _sipAddressObserver : SipAddressesModel.getSipAddressObserver($call.peerAddress, $call.localAddress) + + anchors { + fill: parent + margins: ConferenceStyle.grid.spacing + } + + spacing: ConferenceStyle.grid.cell.spacing + + ContactDescription { + id: contactDescription + + height: ConferenceStyle.grid.cell.contactDescription.height + width: parent.width + + horizontalTextAlignment: Text.AlignHCenter + sipAddress: parent.sipAddress + username: UtilsCpp.getDisplayName(parent._sipAddressObserver.peerAddress) + } + IncallAvatar { + + readonly property int size: Math.min( + parent.width, + parent.height - contactDescription.height - parent.spacing + ) + + anchors.horizontalCenter: parent.horizontalCenter + call: $call + onCallChanged: if(!call) conference.conferenceModel.invalidate() + + height: size + width: size + + BusyIndicator { + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + + color: CallStyle.header.busyIndicator.color + height: CallStyle.header.busyIndicator.height + width: CallStyle.header.busyIndicator.width + + visible: $call && $call.status === CallModel.CallStatusOutgoing + } + } + } + + VuMeter { + anchors { + bottom: parent.bottom + left: parent.left + leftMargin: ConferenceStyle.grid.spacing + bottomMargin: ConferenceStyle.grid.spacing + } + enabled:!$call.speakerMuted + + Timer { + interval: 50 + repeat: true + running: true + onTriggered: parent.value = $call.speakerVu + } + } + MouseArea{ + anchors.fill:parent + onClicked:$call.toggleSpeakerMute() + } + } + } + } + + // ------------------------------------------------------------------------- + // Action Buttons. + // ------------------------------------------------------------------------- + + Item { + Layout.fillWidth: true + Layout.preferredHeight: CallStyle.actionArea.height + + GridLayout { + anchors { + left: parent.left + leftMargin: CallStyle.actionArea.leftButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + + columns: incall.width < CallStyle.actionArea.lowWidth ? 2 : 4 + rowSpacing: ActionBarStyle.spacing + + Row { + spacing: CallStyle.actionArea.vu.spacing + + VuMeter { + Timer { + interval: 50 + repeat: true + running: micro.enabled + + onTriggered: parent.value = conference.conferenceModel.microVu + } + + enabled: micro.enabled + } + + ActionSwitch { + id: micro + isCustom: true + backgroundRadius: 90 + colorSet: enabled ? CallStyle.buttons.microOn : CallStyle.buttons.microOff + enabled: !conference.conferenceModel.microMuted + + onClicked: conference.conferenceModel.microMuted = !conference.conferenceModel.microMuted + } + } + } + + ActionBar { + anchors { + right: parent.right + rightMargin: CallStyle.actionArea.rightButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + + iconSize: CallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: !conference.conferenceModel.isInConf ? CallStyle.buttons.play : CallStyle.buttons.pause + + onClicked: { + var model = conference.conferenceModel + if (model.isInConf) { + model.leave() + } else { + model.join() + } + } + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.hangup + + onClicked: conference.conferenceModel.terminate() + } + } + } + } } diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml index 4090c6b06..ce334f430 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml @@ -46,7 +46,8 @@ DialogPlus { Layout.fillWidth: true - icon: 'search' + icon: 'search_custom' + overwriteColor: CallSipAddressStyle.searchField.color onTextChanged: sipAddressesModel.setFilter(text) } @@ -68,7 +69,7 @@ DialogPlus { } actions: [{ - icon: 'video_call', + colorSet: CallSipAddressStyle.videoCall, secure:0, visible:true, handler: function (entry) { @@ -79,7 +80,7 @@ DialogPlus { launchVideoCall(sipAddress) } }, { - icon: 'call', + colorSet: CallSipAddressStyle.call, secure:0, visible:true, handler: function (entry) { diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml index c4395fc7c..c9c912813 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml @@ -67,7 +67,8 @@ DialogPlus { Layout.fillWidth: true - icon: 'search' + icon: 'search_custom' + overwriteColor: CallTransferStyle.searchField.color onTextChanged: sipAddressesModel.setFilter(text) } @@ -88,7 +89,7 @@ DialogPlus { exit(1) } actions: [{ - icon: 'transfer', + colorSet: CallTransferStyle.transfer, secure: 0, visible: true, handlerSipAddress: function(sipAddress){ diff --git a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml index 473bb47be..798ac2b04 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml @@ -78,7 +78,8 @@ DialogPlus { Layout.fillWidth: true - icon: 'search' + icon: 'search_custom' + overwriteColor: ConferenceManagerStyle.searchField.color onTextChanged: conferenceHelperModel.setFilter(text) } @@ -96,7 +97,7 @@ DialogPlus { conferenceHelperModel.toAdd.addToConference(sipAddress) } actions: [{ - icon: 'transfer', + colorSet: ConferenceManagerStyle.transfer, secure:0, visible: true, handler: function (entry) { @@ -151,7 +152,7 @@ DialogPlus { model.removeFromConference(sipAddress) } actions: [{ - icon: 'cancel', + colorSet: ConferenceManagerStyle.cancel, visible:true, secure:0, handler: function (entry) { diff --git a/linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml b/linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml index bb838ffa0..b48701aa3 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml @@ -48,8 +48,9 @@ DialogPlus { Layout.alignment: Qt.AlignTop Layout.preferredHeight: ComboBoxStyle.background.height - icon: 'speaker' - iconSize: MultimediaParametersStyle.column.entry.iconSize + icon: MultimediaParametersStyle.column.entry.speaker.icon + overwriteColor: MultimediaParametersStyle.column.entry.speaker.color + iconSize: MultimediaParametersStyle.column.entry.speaker.iconSize } Column { @@ -91,8 +92,9 @@ DialogPlus { Layout.alignment: Qt.AlignTop Layout.preferredHeight: ComboBoxStyle.background.height - icon: 'micro' - iconSize: MultimediaParametersStyle.column.entry.iconSize + icon: MultimediaParametersStyle.column.entry.micro.icon + overwriteColor: MultimediaParametersStyle.column.entry.micro.color + iconSize: MultimediaParametersStyle.column.entry.micro.iconSize } Column { @@ -131,8 +133,9 @@ DialogPlus { width: parent.width Icon { - icon: 'camera' - iconSize: MultimediaParametersStyle.column.entry.iconSize + icon: MultimediaParametersStyle.column.entry.camera.icon + overwriteColor: MultimediaParametersStyle.column.entry.camera.color + iconSize: MultimediaParametersStyle.column.entry.speaker.iconSize } ComboBox { diff --git a/linphone-app/ui/views/App/Calls/Incall.js b/linphone-app/ui/views/App/Calls/Incall.js index 531b61c1e..3520ce343 100644 --- a/linphone-app/ui/views/App/Calls/Incall.js +++ b/linphone-app/ui/views/App/Calls/Incall.js @@ -146,12 +146,3 @@ function showFullscreen (position) { } }, true) } - -function updateCallQualityIcon (callQuality,call) { - var quality = call.quality - callQuality.icon = 'call_quality_' + ( - // Note: `quality` is in the [0, 5] interval. - // It's necessary to map in the `call_quality_` interval. ([0, 3]) - quality >= 0 ? Math.round(quality / (5 / 3)) : 0 - ) -} diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index 71d479aa4..1af7b86d0 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -74,8 +74,11 @@ Rectangle { ActionButton { id: callQuality - icon: 'call_quality_0' - useStates: false + isCustom: true + backgroundRadius: 4 + colorSet: CallStyle.buttons.callQuality + + percentageDisplayed: 0 onClicked: Logic.openCallStatistics() @@ -86,7 +89,14 @@ Rectangle { running: true triggeredOnStart: true - onTriggered: Logic.updateCallQualityIcon(callQuality, call) + onTriggered: { + // Note: `quality` is in the [0, 5] interval and -1. + var quality = call.quality + if(quality >= 0) + callQuality.percentageDisplayed = quality * 100 / 5 + else + callQuality.percentageDisplayed = 0 + } } CallStatistics { @@ -103,21 +113,23 @@ Rectangle { } ActionButton { - icon: 'tel_keypad' + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.telKeyad onClicked: telKeypad.visible = !telKeypad.visible } ActionButton { id: callSecure + isCustom: true + backgroundRadius: 90 - icon: incall.call.isSecured ? 'call_chat_secure' : 'call_chat_unsecure' + colorSet: incall.call.isSecured ? CallStyle.buttons.secure : CallStyle.buttons.unsecure onClicked: zrtp.visible = (incall.call.encryption === CallModel.CallEncryptionZrtp) - TooltipArea { - text: Logic.makeReadableSecuredString(incall.call.securedString) - } + tooltipText: Logic.makeReadableSecuredString(incall.call.securedString) } } @@ -160,27 +172,28 @@ Rectangle { iconSize: CallStyle.header.buttonIconSize ActionButton { - icon: 'screenshot' + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.screenshot + visible: incall.call.videoEnabled onClicked: incall.call.takeSnapshot() - TooltipArea { - text: qsTr('takeSnapshotLabel') - } + tooltipText:qsTr('takeSnapshotLabel') } - ActionSwitch { + ActionButton { id: recordingSwitch - enabled: incall.call.recording - icon: 'record' - useStates: false + isCustom: true + backgroundRadius: 90 + colorSet: incall.call.recording ? CallStyle.buttons.recordOn : CallStyle.buttons.recordOff visible: SettingsModel.callRecorderEnabled onClicked: { var call = incall.call - return !enabled + return !incall.call.recording ? call.startRecording() : call.stopRecording() } @@ -192,14 +205,16 @@ Rectangle { } TooltipArea { - text: !recordingSwitch.enabled + text: !incall.call.recording ? qsTr('startRecordingLabel') : qsTr('stopRecordingLabel') } } ActionButton { - icon: 'fullscreen' + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.fullscreen visible: incall.call.videoEnabled onClicked: Logic.showFullscreen(contactDescription.mapToGlobal(0,0)) @@ -296,22 +311,20 @@ Rectangle { Timer { interval: 50 repeat: true - running: micro.enabled + running: parent.enabled onTriggered: parent.value = incall.call.microVu } - enabled: micro.enabled + enabled: !incall.call.microMuted } - ActionSwitch { + ActionButton { id: micro - - enabled: !call.microMuted - icon: 'micro' - iconSize: CallStyle.actionArea.iconSize - - onClicked: incall.call.microMuted = enabled + isCustom: true + backgroundRadius: 90 + colorSet: incall.call.microMuted ? CallStyle.buttons.microOff : CallStyle.buttons.microOn + onClicked: incall.call.microMuted = !incall.call.microMuted } } @@ -322,33 +335,32 @@ Rectangle { Timer { interval: 50 repeat: true - running: speaker.enabled + running: parent.enabled onTriggered: parent.value = incall.call.speakerVu } - enabled: speaker.enabled + enabled: !incall.call.speakerMuted } - ActionSwitch { + ActionButton { id: speaker + isCustom: true + backgroundRadius: 90 + colorSet: incall.call.speakerMuted ? CallStyle.buttons.speakerOff : CallStyle.buttons.speakerOn - enabled: !call.speakerMuted - icon: 'speaker' - iconSize: CallStyle.actionArea.iconSize - - onClicked: incall.call.speakerMuted = enabled + onClicked: incall.call.speakerMuted = !incall.call.speakerMuted } } - ActionSwitch { - enabled: incall.call.videoEnabled - icon: 'camera' - iconSize: CallStyle.actionArea.iconSize - updating: incall.call.updating + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: incall.call.videoEnabled ? CallStyle.buttons.cameraOn : CallStyle.buttons.cameraOff + updating: incall.call.videoEnabled && incall.call.updating visible: SettingsModel.videoSupported - onClicked: incall.call.videoEnabled = !enabled + onClicked: incall.call.videoEnabled = !incall.call.videoEnabled TooltipArea { text: qsTr('pendingRequestLabel') @@ -357,11 +369,12 @@ Rectangle { } ActionButton { - Layout.preferredHeight: CallStyle.actionArea.iconSize - Layout.preferredWidth: CallStyle.actionArea.iconSize + Layout.preferredHeight: CallStyle.buttons.options.iconSize + Layout.preferredWidth: CallStyle.buttons.options.iconSize - icon: 'options' - iconSize: CallStyle.actionArea.iconSize + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.options onClicked: Logic.openMediaParameters(window, incall) } @@ -400,13 +413,14 @@ Rectangle { } iconSize: CallStyle.actionArea.iconSize - ActionSwitch { - enabled: !call.pausedByUser - icon: 'pause' + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: call.pausedByUser ? CallStyle.buttons.play : CallStyle.buttons.pause updating: incall.call.updating visible: SettingsModel.callPauseEnabled - onClicked: incall.call.pausedByUser = enabled + onClicked: incall.call.pausedByUser = !incall.call.pausedByUser TooltipArea { text: qsTr('pendingRequestLabel') @@ -415,13 +429,17 @@ Rectangle { } ActionButton { - icon: 'hangup' + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.hangup onClicked: incall.call.terminate() } ActionButton { - icon: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && SettingsModel.showStartChatButton ? 'chat' : 'history' + isCustom: true + backgroundRadius: 90 + colorSet: (SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled) && SettingsModel.showStartChatButton ? CallStyle.buttons.chat : CallStyle.buttons.history onClicked: { if (window.chatIsOpened) { diff --git a/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml index a2aa86185..b51531020 100644 --- a/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -17,487 +17,506 @@ import 'Incall.js' as Logic // ============================================================================= Window { - id: window - - // --------------------------------------------------------------------------- - - property var call - property var caller - property bool hideButtons: false - - // --------------------------------------------------------------------------- - - function exit (cb) { - DesktopTools.screenSaverStatus = true - - // `exit` is called by `Incall.qml`. - // The `window` id can be null if the window was closed in this view. - if (!window) { - return - } - - if(!window.close() && parent) - parent.close() - - - if (cb) { - cb() - } - } - - // --------------------------------------------------------------------------- - onCallChanged: if(!call) window.exit() - Component.onCompleted: { - window.call = caller.call - } - // --------------------------------------------------------------------------- - - Shortcut { - sequence: StandardKey.Close - onActivated: window.exit() - } - - // --------------------------------------------------------------------------- - - Rectangle { - id:container - anchors.fill: parent - color: '#000000' // Not a style. - focus: true - - Keys.onEscapePressed: window.exit() - - Loader { - anchors.fill: parent - - active: { - var caller = window.caller - return caller && !caller.cameraActivated - } - - sourceComponent: camera - - Component { - id: camera - - Camera { - call: window.call - } - } - } - // ------------------------------------------------------------------------- - // Handle mouse move / Hide buttons. - // ------------------------------------------------------------------------- - - MouseArea { - Timer { - id: hideButtonsTimer - - interval: 5000 - running: true - - onTriggered: hideButtons = true - } - - anchors.fill: parent - acceptedButtons: Qt.NoButton - propagateComposedEvents: true - cursorShape: Qt.ArrowCursor - - onEntered: hideButtonsTimer.start() - onExited: hideButtonsTimer.stop() - - onPositionChanged: { - hideButtonsTimer.stop() - hideButtons = false - hideButtonsTimer.start() - } - } - - ColumnLayout { - anchors { - fill: parent - topMargin: CallStyle.header.topMargin - } - - spacing: 0 - - // ----------------------------------------------------------------------- - // Call info. - // ----------------------------------------------------------------------- - - Item { - id: info - - Layout.alignment: Qt.AlignTop - Layout.fillWidth: true - Layout.leftMargin: CallStyle.header.leftMargin - Layout.preferredHeight: CallStyle.header.contactDescription.height - Layout.rightMargin: CallStyle.header.rightMargin - - ActionBar { - anchors.left: parent.left - iconSize: CallStyle.header.iconSize - visible: !hideButtons - - ActionButton { - id: callQuality - - icon: 'call_quality_0' - iconSize: parent.iconSize - useStates: false - - onClicked: Logic.openCallStatistics() - - // See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73 - Timer { - interval: 5000 - repeat: true - running: true - triggeredOnStart: true - - onTriggered: Logic.updateCallQualityIcon(callQuality, window.call) - } - - CallStatistics { - id: callStatistics - enabled: window.call - call: window.call - width: container.width - - relativeTo: callQuality - relativeY: CallStyle.header.stats.relativeY - - onClosed: Logic.handleCallStatisticsClosed() - } - } - - ActionButton { - icon: 'tel_keypad' - - onClicked: telKeypad.visible = !telKeypad.visible - } - - ActionButton { - id: callSecure - - icon: window.call && window.call.isSecured ? 'call_chat_secure' : 'call_chat_unsecure' - - onClicked: zrtp.visible = (window.call.encryption === CallModel.CallEncryptionZrtp) - - TooltipArea { - text: window.call?Logic.makeReadableSecuredString(window.call.securedString):'' - } - } - - } - - // --------------------------------------------------------------------- - // Timer. - // --------------------------------------------------------------------- - - Text { - id: elapsedTime - - anchors.fill: parent - - font.pointSize: CallStyle.header.elapsedTime.fullscreen.pointSize - - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - - visible: !window.hideButtons - - // Not a customizable style. - color: 'white' - style: Text.Raised - styleColor: 'black' - - Component.onCompleted: { - var updateDuration = function () { - if(window.caller){ - var call = window.caller.call - text = Utils.formatElapsedTime(call.duration) - Utils.setTimeout(elapsedTime, 1000, updateDuration) - } - } - - updateDuration() - } - } - - // --------------------------------------------------------------------- - // Video actions. - // --------------------------------------------------------------------- - - ActionBar { - anchors.right: parent.right - iconSize: CallStyle.header.buttonIconSize - visible: !hideButtons - - ActionButton { - icon: 'screenshot' - - onClicked: call.takeSnapshot() - - TooltipArea { - text: qsTr('takeSnapshotLabel') - } - } - - ActionSwitch { - id: recordingSwitch - - enabled: call && call.recording - icon: 'record' - useStates: false - visible: SettingsModel.callRecorderEnabled - - onClicked: !enabled - ? call.startRecording() - : call.stopRecording() - - TooltipArea { - text: !recordingSwitch.enabled - ? qsTr('startRecordingLabel') - : qsTr('stopRecordingLabel') - } - } - - ActionButton { - icon: 'fullscreen' - - onClicked: window.exit() - } - } - - } - - // ----------------------------------------------------------------------- - // Action Buttons. - // ----------------------------------------------------------------------- - - // ------------------------------------------------------------------------- - // Zrtp. - // ------------------------------------------------------------------------- - - ZrtpTokenAuthentication { - id: zrtp - - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.margins: CallStyle.container.margins - call: window.call - visible: call && !call.isSecured && call.encryption !== CallModel.CallEncryptionNone - z: Constants.zPopup - color: CallStyle.backgroundColor - } - Item { - Layout.alignment: Qt.AlignBottom - Layout.fillWidth: true - Layout.preferredHeight: CallStyle.actionArea.height - visible: !hideButtons - - GridLayout { - anchors { - left: parent.left - leftMargin: CallStyle.actionArea.leftButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - rowSpacing: ActionBarStyle.spacing - - Row { - spacing: CallStyle.actionArea.vu.spacing - visible: SettingsModel.muteMicrophoneEnabled - - VuMeter { - Timer { - interval: 50 - repeat: true - running: micro.enabled - - onTriggered: parent.value = call.microVu - } - - enabled: micro.enabled - } - - ActionSwitch { - id: micro - - enabled: call && !call.microMuted - icon: 'micro' - iconSize: CallStyle.actionArea.iconSize - - onClicked: call.microMuted = enabled - } - } - - Row { - spacing: CallStyle.actionArea.vu.spacing - - VuMeter { - Timer { - interval: 50 - repeat: true - running: speaker.enabled - - onTriggered: parent.value = call.speakerVu - } - - enabled: speaker.enabled - } - - ActionSwitch { - id: speaker - - enabled: call && !call.speakerMuted - icon: 'speaker' - iconSize: CallStyle.actionArea.iconSize - - onClicked: call.speakerMuted = enabled - } - } - - ActionSwitch { - enabled: true - icon: 'camera' - iconSize: CallStyle.actionArea.iconSize - updating: call && call.updating - - onClicked: window.exit(function () { call.videoEnabled = false }) - } - - ActionButton { - Layout.preferredHeight: CallStyle.actionArea.iconSize - Layout.preferredWidth: CallStyle.actionArea.iconSize - - icon: 'options' - iconSize: CallStyle.actionArea.iconSize - - onClicked: Logic.openMediaParameters(Window.window, window) - } - } - - ActionBar { - anchors { - right: parent.right - rightMargin: CallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: CallStyle.actionArea.iconSize - - ActionSwitch { - enabled: call && !call.pausedByUser - icon: 'pause' - updating: call && call.updating - visible: SettingsModel.callPauseEnabled - - onClicked: window.exit(function () { call.pausedByUser = enabled }) - } - - ActionButton { - icon: 'hangup' - - onClicked: window.exit(call.terminate) - } - } - } - } - } - - // --------------------------------------------------------------------------- - // Preview. - // --------------------------------------------------------------------------- - - Loader { - active: { - var caller = window.caller - return caller && !caller.cameraActivated - } - - sourceComponent: cameraPreview - - Component { - id: cameraPreview - - Camera { - id:cameraPreviewItem - property double scale: 1.0 - - function xPosition () { - return window.width / 2 - width / 2 - } - - function yPosition () { - return window.height - height - } - - function resetPosition(){ - x = xPosition (); - y = yPosition (); - } - - call: window.call - isPreview: true - - height: Math.min(window.height, (CallStyle.actionArea.userVideo.height * window.height/CallStyle.actionArea.userVideo.heightReference) * scale) - width: Math.min(window.width, (CallStyle.actionArea.userVideo.width * window.width/CallStyle.actionArea.userVideo.widthReference) * scale ) - DragBox { - container: window - draggable: parent - - xPosition: parent.xPosition - yPosition: parent.yPosition - - property double startTime: 0 - - onWheel: { - var acceleration = 0.1; - if(startTime == 0){ - startTime = new Date().getTime(); - }else{ - var delay = new Date().getTime() - startTime; - if(delay>0) - acceleration = Math.max(0.1, Math.min(2, 10/delay)); - else - acceleration = 2 + id: window + + // --------------------------------------------------------------------------- + + property var call + property var caller + property bool hideButtons: false + + // --------------------------------------------------------------------------- + + function exit (cb) { + DesktopTools.screenSaverStatus = true + + // `exit` is called by `Incall.qml`. + // The `window` id can be null if the window was closed in this view. + if (!window) { + return } - var newScale = Math.max(0.1 , parent.scale+acceleration*(wheel.angleDelta.y >0 ? 1 : -1) ); - if( window.height > (CallStyle.actionArea.userVideo.height * window.height/CallStyle.actionArea.userVideo.heightReference) * newScale - && window.width > (CallStyle.actionArea.userVideo.width * window.width/CallStyle.actionArea.userVideo.widthReference) * newScale){ - parent.scale = newScale - var point = mapToItem(cameraPreviewItem.parent, wheel.x, wheel.y); - parent.x = point.x-parent.width/2; - parent.y = point.y-parent.height/2; - updateBoundaries(); + + if(!window.close() && parent) + parent.close() + + + if (cb) { + cb() } - startTime = new Date().getTime(); - } - onDoubleClicked:{ - parent.scale = 1; - resetPosition(); - } - onClicked: if(mouse.button == Qt.RightButton) { - if( parent.scale>1) - parent.scale = 1; - else - parent.scale = 2; - resetPosition(); - } - } - } - } - } - - // --------------------------------------------------------------------------- - // TelKeypad. - // --------------------------------------------------------------------------- - - TelKeypad { - id: telKeypad - - call: window.call - visible: false - } + } + + // --------------------------------------------------------------------------- + onCallChanged: if(!call) window.exit() + Component.onCompleted: { + window.call = caller.call + } + // --------------------------------------------------------------------------- + + Shortcut { + sequence: StandardKey.Close + onActivated: window.exit() + } + + // --------------------------------------------------------------------------- + + Rectangle { + id:container + anchors.fill: parent + color: '#000000' // Not a style. + focus: true + + Keys.onEscapePressed: window.exit() + + Loader { + anchors.fill: parent + + active: { + var caller = window.caller + return caller && !caller.cameraActivated + } + + sourceComponent: camera + + Component { + id: camera + + Camera { + call: window.call + } + } + } + // ------------------------------------------------------------------------- + // Handle mouse move / Hide buttons. + // ------------------------------------------------------------------------- + + MouseArea { + Timer { + id: hideButtonsTimer + + interval: 5000 + running: true + + onTriggered: hideButtons = true + } + + anchors.fill: parent + acceptedButtons: Qt.NoButton + propagateComposedEvents: true + cursorShape: Qt.ArrowCursor + + onEntered: hideButtonsTimer.start() + onExited: hideButtonsTimer.stop() + + onPositionChanged: { + hideButtonsTimer.stop() + hideButtons = false + hideButtonsTimer.start() + } + } + + ColumnLayout { + anchors { + fill: parent + topMargin: CallFullscreenStyle.header.topMargin + } + + spacing: 0 + + // ----------------------------------------------------------------------- + // Call info. + // ----------------------------------------------------------------------- + + Item { + id: info + + Layout.alignment: Qt.AlignTop + Layout.fillWidth: true + Layout.leftMargin: CallFullscreenStyle.header.leftMargin + Layout.preferredHeight: CallFullscreenStyle.header.contactDescription.height + Layout.rightMargin: CallFullscreenStyle.header.rightMargin + + ActionBar { + anchors.left: parent.left + iconSize: CallFullscreenStyle.header.iconSize + visible: !hideButtons + + ActionButton { + id: callQuality + isCustom: true + backgroundRadius: 4 + colorSet: CallFullscreenStyle.buttons.callQuality + iconSize: CallFullscreenStyle.header.iconSize + percentageDisplayed: 0 + onClicked: Logic.openCallStatistics() + + // See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73 + Timer { + interval: 5000 + repeat: true + running: true + triggeredOnStart: true + + onTriggered: { + // Note: `quality` is in the [0, 5] interval and -1. + var quality = window.call.quality + if(quality >= 0) + callQuality.percentageDisplayed = quality * 100 / 5 + else + callQuality.percentageDisplayed = 0 + } + } + + CallStatistics { + id: callStatistics + enabled: window.call + call: window.call + width: container.width + + relativeTo: callQuality + relativeY: CallFullscreenStyle.header.stats.relativeY + + onClosed: Logic.handleCallStatisticsClosed() + } + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.telKeyad + iconSize: CallFullscreenStyle.header.iconSize + + onClicked: telKeypad.visible = !telKeypad.visible + } + + ActionButton { + id: callSecure + isCustom: true + backgroundRadius: 90 + colorSet: window.call && window.call.isSecured ? CallFullscreenStyle.buttons.secure : CallFullscreenStyle.buttons.unsecure + iconSize: CallFullscreenStyle.header.iconSize + + onClicked: zrtp.visible = (window.call.encryption === CallModel.CallEncryptionZrtp) + tooltipText: window.call?Logic.makeReadableSecuredString(window.call.securedString):'' + } + + } + + // --------------------------------------------------------------------- + // Timer. + // --------------------------------------------------------------------- + + Text { + id: elapsedTime + + anchors.fill: parent + + font.pointSize: CallFullscreenStyle.header.elapsedTime.fullscreen.pointSize + + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + + visible: !window.hideButtons + + // Not a customizable style. + color: 'white' + style: Text.Raised + styleColor: 'black' + + Component.onCompleted: { + var updateDuration = function () { + if(window.caller){ + var call = window.caller.call + text = Utils.formatElapsedTime(call.duration) + Utils.setTimeout(elapsedTime, 1000, updateDuration) + } + } + + updateDuration() + } + } + + // --------------------------------------------------------------------- + // Video actions. + // --------------------------------------------------------------------- + + ActionBar { + anchors.right: parent.right + iconSize: CallFullscreenStyle.header.buttonIconSize + visible: !hideButtons + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.screenshot + + onClicked: call.takeSnapshot() + + tooltipText: qsTr('takeSnapshotLabel') + } + + ActionButton { + id: recordingSwitch + property bool recording : call && call.recording + isCustom: true + backgroundRadius: 90 + colorSet: recording ? CallFullscreenStyle.buttons.recordOn : CallFullscreenStyle.buttons.recordOff + visible: SettingsModel.callRecorderEnabled + + onClicked: !recording + ? call.startRecording() + : call.stopRecording() + + TooltipArea { + text: !recordingSwitch.recording + ? qsTr('startRecordingLabel') + : qsTr('stopRecordingLabel') + } + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.stopFullscreen + + onClicked: window.exit() + } + } + + } + + // ----------------------------------------------------------------------- + // Action Buttons. + // ----------------------------------------------------------------------- + + // ------------------------------------------------------------------------- + // Zrtp. + // ------------------------------------------------------------------------- + + ZrtpTokenAuthentication { + id: zrtp + + Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter + Layout.margins: CallFullscreenStyle.container.margins + call: window.call + visible: call && !call.isSecured && call.encryption !== CallModel.CallEncryptionNone + z: Constants.zPopup + color: CallFullscreenStyle.backgroundColor + } + Item { + Layout.alignment: Qt.AlignBottom + Layout.fillWidth: true + Layout.preferredHeight: CallFullscreenStyle.actionArea.height + visible: !hideButtons + + GridLayout { + anchors { + left: parent.left + leftMargin: CallFullscreenStyle.actionArea.leftButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + + rowSpacing: ActionBarStyle.spacing + + Row { + spacing: CallFullscreenStyle.actionArea.vu.spacing + visible: SettingsModel.muteMicrophoneEnabled + + VuMeter { + Timer { + interval: 50 + repeat: true + running: micro.enabled + + onTriggered: parent.value = call.microVu + } + + enabled: micro.enabled + } + + ActionSwitch { + id: micro + isCustom: true + backgroundRadius: 90 + colorSet: enabled ? CallFullscreenStyle.buttons.microOn : CallFullscreenStyle.buttons.microOff + enabled: call && !call.microMuted + onClicked: call.microMuted = enabled + } + } + + Row { + spacing: CallFullscreenStyle.actionArea.vu.spacing + + VuMeter { + Timer { + interval: 50 + repeat: true + running: speaker.enabled + + onTriggered: parent.value = call.speakerVu + } + + enabled: speaker.enabled + } + + ActionButton { + id: speaker + property bool muted : call && !call.speakerMuted + isCustom: true + backgroundRadius: 90 + colorSet: muted ? CallFullscreenStyle.buttons.speakerOff : CallFullscreenStyle.buttons.speakerOn + iconSize: CallFullscreenStyle.actionArea.iconSize + + onClicked: call.speakerMuted = !call.speakerMuted + } + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.cameraOn + updating: call && call.updating + + iconSize: CallFullscreenStyle.actionArea.iconSize + + + onClicked: window.exit(function () { call.videoEnabled = false }) + } + + ActionButton { + Layout.preferredHeight: CallFullscreenStyle.actionArea.iconSize + Layout.preferredWidth: CallFullscreenStyle.actionArea.iconSize + + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.options + iconSize: CallFullscreenStyle.actionArea.iconSize + + onClicked: Logic.openMediaParameters(Window.window, window) + } + } + + ActionBar { + anchors { + right: parent.right + rightMargin: CallFullscreenStyle.actionArea.rightButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + iconSize: CallFullscreenStyle.actionArea.iconSize + + ActionSwitch { + isCustom: true + backgroundRadius: 90 + colorSet: call && call.pausedByUser ? CallFullscreenStyle.buttons.play : CallFullscreenStyle.buttons.pause + updating: call && call.updating + visible: SettingsModel.callPauseEnabled + + onClicked: window.exit(function () { call.pausedByUser = !call.pausedByUser }) + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallFullscreenStyle.buttons.hangup + + onClicked: window.exit(call.terminate) + } + } + } + } + } + + // --------------------------------------------------------------------------- + // Preview. + // --------------------------------------------------------------------------- + + Loader { + active: { + var caller = window.caller + return caller && !caller.cameraActivated + } + + sourceComponent: cameraPreview + + Component { + id: cameraPreview + + Camera { + id:cameraPreviewItem + property double scale: 1.0 + + function xPosition () { + return window.width / 2 - width / 2 + } + + function yPosition () { + return window.height - height + } + + function resetPosition(){ + x = xPosition (); + y = yPosition (); + } + + call: window.call + isPreview: true + + height: Math.min(window.height, (CallFullscreenStyle.actionArea.userVideo.height * window.height/CallFullscreenStyle.actionArea.userVideo.heightReference) * scale) + width: Math.min(window.width, (CallFullscreenStyle.actionArea.userVideo.width * window.width/CallFullscreenStyle.actionArea.userVideo.widthReference) * scale ) + DragBox { + container: window + draggable: parent + + xPosition: parent.xPosition + yPosition: parent.yPosition + + property double startTime: 0 + + onWheel: { + var acceleration = 0.1; + if(startTime == 0){ + startTime = new Date().getTime(); + }else{ + var delay = new Date().getTime() - startTime; + if(delay>0) + acceleration = Math.max(0.1, Math.min(2, 10/delay)); + else + acceleration = 2 + } + var newScale = Math.max(0.1 , parent.scale+acceleration*(wheel.angleDelta.y >0 ? 1 : -1) ); + if( window.height > (CallFullscreenStyle.actionArea.userVideo.height * window.height/CallFullscreenStyle.actionArea.userVideo.heightReference) * newScale + && window.width > (CallFullscreenStyle.actionArea.userVideo.width * window.width/CallFullscreenStyle.actionArea.userVideo.widthReference) * newScale){ + parent.scale = newScale + var point = mapToItem(cameraPreviewItem.parent, wheel.x, wheel.y); + parent.x = point.x-parent.width/2; + parent.y = point.y-parent.height/2; + updateBoundaries(); + } + startTime = new Date().getTime(); + } + onDoubleClicked:{ + parent.scale = 1; + resetPosition(); + } + onClicked: if(mouse.button == Qt.RightButton) { + if( parent.scale>1) + parent.scale = 1; + else + parent.scale = 2; + resetPosition(); + } + } + } + } + } + + // --------------------------------------------------------------------------- + // TelKeypad. + // --------------------------------------------------------------------------- + + TelKeypad { + id: telKeypad + + call: window.call + visible: false + } } diff --git a/linphone-app/ui/views/App/Calls/IncomingCall.qml b/linphone-app/ui/views/App/Calls/IncomingCall.qml index de7be112c..d0ff5ae9a 100644 --- a/linphone-app/ui/views/App/Calls/IncomingCall.qml +++ b/linphone-app/ui/views/App/Calls/IncomingCall.qml @@ -8,35 +8,40 @@ import App.Styles 1.0 // ============================================================================= AbstractStartingCall { - ActionBar { - anchors.centerIn: parent - iconSize: CallStyle.actionArea.iconSize - - ActionButton { - icon: 'video_call_accept' - visible: SettingsModel.videoSupported - - onClicked: call.acceptWithVideo() - } - - ActionButton { - icon: 'call_accept' - onClicked: call.accept() - } - } - - ActionBar { - anchors { - right: parent.right - rightMargin: CallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: CallStyle.actionArea.iconSize - - ActionButton { - icon: 'hangup' - - onClicked: call.terminate() - } - } + ActionBar { + anchors.centerIn: parent + iconSize: CallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.acceptVideoCall + visible: SettingsModel.videoSupported + onClicked: call.acceptWithVideo() + } + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.acceptCall + onClicked: call.accept() + } + } + + ActionBar { + anchors { + right: parent.right + rightMargin: CallStyle.actionArea.rightButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + iconSize: CallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.hangup + + onClicked: call.terminate() + } + } } diff --git a/linphone-app/ui/views/App/Calls/OutgoingCall.qml b/linphone-app/ui/views/App/Calls/OutgoingCall.qml index 32ba1b25b..d250efb9a 100644 --- a/linphone-app/ui/views/App/Calls/OutgoingCall.qml +++ b/linphone-app/ui/views/App/Calls/OutgoingCall.qml @@ -9,46 +9,49 @@ import App.Styles 1.0 // ============================================================================= AbstractStartingCall { - showKeypad:true - GridLayout { - columns: parent.width < CallStyle.actionArea.lowWidth && call.videoEnabled ? 1 : 2 - rowSpacing: ActionBarStyle.spacing - - anchors { - left: parent.left - leftMargin: CallStyle.actionArea.leftButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - - ActionSwitch { - enabled: !call.microMuted - icon: 'micro' - iconSize: CallStyle.actionArea.iconSize - - onClicked: call.microMuted = enabled - } - } - - Item { - anchors.centerIn: parent - height: CallStyle.actionArea.userVideo.height - width: CallStyle.actionArea.userVideo.width - - visible: call.videoEnabled - } - - ActionBar { - anchors { - right: parent.right - rightMargin: CallStyle.actionArea.rightButtonsGroupMargin - verticalCenter: parent.verticalCenter - } - iconSize: CallStyle.actionArea.iconSize - - ActionButton { - icon: 'hangup' - - onClicked: call.terminate() - } - } + showKeypad:true + GridLayout { + columns: parent.width < CallStyle.actionArea.lowWidth && call.videoEnabled ? 1 : 2 + rowSpacing: ActionBarStyle.spacing + + anchors { + left: parent.left + leftMargin: CallStyle.actionArea.leftButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + + ActionSwitch { + isCustom: true + backgroundRadius: 90 + colorSet: enabled ? CallStyle.buttons.microOn : CallStyle.buttons.microOff + enabled: !call.microMuted + + onClicked: call.microMuted = enabled + } + } + + Item { + anchors.centerIn: parent + height: CallStyle.actionArea.userVideo.height + width: CallStyle.actionArea.userVideo.width + + visible: call.videoEnabled + } + + ActionBar { + anchors { + right: parent.right + rightMargin: CallStyle.actionArea.rightButtonsGroupMargin + verticalCenter: parent.verticalCenter + } + iconSize: CallStyle.actionArea.iconSize + + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: CallStyle.buttons.hangup + + onClicked: call.terminate() + } + } } diff --git a/linphone-app/ui/views/App/Main/ContactEdit.js b/linphone-app/ui/views/App/Main/ContactEdit.js index 00df25b7f..96134f864 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.js +++ b/linphone-app/ui/views/App/Main/ContactEdit.js @@ -173,6 +173,7 @@ function handleUrlChanged () { // ----------------------------------------------------------------------------- function buildAddressFields () { +/* var address = contactEdit._vcard.address return [{ @@ -188,6 +189,8 @@ function buildAddressFields () { placeholder: qsTr('country'), text: address.country }] + */ + return null } function handleAddressChanged (index, value) { diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml index eda59b616..dcbe44b58 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.qml +++ b/linphone-app/ui/views/App/Main/ContactEdit.qml @@ -99,9 +99,10 @@ ColumnLayout { spacing: ContactEditStyle.bar.spacing ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: ContactEditStyle.bar.avatarTakePicture enabled: _edition - icon: 'contact_card_photo' - iconSize: ContactEditStyle.bar.avatarSize onClicked: avatarChooser.open() @@ -153,17 +154,19 @@ ColumnLayout { iconSize: ContactEditStyle.bar.actions.history.iconSize ActionButton { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history' - visible: SettingsModel.standardChatEnabled - onClicked: sipAddressesMenu.open(false) - TooltipArea { - isClickable: false - text: qsTr('tooltipShowConversation') - } + isCustom: true + backgroundRadius: 90 + colorSet: SettingsModel.getShowStartChatButton() ? ContactEditStyle.chat : ContactEditStyle.history + visible: SettingsModel.standardChatEnabled + onClicked: sipAddressesMenu.open(false) + tooltipText: qsTr('tooltipShowConversation') + tooltipIsClickable: false } ActionButton { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history' + isCustom: true + backgroundRadius: 90 + colorSet: SettingsModel.getShowStartChatButton() ? ContactEditStyle.chat : ContactEditStyle.history visible: SettingsModel.secureChatEnabled && _contact && _contact.hasCapability(LinphoneEnums.FriendCapabilityLimeX3Dh) enabled: AccountSettingsModel.conferenceURI != '' Icon{ @@ -174,13 +177,11 @@ ColumnLayout { anchors.topMargin: -3 } onClicked: {sipAddressesMenu.open(true)} - TooltipArea{ - maxWidth: actionBar.width - visible: AccountSettingsModel.conferenceURI == '' + + tooltipMaxWidth: actionBar.width + tooltipVisible: AccountSettingsModel.conferenceURI == '' //: 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. - text: '- ' + qsTr('missingConferenceURI') + '\n' - - } + tooltipText: '- ' + qsTr('missingConferenceURI') + '\n' } } @@ -188,16 +189,18 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter ActionButton { - icon: 'edit' - iconSize: ContactEditStyle.bar.actions.edit.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: ContactEditStyle.bar.actions.edit.colorSet visible: !_edition onClicked: Logic.editContact() } ActionButton { - icon: 'delete' - iconSize: ContactEditStyle.bar.actions.del.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: ContactEditStyle.bar.actions.del.colorSet onClicked: Logic.removeContact() } diff --git a/linphone-app/ui/views/App/Main/Contacts.qml b/linphone-app/ui/views/App/Main/Contacts.qml index 97c733eb6..1774cf68f 100644 --- a/linphone-app/ui/views/App/Main/Contacts.qml +++ b/linphone-app/ui/views/App/Main/Contacts.qml @@ -44,7 +44,8 @@ ColumnLayout { TextField { Layout.fillWidth: true - icon: 'filter' + icon: ContactsStyle.filter.icon + overwriteColor: ContactsStyle.filter.color placeholderText: qsTr('searchContactPlaceholder') onTextChanged: contacts.setFilter(text) @@ -134,27 +135,35 @@ ColumnLayout { iconSize: ContactsStyle.contact.actionButtonsSize ActionButton { - icon: 'video_call' + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.videoCall visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled && SettingsModel.getShowStartVideoCallButton() onClicked: actions.itemAt(0).open() } ActionButton { - icon: 'call' + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.call visible: SettingsModel.outgoingCallsEnabled onClicked: actions.itemAt(1).open() } ActionButton { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history' + isCustom: true + backgroundRadius: 90 + colorSet: SettingsModel.getShowStartChatButton() ? ContactsStyle.chat : ContactsStyle.history visible: SettingsModel.standardChatEnabled onClicked: actions.itemAt(2).open() } ActionButton { - icon: SettingsModel.getShowStartChatButton() ? 'chat' : 'history' + isCustom: true + backgroundRadius: 90 + colorSet: SettingsModel.getShowStartChatButton() ? ContactsStyle.chat : ContactsStyle.history visible: SettingsModel.secureChatEnabled && $contact.hasCapability(LinphoneEnums.FriendCapabilityLimeX3Dh) enabled: AccountSettingsModel.conferenceURI != '' Icon{ @@ -165,23 +174,21 @@ ColumnLayout { anchors.topMargin: -3 } onClicked: {actions.itemAt(3).open()} - TooltipArea{ - maxWidth: actionBar.width - visible: AccountSettingsModel.conferenceURI == '' + tooltipMaxWidth: actionBar.width + tooltipVisible: AccountSettingsModel.conferenceURI == '' //: 'You need to set the conference URI in your account settings to create a conference based chat room.' : Tooltip to warn the user that a setting is missing in its configuration. - text: '- ' + qsTr('missingConferenceURI') + '\n' - - } + tooltipText: '- ' + qsTr('missingConferenceURI') + '\n' } } ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.deleteAction anchors { right: parent.right verticalCenter: parent.verticalCenter } - icon: 'delete' - iconSize: ContactsStyle.contact.deleteButtonSize onClicked: _removeContact($contact) } diff --git a/linphone-app/ui/views/App/Main/Conversation.js b/linphone-app/ui/views/App/Main/Conversation.js index 7e7a6c6ef..2c75a9aca 100644 --- a/linphone-app/ui/views/App/Main/Conversation.js +++ b/linphone-app/ui/views/App/Main/Conversation.js @@ -44,10 +44,6 @@ function getAvatar () { return contact ? contact.vcard.avatar : '' } -function getEditIcon () { - return conversation._sipAddressObserver.contact ? 'contact_edit' : 'contact_add' -} - function getEditTooltipText() { return conversation._sipAddressObserver.contact ? qsTr('tooltipContactEdit') : qsTr('tooltipContactAdd') } diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml index b7bae311a..b733dc5f0 100644 --- a/linphone-app/ui/views/App/Main/Conversation.qml +++ b/linphone-app/ui/views/App/Main/Conversation.qml @@ -98,7 +98,8 @@ ColumnLayout { Layout.preferredHeight: ConversationStyle.bar.groupChatSize Layout.preferredWidth: ConversationStyle.bar.groupChatSize - icon:'chat_room' + icon: ConversationStyle.bar.groupChatIcon + overwriteColor: ConversationStyle.bar.groupChatColor iconSize: ConversationStyle.bar.groupChatSize visible: !chatRoomModel.isOneToOne } @@ -128,15 +129,16 @@ ColumnLayout { Icon{ id:adminIcon - icon : 'admin_selected' - iconSize:14 + icon : ConversationStyle.bar.status.adminStatusIcon + overwriteColor: ConversationStyle.bar.status.adminStatusColor + iconSize: ConversationStyle.bar.status.adminStatusIconSize } Text{ anchors.verticalCenter: parent.verticalCenter //: 'Admin' : Admin(istrator) //~ Context One word title for describing the current admin status text: qsTr('adminStatus') - color: ColorsList.add("Conversation_admin_status", "af").color + color: ConversationStyle.bar.status.adminTextColor font.pointSize: Units.dp * 8 } } @@ -244,26 +246,37 @@ ColumnLayout { iconSize: ConversationStyle.bar.actions.call.iconSize ActionButton { - icon: 'video_call' + isCustom: true + backgroundRadius: 1000 + colorSet: ConversationStyle.bar.actions.videoCall + visible: SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton && !conversation.haveMoreThanOneParticipants onClicked: CallsListModel.launchVideoCall(chatRoomModel.participants.addressesToString) } ActionButton { - icon: 'call' + isCustom: true + backgroundRadius: 1000 + colorSet: ConversationStyle.bar.actions.call + visible: SettingsModel.outgoingCallsEnabled && !conversation.haveMoreThanOneParticipants onClicked: CallsListModel.launchAudioCall(chatRoomModel.participants.addressesToString) } ActionButton { - icon: 'chat' + isCustom: true + backgroundRadius: 1000 + colorSet: ConversationStyle.bar.actions.chat + visible: SettingsModel.standardChatEnabled && SettingsModel.getShowStartChatButton() && !conversation.haveMoreThanOneParticipants && conversation.securityLevel != 1 onClicked: CallsListModel.launchChat(chatRoomModel.participants.addressesToString, 0) } ActionButton { - icon: 'chat' + isCustom: true + backgroundRadius: 1000 + colorSet: ConversationStyle.bar.actions.chat visible: SettingsModel.secureChatEnabled && SettingsModel.getShowStartChatButton() && !conversation.haveMoreThanOneParticipants && conversation.securityLevel == 1 && UtilsCpp.hasCapability(conversation.peerAddress, LinphoneEnums.FriendCapabilityLimeX3Dh) onClicked: CallsListModel.launchChat(chatRoomModel.participants.addressesToString, 1) @@ -277,14 +290,15 @@ ColumnLayout { } ActionButton { - icon: 'group_chat' + isCustom: true + backgroundRadius: 1000 + colorSet: ConversationStyle.bar.actions.groupChat + visible: SettingsModel.outgoingCallsEnabled && conversation.haveMoreThanOneParticipants && conversation.haveLessThanMinParticipantsForCall && !conversation.hasBeenLeft onClicked: Logic.openConferenceManager({chatRoomModel:conversation.chatRoomModel, autoCall:true}) - TooltipArea { - //: "Call all chat room's participants" : tooltip on a button for calling all participant in the current chat room - text: qsTr("groupChatCallButton") - } + //: "Call all chat room's participants" : tooltip on a button for calling all participant in the current chat room + tooltipText: qsTr("groupChatCallButton") } } @@ -293,21 +307,22 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter ActionButton { - icon: Logic.getEditIcon() - iconSize: ConversationStyle.bar.actions.edit.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: conversation._sipAddressObserver.contact ? ConversationStyle.bar.actions.edit.viewContact : ConversationStyle.bar.actions.edit.addContact visible: SettingsModel.contactsEnabled && !conversation.chatRoomModel.groupEnabled onClicked: window.setView('ContactEdit', { sipAddress: conversation.getPeerAddress() }) - TooltipArea { - text: Logic.getEditTooltipText() - } + tooltipText: Logic.getEditTooltipText() } ActionButton { - icon: 'delete' - iconSize: ConversationStyle.bar.actions.edit.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: ConversationStyle.bar.actions.del.deleteHistory + iconSize: ConversationStyle.bar.actions.del.iconSize onClicked: Logic.removeAllEntries() @@ -317,12 +332,11 @@ ColumnLayout { } ActionButton { id:dotButton - icon: 'menu_vdots' - iconSize: ConversationStyle.bar.actions.edit.iconSize + isCustom: true + backgroundRadius: 90 + colorSet: ConversationStyle.bar.actions.openMenu visible: conversationMenu.showGroupInfo || conversationMenu.showDevices || conversationMenu.showEphemerals - - //autoIcon: true - + onClicked: { conversationMenu.open() } @@ -343,8 +357,8 @@ ColumnLayout { id:groupInfoMenu //: 'Group information' : Item menu to get information about the chat room text: qsTr('conversationMenuGroupInformations') - iconMenu: (hovered ? 'menu_infos_selected' : 'menu_infos') - iconSizeMenu: 25 + iconMenu: MenuItemStyle.info.icon + iconSizeMenu: 40 menuItemStyle : MenuItemStyle.aux2 visible: conversationMenu.showGroupInfo onTriggered: { @@ -357,16 +371,16 @@ ColumnLayout { id: separator1 height:1 width:parent.width - color: ColorsList.add("Conversation_menu_separator", "u").color + color: ConversationStyle.menu.separatorColor visible: groupInfoMenu.visible && devicesMenuItem.visible } MenuItem{ id: devicesMenuItem //: "Conversation's devices" : Item menu to get all participant devices of the chat room text: qsTr('conversationMenuDevices') - iconMenu: (hovered ? 'menu_devices_selected' : 'menu_devices' ) + iconMenu: MenuItemStyle.devices.icon visible: conversationMenu.showDevices - iconSizeMenu: 25 + iconSizeMenu: 40 menuItemStyle : MenuItemStyle.aux2 onTriggered: { window.detachVirtualWindow() @@ -378,15 +392,15 @@ ColumnLayout { id: separator2 height:1 width:parent.width - color: ColorsList.add("Conversation_menu_separator", "u").color + color: ConversationStyle.menu.separatorColor visible: ephemeralMenuItem.visible && (groupInfoMenu.visible || devicesMenuItem.visible) } MenuItem{ id: ephemeralMenuItem //: 'Ephemeral messages' : Item menu to enable ephemeral mode text: qsTr('conversationMenuEphemeral') - iconMenu: (hovered ? 'menu_ephemeral_selected' : 'menu_ephemeral') - iconSizeMenu: 25 + iconMenu: MenuItemStyle.ephemeral.icon + iconSizeMenu: 40 menuItemStyle : MenuItemStyle.aux2 visible: conversationMenu.showEphemerals onTriggered: { @@ -458,8 +472,9 @@ ColumnLayout { Icon{ anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - icon: (searchView.visible? 'close': 'search') - iconSize: 20 + icon: (searchView.visible? 'close_custom': 'search_custom') + iconSize: 30 + overwriteColor: ConversationStyle.bar.searchIconColor } onClicked: { searchView.visible = !searchView.visible @@ -486,7 +501,8 @@ ColumnLayout { margins: 1 } width: parent.width-14 - icon: 'textfield_close' + icon: 'close_custom' + overwriteColor: ConversationStyle.filters.iconColor persistentIcon: true //: 'Search in messages' : this is a placeholder when searching something in the timeline list placeholderText: qsTr('searchMessagesPlaceholder') diff --git a/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml index 3da974a09..010e88591 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml @@ -62,8 +62,9 @@ DialogPlus { Layout.alignment: Qt.AlignCenter Icon{ - icon:'timer' + icon: EphemeralChatRoomStyle.timer.icon iconSize: EphemeralChatRoomStyle.timer.iconSize + overwriteColor: EphemeralChatRoomStyle.timer.timerColor Layout.preferredHeight: EphemeralChatRoomStyle.timer.preferredHeight Layout.preferredWidth: EphemeralChatRoomStyle.timer.preferredWidth Layout.alignment: Qt.AlignCenter diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml index f91ac56e4..7bd8f5c72 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml @@ -86,7 +86,7 @@ DialogPlus { //~ Tooltip Explanation for inviting the selected participants into chat room tooltipText: qsTr('addParticipantTooltip') actions:[{ - icon: 'add_participant', + colorSet: InfoChatRoomStyle.addParticipant, secure: chatRoomModel.haveEncryption, visible: true, visibleHandler : function(entry) { @@ -154,7 +154,7 @@ DialogPlus { actions: dialog.adminMode ? [{ - icon: 'remove_participant', + colorSet: InfoChatRoomStyle.removeParticipant, secure:0, visible:true, tooltipText: 'Remove this participant from the selection', diff --git a/linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml b/linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml index 84282c6bf..c575b7670 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml @@ -86,8 +86,9 @@ DialogPlus { } ActionButton { - icon: 'options' - iconSize: 30 + isCustom: true + backgroundRadius: 90 + colorSet: ManageAccountsStyle.options anchors.fill: parent visible:false //TODO handle click and jump to proxy config settings diff --git a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml index 334243d8e..3f994f89e 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml @@ -95,7 +95,7 @@ DialogPlus { Layout.fillWidth: true //: 'Would you like to encrypt your chat?' : Ask about setting the chat room as secured. text:qsTr('askEncryption') - color: ColorsList.add("NewChatRoom_ask_encryption", "g").color + color: NewChatRoomStyle.askEncryptionColor font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -159,7 +159,7 @@ DialogPlus { textFormat: Text.RichText //: 'Subject' : Label of a text field about the subject of the chat room text :qsTr('subjectLabel') +'*' - color: ColorsList.add("NewChatRoom_subject_title", "g").color + color: NewChatRoomStyle.subjectTitleColor font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -189,7 +189,7 @@ DialogPlus { Text{ //: 'Last contacts' : Header for showing last contacts text : qsTr('LastContactsTitle') - color: ColorsList.add("NewChatRoom_recent_contact_title", "g").color + color: NewChatRoomStyle.recentContactTitleColor font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -237,7 +237,7 @@ DialogPlus { font.weight: Font.DemiBold lineHeight: 0.8 - color: ColorsList.add("NewChatRoom_recent_contact_username", "g").color + color: NewChatRoomStyle.recentContactUsernameColor font.pointSize: Units.dp * 9 clip:false } @@ -288,7 +288,7 @@ DialogPlus { Layout.fillHeight: true Layout.fillWidth: true border.width: 1 - border.color: ColorsList.add("NewChatRoom_addresses_border", "l").color + border.color: NewChatRoomStyle.addressesBorderColor ColumnLayout { anchors.fill: parent @@ -315,7 +315,7 @@ DialogPlus { (secureSwitch.checked ? UtilsCpp.hasCapability(sipAddress, LinphoneEnums.FriendCapabilityLimeX3Dh) : true); } actions:[{ - icon: 'add_participant', + colorSet: NewChatRoomStyle.addParticipant, secure: secureSwitch.checked, visible: true, visibleHandler : function(entry) { @@ -345,7 +345,7 @@ DialogPlus { //~ one word for admin status text : qsTr('adminStatus') - color: ColorsList.add("NewChatRoom_addresses_admin", "g").color + color: NewChatRoomStyle.addressesAdminColor font.pointSize: Units.dp * 11 font.weight: Font.Light visible: participantView.count > 0 @@ -375,7 +375,7 @@ DialogPlus { actions: [{ - icon: 'remove_participant', + colorSet: NewChatRoomStyle.removeParticipant, secure:0, visible:true, //: 'Remove this participant from the selection' : Explanation about removing participant from a selection @@ -407,7 +407,7 @@ DialogPlus { //: 'Required' : Word relative to a star to explain that it is a requirement (Field form) text : '* '+qsTr('requiredField') //font.weight: Font.DemiBold - color: ColorsList.add("NewChatRoom_requiered_text", "g").color + color: NewChatRoomStyle.requiredColor font.pointSize: Units.dp * 8 } } diff --git a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml index 110811801..8e7965873 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml @@ -107,23 +107,32 @@ DialogPlus { } ActionButton { - Layout.preferredHeight: 20 - Layout.preferredWidth: 20 - Layout.leftMargin: 14 - Layout.rightMargin: 14 - icon: modelData.deviceCount > 0? - (participantDevices.visible ? 'expanded' : 'collapsed') - : (modelData.securityLevel === 2?'secure_level_1': - (modelData.securityLevel===3? 'secure_level_2' : 'secure_level_unsafe') - ) - iconSize: 20 + Layout.preferredHeight: iconSize + Layout.preferredWidth: iconSize + Layout.leftMargin: isCustom ? 9 : 14 + Layout.rightMargin: isCustom ? 9 : 14 + property int securityLevel : modelData.securityLevel + property bool participantsDevicesVisible: participantDevices.visible + function setColorSet(){ + if(isCustom) + colorSet = participantsDevicesVisible ? ParticipantsDevicesStyle.expanded : ParticipantsDevicesStyle.collapsed + iconSize = colorSet.iconSize + } + onSecurityLevelChanged: if( modelData.deviceCount == 0){ + icon = securityLevel === 2?'secure_level_1': + (securityLevel===3? 'secure_level_2' : 'secure_level_unsafe') + iconSize = 20 + } + onParticipantsDevicesVisibleChanged: setColorSet() visible:true - useStates: false + useStates: modelData.deviceCount > 0 + isCustom: useStates + onIsCustomChanged: setColorSet() onClicked: participantDevices.visible = !participantDevices.visible } } Rectangle { - color: ColorsList.add("ParticipantDevices_separator", "ag").color + color: ParticipantsDevicesStyle.lineSeparatorColor Layout.preferredHeight: 1 Layout.fillWidth: true } @@ -149,7 +158,7 @@ DialogPlus { width:parent.width height:50 - color: ColorsList.add("ParticipantDevices_line_background", "ah").color + color: ParticipantsDevicesStyle.lineBackgroundColor RowLayout{ anchors.fill:parent Text{ @@ -190,7 +199,7 @@ DialogPlus { } } Rectangle { - color: ColorsList.add("ParticipantDevices_separator", "ag").color + color: ParticipantsDevicesStyle.lineSeparatorColor anchors.left : parent.left anchors.right :parent.right anchors.bottom: parent.bottom diff --git a/linphone-app/ui/views/App/Main/HistoryView.js b/linphone-app/ui/views/App/Main/HistoryView.js index 5cf60c27a..cdf9caa94 100644 --- a/linphone-app/ui/views/App/Main/HistoryView.js +++ b/linphone-app/ui/views/App/Main/HistoryView.js @@ -44,10 +44,6 @@ function getAvatar () { return contact ? contact.vcard.avatar : '' } -function getEditIcon () { - return historyView._sipAddressObserver && historyView._sipAddressObserver.contact ? 'contact_edit' : 'contact_add' -} - function getEditTooltipText() { return historyView._sipAddressObserver && historyView._sipAddressObserver.contact ? qsTr('tooltipContactEdit') : qsTr('tooltipContactAdd') } diff --git a/linphone-app/ui/views/App/Main/HistoryView.qml b/linphone-app/ui/views/App/Main/HistoryView.qml index 02d5a49dc..8d7a299b6 100644 --- a/linphone-app/ui/views/App/Main/HistoryView.qml +++ b/linphone-app/ui/views/App/Main/HistoryView.qml @@ -81,14 +81,18 @@ ColumnLayout { iconSize: HistoryViewStyle.bar.actions.call.iconSize ActionButton { - icon: 'video_call' + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.videoCall visible: peerAddress && SettingsModel.videoSupported && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton onClicked: CallsListModel.launchVideoCall(historyView.peerAddress) } ActionButton { - icon: 'call' + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.call visible: peerAddress && SettingsModel.outgoingCallsEnabled onClicked: CallsListModel.launchAudioCall(historyView.peerAddress) @@ -99,25 +103,24 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter ActionButton { - icon: Logic.getEditIcon() + isCustom: true + backgroundRadius: 4 + colorSet: historyView._sipAddressObserver && historyView._sipAddressObserver.contact ? ConversationStyle.bar.actions.edit.viewContact : ConversationStyle.bar.actions.edit.addContact iconSize: HistoryViewStyle.bar.actions.edit.iconSize visible: peerAddress && SettingsModel.contactsEnabled onClicked: window.setView('ContactEdit', { sipAddress: historyView.peerAddress }) - TooltipArea { - text: peerAddress?Logic.getEditTooltipText():'' - } + tooltipText: peerAddress?Logic.getEditTooltipText():'' } ActionButton { - icon: 'delete' - iconSize: HistoryViewStyle.bar.actions.edit.iconSize + isCustom: true + backgroundRadius: 90 + colorSet: ContactsStyle.deleteAction onClicked: Logic.removeAllEntries() - TooltipArea { - text: qsTr('cleanHistory') - } + tooltipText: qsTr('cleanHistory') } } } diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml index 3336eace2..02c97ed27 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.qml +++ b/linphone-app/ui/views/App/Main/MainWindow.qml @@ -8,6 +8,7 @@ import Linphone 1.0 import Utils 1.0 import App.Styles 1.0 +import ColorsList 1.0 import 'MainWindow.js' as Logic @@ -71,7 +72,7 @@ ApplicationWindow { // Workaround to get these properties in `MainWindow.js`. readonly property alias contactsEntry: contactsEntry readonly property alias contentLoader: contentLoader - readonly property alias conferencesEntry: conferencesEntry + //readonly property alias conferencesEntry: conferencesEntry readonly property alias menu: menu readonly property alias timeline: timeline @@ -118,10 +119,11 @@ ApplicationWindow { onClicked: leftPanel.visible = !leftPanel.visible } ActionButton { - icon: 'home' + isCustom: true + backgroundRadius: 4 + colorSet: MainWindowStyle.buttons.home //: 'Open Home' : Tooltip for a button that open the home view tooltipText : qsTr('openHome') - iconSize: MainWindowStyle.homeButtonSize //autoIcon: true onClicked: setView('Home') } @@ -150,9 +152,10 @@ ApplicationWindow { Icon { icon: SettingsModel.autoAnswerStatus - ? 'auto_answer' + ? 'auto_answer_custom' : '' iconSize: MainWindowStyle.autoAnswerStatus.iconSize + overwriteColor: MainWindowStyle.autoAnswerStatus.text.color } Text { @@ -185,22 +188,24 @@ ApplicationWindow { if (SettingsModel.contactsEnabled) { window.setView('ContactEdit', { sipAddress: entry }) } else { - CallsListModel.createChatRoom( "", false, [entry], true ) + CallsListModel.createChatRoom( '', false, [entry], true ) } } - onLaunchCall: CallsListModel.launchAudioCall(sipAddress, "") + onLaunchCall: CallsListModel.launchAudioCall(sipAddress, '') onLaunchChat: CallsListModel.launchChat( sipAddress,0 ) onLaunchSecureChat: CallsListModel.launchChat( sipAddress,1 ) - onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress, "") + onLaunchVideoCall: CallsListModel.launchVideoCall(sipAddress, '') } ActionButton { - icon: 'new_chat_group' + isCustom: true + backgroundRadius: 4 + colorSet: MainWindowStyle.buttons.newChatGroup + //: 'Open Conference' : Tooltip to illustrate a button tooltipText : qsTr('newChatRoom') - iconSize: MainWindowStyle.newConferenceSize visible: SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled //autoIcon: true onClicked: { @@ -211,8 +216,9 @@ ApplicationWindow { } ActionButton { - icon: 'new_conference' - iconSize: MainWindowStyle.newConferenceSize + isCustom: true + backgroundRadius: 4 + colorSet: MainWindowStyle.buttons.newConference visible: SettingsModel.conferenceEnabled tooltipText:qsTr('newConferenceButton') //autoIcon: true @@ -221,8 +227,9 @@ ApplicationWindow { } ActionButton { - icon: 'burger_menu' - iconSize: MainWindowStyle.menuBurgerSize + isCustom: true + backgroundRadius: 4 + colorSet: MainWindowStyle.buttons.burgerMenu visible: Qt.platform.os !== 'osx' onClicked: menuBar.open() @@ -233,6 +240,7 @@ ApplicationWindow { } } + } Loader{ active:Qt.platform.os === 'osx' @@ -267,7 +275,9 @@ ApplicationWindow { ApplicationMenuEntry { id: contactsEntry - icon: 'contact' + icon: MainWindowStyle.menu.contacts.icon + iconSize: MainWindowStyle.menu.contacts.iconSize + overwriteColor: isSelected ? MainWindowStyle.menu.contacts.selectedColor : MainWindowStyle.menu.contacts.color name: qsTr('contactsEntry') visible: SettingsModel.contactsEnabled @@ -282,22 +292,23 @@ ApplicationWindow { anchors.right:parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: 10 - icon:'panel_arrow' - iconSize:10 + icon: MainWindowStyle.menu.direction.icon + overwriteColor: contactsEntry.overwriteColor + iconSize: MainWindowStyle.menu.direction.iconSize } } - + /* ApplicationMenuEntry { visible : false //TODO id: conferencesEntry - icon: 'conferences' - iconSize: 32 + icon: MainWindowStyle.menu.conferencesIcon name: 'MES CONFERENCES' + overwriteColor: isSelected ? MainWindowStyle.menu.conferencesSelectedColor : MainWindowStyle.menu.conferencesColor onSelected: window.setView('HistoryView') - } + }*/ } // History. @@ -338,7 +349,6 @@ ApplicationWindow { } } } - // --------------------------------------------------------------------------- // Url handlers. // --------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml index 914a6dd95..8771933a2 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml @@ -19,326 +19,329 @@ TabContainer { color: "#00000000" Column { id: column - spacing: SettingsWindowStyle.forms.spacing - width: parent.width - - // ------------------------------------------------------------------------- - // Logs. - // ------------------------------------------------------------------------- - - Form { - title: qsTr('logsTitle') - width: parent.width - - FormLine { - FormGroup { - label: qsTr('logsFolderLabel') - - FileChooserButton { - selectedFile: SettingsModel.logsFolder - selectFolder: true - - onAccepted: SettingsModel.logsFolder = selectedFile - } - } - } - - FormLine { - FormGroup { - label: qsTr('logsUploadUrlLabel') - - TextField { - readOnly: true - text: SettingsModel.logsUploadUrl - - onEditingFinished: SettingsModel.logsUploadUrl = text - } - } - } - - FormLine { - FormGroup { - label: qsTr('logsEnabledLabel') - - Switch { - checked: SettingsModel.logsEnabled - - onClicked: SettingsModel.logsEnabled = !checked - } - } - } - } - Row { - anchors.right: parent.right - spacing: SettingsAdvancedStyle.buttons.spacing - - TextButtonB { - text: qsTr('cleanLogs') - - onClicked: { - Logic.cleanLogs() - sendLogsBlock.setText('') + spacing: SettingsWindowStyle.forms.spacing + width: parent.width + + // ------------------------------------------------------------------------- + // Logs. + // ------------------------------------------------------------------------- + + Form { + title: qsTr('logsTitle') + width: parent.width + + FormLine { + FormGroup { + label: qsTr('logsFolderLabel') + + FileChooserButton { + selectedFile: SettingsModel.logsFolder + selectFolder: true + + onAccepted: SettingsModel.logsFolder = selectedFile } - } - - TextButtonB { - enabled: !sendLogsBlock.loading && SettingsModel.logsEnabled - text: qsTr('sendLogs') - - onClicked: sendLogsBlock.execute() - } - } - RequestBlock { - id: sendLogsBlock - - action: CoreManager.sendLogs - width: parent.width - - - Connections { - target: CoreManager - - onLogsUploaded: Logic.handleLogsUploaded(url) - } - } - onVisibleChanged: sendLogsBlock.setText('') - -// ------------------------------------------------------------------------- -// LDAP -// ------------------------------------------------------------------------- - Form { - title: 'LDAP' - width: parent.width - addButton:true - onAddButtonClicked:ldapSection.add() - SettingsLdap{ - id:ldapSection - width: parent.width - } - } - -// ------------------------------------------------------------------------- -// ADDRESS BOOK -// ------------------------------------------------------------------------- - - Form { - title: qsTr('contactsTitle') - width: parent.width - FormTable { - id:contactsImporterTable - width :parent.width - legendLineWidth:0 - disableLineTitle:importerRepeater.count!=1 - titles: (importerRepeater.count==1? getTitles(): []) - function getTitles(repeaterModel){ - var fields = importerRepeater.itemAt(0).pluginDescription['fields']; - var t = ['']; - for(var i = 0 ; i < fields.length ; ++i){ - t.push(fields[i]['placeholder']); - } - return t; - } - Repeater{ - id:importerRepeater - model:ContactsImporterListProxyModel{id:contactsImporterList} - - delegate : FormTable{ - //readonly property double maxItemWidth: contactsImporterTable.maxItemWidth - property var pluginDescription : importerLine.pluginDescription - width :parent.width - legendLineWidth:80 - disableLineTitle:true - FormTableLine { - id:importerLine - property var fields : modelData.fields - property int identity : modelData.identity - property var pluginDescription : ContactsImporterPluginsManager.getContactsImporterPluginDescription(fields["pluginID"]) // Plugin definition - - FormTableEntry { - Row{ - width :parent.width - ActionButton { - id:removeImporter - icon: 'cancel' - iconSize:CallsStyle.entry.iconActionSize - onClicked:ContactsImporterListModel.removeContactsImporter(modelData) - } - Text{ - height:parent.height - width:parent.width-removeImporter.width - text:importerLine.pluginDescription['pluginTitle'] - horizontalAlignment:Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - wrapMode: Text.WordWrap - font { - bold: true - pointSize: FormTableStyle.entry.text.pointSize - } - TooltipArea{ - text:importerLine.pluginDescription['pluginDescription'] - } - } - } - } - - Repeater{ - model:importerLine.pluginDescription['fields'] - delegate: FormTableEntry { - Loader{ - sourceComponent: (modelData['type']==0 ? textComponent:textFieldComponent) - active:true - width:parent.width - Component{ - id: textComponent - Text { - color: FormTableStyle.entry.text.color - elide: Text.ElideRight - horizontalAlignment: Text.AlignHCenter - text: importerLine.fields[modelData['fieldId']]?importerLine.fields[modelData['fieldId']]:'' - height: FormTableStyle.entry.height - width: parent.width - font { - bold: true - pointSize: FormTableStyle.entry.text.pointSize - } - } - } - Component{ - id: textFieldComponent - TextField { - readOnly: false - width:parent.width - placeholderText : modelData['placeholder'] - text: importerLine.fields[modelData['fieldId']]?importerLine.fields[modelData['fieldId']]:'' - echoMode: (modelData['hiddenText']?TextInput.Password:TextInput.Normal) - onEditingFinished:{ - importerLine.fields[modelData['fieldId']] = text - } - Component.onCompleted: importerLine.fields[modelData['fieldId']] = text - } - } - } - } - }// Repeater : Fields - FormTableEntry { - Switch { - checked: modelData.fields["enabled"]>0 - onClicked: { - checked = !checked - importerLine.fields["enabled"] = (checked?1:0) - ContactsImporterListModel.addContactsImporter(importerLine.fields, importerLine.identity) - - if(checked){ - ContactsImporterListModel.importContacts(importerLine.identity) - }else - contactsImporterStatus.text = '' - } - } - }//FormTableEntry - }//FormTableLine - FormTableLine{ - width:parent.width-parent.legendLineWidth - FormTableEntry { - id:contactsImporterStatusEntry - visible:contactsImporterStatus.text!=='' - width:parent.width - TextEdit{ - id:contactsImporterStatus - property bool isError:false - selectByMouse: true - readOnly:true - color: (isError?SettingsAdvancedStyle.error.color:SettingsAdvancedStyle.info.color) - width:parent.width - horizontalAlignment:Text.AlignRight - font { - italic: true - pointSize: SettingsAdvancedStyle.info.pointSize - } - Connections{ - target:modelData - onStatusMessage:{contactsImporterStatus.isError=false;contactsImporterStatus.text=message;} - onErrorMessage:{contactsImporterStatus.isError=true;contactsImporterStatus.text=message;} - } - } - } - } - }//Column - }// Repeater : Importer - - } - Row{ - spacing:SettingsAdvancedStyle.buttons.spacing - anchors.horizontalCenter: parent.horizontalCenter - ActionButton { - icon: 'options' - iconSize:CallsStyle.entry.iconActionSize - onClicked:{ - ContactsImporterPluginsManager.openNewPlugin(); - pluginChoice.model = ContactsImporterPluginsManager.getPlugins(); - } - } - ComboBox{ - id: pluginChoice - model:ContactsImporterPluginsManager.getPlugins() - textRole: "pluginTitle" - //: 'No Plugins to load' : Text in combobox - displayText: currentIndex === -1 ? qsTr('noPlugin') : currentText - Text{// Hack, combobox show empty text when empty - anchors.fill:parent - visible:pluginChoice.currentIndex===-1 - verticalAlignment: Qt.AlignVCenter - horizontalAlignment: Qt.AlignHCenter - text: qsTr('noPlugin') - font { - bold:false - italic: true - pointSize: FormTableStyle.entry.text.pointSize - } - } - Connections{ - target:SettingsModel - onContactImporterChanged:pluginChoice.model=ContactsImporterPluginsManager.getPlugins() - } - } - ActionButton { - icon: 'add' - iconSize:CallsStyle.entry.iconActionSize - visible:pluginChoice.currentIndex>=0 - onClicked:{ - if( pluginChoice.currentIndex >= 0) - ContactsImporterListModel.createContactsImporter({"pluginID":pluginChoice.model[pluginChoice.currentIndex]["pluginID"]}) - } - } - } - } - - // ------------------------------------------------------------------------- - // Developer settings. - // ------------------------------------------------------------------------- - - Form { - title: qsTr('developerSettingsTitle') - visible: SettingsModel.isDeveloperSettingsAvailable() - width: parent.width - - FormLine { - FormGroup { - label: qsTr('developerSettingsEnabledLabel') - - Switch { - checked: SettingsModel.developerSettingsEnabled - - onClicked: SettingsModel.developerSettingsEnabled = !checked - } - } - } - } - } + } + } + + FormLine { + FormGroup { + label: qsTr('logsUploadUrlLabel') + + TextField { + readOnly: true + text: SettingsModel.logsUploadUrl + + onEditingFinished: SettingsModel.logsUploadUrl = text + } + } + } + + FormLine { + FormGroup { + label: qsTr('logsEnabledLabel') + + Switch { + checked: SettingsModel.logsEnabled + + onClicked: SettingsModel.logsEnabled = !checked + } + } + } + } + Row { + anchors.right: parent.right + spacing: SettingsAdvancedStyle.buttons.spacing + + TextButtonB { + text: qsTr('cleanLogs') + + onClicked: { + Logic.cleanLogs() + sendLogsBlock.setText('') + } + } + + TextButtonB { + enabled: !sendLogsBlock.loading && SettingsModel.logsEnabled + text: qsTr('sendLogs') + + onClicked: sendLogsBlock.execute() + } + } + RequestBlock { + id: sendLogsBlock + + action: CoreManager.sendLogs + width: parent.width + + + Connections { + target: CoreManager + + onLogsUploaded: Logic.handleLogsUploaded(url) + } + } + onVisibleChanged: sendLogsBlock.setText('') + + // ------------------------------------------------------------------------- + // LDAP + // ------------------------------------------------------------------------- + Form { + title: 'LDAP' + width: parent.width + addButton:true + onAddButtonClicked:ldapSection.add() + SettingsLdap{ + id:ldapSection + width: parent.width + } + } + + // ------------------------------------------------------------------------- + // ADDRESS BOOK + // ------------------------------------------------------------------------- + + Form { + title: qsTr('contactsTitle') + width: parent.width + FormTable { + id:contactsImporterTable + width :parent.width + legendLineWidth:0 + disableLineTitle:importerRepeater.count!=1 + titles: (importerRepeater.count==1? getTitles(): []) + function getTitles(repeaterModel){ + var fields = importerRepeater.itemAt(0).pluginDescription['fields']; + var t = ['']; + for(var i = 0 ; i < fields.length ; ++i){ + t.push(fields[i]['placeholder']); + } + return t; + } + Repeater{ + id:importerRepeater + model:ContactsImporterListProxyModel{id:contactsImporterList} + + delegate : FormTable{ + //readonly property double maxItemWidth: contactsImporterTable.maxItemWidth + property var pluginDescription : importerLine.pluginDescription + width :parent.width + legendLineWidth:80 + disableLineTitle:true + FormTableLine { + id:importerLine + property var fields : modelData.fields + property int identity : modelData.identity + property var pluginDescription : ContactsImporterPluginsManager.getContactsImporterPluginDescription(fields["pluginID"]) // Plugin definition + + FormTableEntry { + Row{ + width :parent.width + ActionButton { + id:removeImporter + isCustom: true + backgroundRadius: 90 + colorSet: SettingsAdvancedStyle.cancel + onClicked:ContactsImporterListModel.removeContactsImporter(modelData) + } + Text{ + height:parent.height + width:parent.width-removeImporter.width + text:importerLine.pluginDescription['pluginTitle'] + horizontalAlignment:Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + wrapMode: Text.WordWrap + font { + bold: true + pointSize: FormTableStyle.entry.text.pointSize + } + TooltipArea{ + text:importerLine.pluginDescription['pluginDescription'] + } + } + } + } + + Repeater{ + model:importerLine.pluginDescription['fields'] + delegate: FormTableEntry { + Loader{ + sourceComponent: (modelData['type']==0 ? textComponent:textFieldComponent) + active:true + width:parent.width + Component{ + id: textComponent + Text { + color: FormTableStyle.entry.text.color + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + text: importerLine.fields[modelData['fieldId']]?importerLine.fields[modelData['fieldId']]:'' + height: FormTableStyle.entry.height + width: parent.width + font { + bold: true + pointSize: FormTableStyle.entry.text.pointSize + } + } + } + Component{ + id: textFieldComponent + TextField { + readOnly: false + width:parent.width + placeholderText : modelData['placeholder'] + text: importerLine.fields[modelData['fieldId']]?importerLine.fields[modelData['fieldId']]:'' + echoMode: (modelData['hiddenText']?TextInput.Password:TextInput.Normal) + onEditingFinished:{ + importerLine.fields[modelData['fieldId']] = text + } + Component.onCompleted: importerLine.fields[modelData['fieldId']] = text + } + } + } + } + }// Repeater : Fields + FormTableEntry { + Switch { + checked: modelData.fields["enabled"]>0 + onClicked: { + checked = !checked + importerLine.fields["enabled"] = (checked?1:0) + ContactsImporterListModel.addContactsImporter(importerLine.fields, importerLine.identity) + + if(checked){ + ContactsImporterListModel.importContacts(importerLine.identity) + }else + contactsImporterStatus.text = '' + } + } + }//FormTableEntry + }//FormTableLine + FormTableLine{ + width:parent.width-parent.legendLineWidth + FormTableEntry { + id:contactsImporterStatusEntry + visible:contactsImporterStatus.text!=='' + width:parent.width + TextEdit{ + id:contactsImporterStatus + property bool isError:false + selectByMouse: true + readOnly:true + color: (isError?SettingsAdvancedStyle.error.color:SettingsAdvancedStyle.info.color) + width:parent.width + horizontalAlignment:Text.AlignRight + font { + italic: true + pointSize: SettingsAdvancedStyle.info.pointSize + } + Connections{ + target:modelData + onStatusMessage:{contactsImporterStatus.isError=false;contactsImporterStatus.text=message;} + onErrorMessage:{contactsImporterStatus.isError=true;contactsImporterStatus.text=message;} + } + } + } + } + }//Column + }// Repeater : Importer + + } + Row{ + spacing:SettingsAdvancedStyle.buttons.spacing + anchors.horizontalCenter: parent.horizontalCenter + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: SettingsAdvancedStyle.options + onClicked:{ + ContactsImporterPluginsManager.openNewPlugin(); + pluginChoice.model = ContactsImporterPluginsManager.getPlugins(); + } + } + ComboBox{ + id: pluginChoice + model:ContactsImporterPluginsManager.getPlugins() + textRole: "pluginTitle" + //: 'No Plugins to load' : Text in combobox + displayText: currentIndex === -1 ? qsTr('noPlugin') : currentText + Text{// Hack, combobox show empty text when empty + anchors.fill:parent + visible:pluginChoice.currentIndex===-1 + verticalAlignment: Qt.AlignVCenter + horizontalAlignment: Qt.AlignHCenter + text: qsTr('noPlugin') + font { + bold:false + italic: true + pointSize: FormTableStyle.entry.text.pointSize + } + } + Connections{ + target:SettingsModel + onContactImporterChanged:pluginChoice.model=ContactsImporterPluginsManager.getPlugins() + } + } + ActionButton { + isCustom: true + backgroundRadius: 90 + colorSet: SettingsAdvancedStyle.add + visible:pluginChoice.currentIndex>=0 + onClicked:{ + if( pluginChoice.currentIndex >= 0) + ContactsImporterListModel.createContactsImporter({"pluginID":pluginChoice.model[pluginChoice.currentIndex]["pluginID"]}) + } + } + } + } + + // ------------------------------------------------------------------------- + // Developer settings. + // ------------------------------------------------------------------------- + + Form { + title: qsTr('developerSettingsTitle') + visible: SettingsModel.isDeveloperSettingsAvailable() + width: parent.width + + FormLine { + FormGroup { + label: qsTr('developerSettingsEnabledLabel') + + Switch { + checked: SettingsModel.developerSettingsEnabled + + onClicked: SettingsModel.developerSettingsEnabled = !checked + } + } + } + } + } } /*##^## Designer { - D{i:0;autoSize:true;height:480;width:640} + D{i:0;autoSize:true;height:480;width:640} } ##^##*/ diff --git a/linphone-app/ui/views/App/Settings/SettingsAudio.qml b/linphone-app/ui/views/App/Settings/SettingsAudio.qml index 698ce86d2..9b04c0e48 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAudio.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAudio.qml @@ -142,12 +142,12 @@ TabContainer { width: audioTestSlider.availableWidth height: implicitHeight radius: 2 - color: ColorsList.add("SettingsAudio_slider_background", "slider_background").color + color: SettingsAudioStyle.sliderBackgroundColor Rectangle { width: audioTestSlider.visualPosition * parent.width height: parent.height - color: audioTestSlider.value > 0.8 ? ColorsList.add("SettingsAudio_slider_high", "slider_high").color : ColorsList.add("SettingsAudio_slider_low", "slider_low").color + color: audioTestSlider.value > 0.8 ? SettingsAudioStyle.sliderHighColor : SettingsAudioStyle.sliderLowColor radius: 2 } } @@ -201,18 +201,15 @@ TabContainer { SettingsModel.ringPath = selectedFile } - ActionSwitch { + ActionButton{ anchors { left: parent.right leftMargin: SettingsAudioStyle.ringPlayer.leftMargin } - - enabled: { - var item = ringPlayer.item - return item && item.playbackState === SoundPlayer.PlayingState - } - - icon: 'pause' + property bool playing : ringPlayer.item && ringPlayer.item.playbackState === SoundPlayer.PlayingState + isCustom: true + backgroundRadius: 90 + colorSet: playing ? SettingsAudioStyle.pause : SettingsAudioStyle.play onClicked: { var item = ringPlayer.item @@ -220,7 +217,7 @@ TabContainer { return } - if (enabled) { + if (playing) { item.stop() } else { item.play() diff --git a/linphone-app/ui/views/App/Settings/SettingsLdap.qml b/linphone-app/ui/views/App/Settings/SettingsLdap.qml index e8f93b9e8..c50455500 100644 --- a/linphone-app/ui/views/App/Settings/SettingsLdap.qml +++ b/linphone-app/ui/views/App/Settings/SettingsLdap.qml @@ -68,8 +68,9 @@ Column { anchors.verticalCenter: parent.verticalCenter anchors.right:parent.right anchors.rightMargin:SettingsAdvancedStyle.lists.margin - icon: 'cancel' - iconSize:CallsStyle.entry.iconActionSize + isCustom: true + backgroundRadius: 90 + colorSet: SettingsAdvancedStyle.cancel scale:SettingsAdvancedStyle.lists.iconScale onClicked:{ LdapListModel.remove(modelData) diff --git a/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml index ced920119..2e2672b48 100644 --- a/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml +++ b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml @@ -83,8 +83,9 @@ TabContainer { FormTableEntry { ActionButton { - icon: 'edit' - iconSize: SettingsWindowStyle.sipAccounts.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: SettingsWindowStyle.buttons.editProxy onClicked: Logic.editAccount(modelData) } @@ -92,8 +93,9 @@ TabContainer { FormTableEntry { ActionButton { - icon: 'delete' - iconSize: SettingsWindowStyle.sipAccounts.iconSize + isCustom: true + backgroundRadius: 4 + colorSet: SettingsWindowStyle.buttons.deleteProxy onClicked: Logic.deleteAccount(modelData) } diff --git a/linphone-app/ui/views/App/Settings/SettingsUi.qml b/linphone-app/ui/views/App/Settings/SettingsUi.qml index 0cf95a968..1c618ebce 100644 --- a/linphone-app/ui/views/App/Settings/SettingsUi.qml +++ b/linphone-app/ui/views/App/Settings/SettingsUi.qml @@ -65,8 +65,9 @@ TabContainer { label: qsTr('fontsTextChange') RowLayout{ ActionButton { - icon: 'options' - iconSize: 25 + isCustom: true + backgroundRadius: 90 + colorSet: SettingsUiStyle.options onClicked: fontDialog.visible = true Layout.preferredWidth: 25 FontDialog { diff --git a/linphone-app/ui/views/App/Settings/SettingsWindow.qml b/linphone-app/ui/views/App/Settings/SettingsWindow.qml index fd984ed4a..91d4f0325 100644 --- a/linphone-app/ui/views/App/Settings/SettingsWindow.qml +++ b/linphone-app/ui/views/App/Settings/SettingsWindow.qml @@ -53,33 +53,33 @@ ApplicationWindow { onCurrentIndexChanged: SettingsModel.onSettingsTabChanged(currentIndex) TabButton { - iconName: 'settings_sip_accounts' + iconName: TabButtonStyle.icon.sipAccountsIcon text: qsTr('sipAccountsTab') width: implicitWidth } TabButton { - iconName: 'settings_audio' + iconName: TabButtonStyle.icon.audioIcon text: qsTr('audioTab') width: implicitWidth } TabButton { enabled: SettingsModel.videoSupported - iconName: 'settings_video' + iconName: TabButtonStyle.icon.videoIcon text: qsTr('videoTab') width: implicitWidth } TabButton { - iconName: 'settings_call' + iconName: TabButtonStyle.icon.callIcon text: qsTr('callsAndChatTab') width: implicitWidth } TabButton { enabled: SettingsModel.showNetworkSettings || SettingsModel.developerSettingsEnabled - iconName: 'settings_network' + iconName: TabButtonStyle.icon.networkIcon text: qsTr('networkTab') width: implicitWidth } @@ -87,20 +87,20 @@ ApplicationWindow { TabButton { visible: SettingsModel.tunnelAvailable() enabled: visible - iconName: 'settings_network' + iconName: TabButtonStyle.icon.sipAccountsIcon //: 'Tunnel' : Tab title for tunnel section in settings. text: qsTr('tunnelTab') width: visible ? implicitWidth : 0 } TabButton { - iconName: 'settings_advanced' + iconName: TabButtonStyle.icon.advancedIcon text: qsTr('uiTab') width: implicitWidth } TabButton { - iconName: 'settings_advanced' + iconName: TabButtonStyle.icon.advancedIcon text: qsTr('uiAdvanced') width: implicitWidth } diff --git a/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml new file mode 100644 index 000000000..4bc8bdef8 --- /dev/null +++ b/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml @@ -0,0 +1,369 @@ +pragma Singleton +import QtQml 2.2 + +import Units 1.0 +import ColorsList 1.0 + +// ============================================================================= + +QtObject { + property string sectionName : 'CallFullscreen' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color + + property QtObject actionArea: QtObject { + property int height: 100 + property int iconSize: 40 + property int leftButtonsGroupMargin: 50 + property int lowWidth: 650 + property int rightButtonsGroupMargin: 50 + + property QtObject userVideo: QtObject { + property int height: 200 + property int width: 130 + property int heightReference: 1200 // height and width are fixed from these references + property int widthReference: 780 + } + + property QtObject vu: QtObject { + property int spacing: 5 + } + + property QtObject callError: QtObject { + property color color: ColorsList.add(sectionName+'_action_error', 'i').color + property int pointSize: Units.dp * 12 + } + } + + property QtObject container: QtObject { + property int margins: 15 + + property QtObject avatar: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n').color + property int maxSize: 300 + } + + property QtObject pause: QtObject { + property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color + property int pointSizeFactor: 5 + } + } + } + + property QtObject header: QtObject { + property int buttonIconSize: 40 + property int iconSize: 16 + property int leftMargin: 20 + property int rightMargin: 20 + property int spacing: 10 + property int topMargin: 26 + + property QtObject busyIndicator: QtObject { + property color color: ColorsList.add(sectionName+'_header_busy', 'g').color + property int height: 30 + property int width: 30 + } + + property QtObject contactDescription: QtObject { + property int height: 50 + property int width: 150 + } + + property QtObject elapsedTime: QtObject { + property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color + property int pointSize: Units.dp * 10 + + property QtObject fullscreen: QtObject { + property int pointSize: Units.dp * 12 + } + } + + property QtObject stats: QtObject { + property int relativeY: 90 + } + } + + property QtObject zrtpArea: QtObject { + property int height: 50 + + property QtObject buttons: QtObject { + property int spacing: 10 + } + + property QtObject text: QtObject { + property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color + property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color + property int pointSize: Units.dp * 10 + property int wordsSpacing: 5 + } + } + // Button colors + property QtObject buttons: QtObject { + property QtObject callQuality: QtObject { + property int iconSize: 16 + property string name : 'quality' + property string icon : 'call_quality_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject telKeyad: QtObject { + property int iconSize: 16 + property string name : 'telKeypad' + property string icon : 'tel_keypad_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject secure: QtObject { + property int iconSize: 16 + property string icon : 'call_chat_secure_custom' + property string name : 'secure' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b').color + } + property QtObject unsecure: QtObject { + property int iconSize: 16 + property string icon : 'call_chat_unsecure_custom' + property string name : 'unsecure' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000').color + } + property QtObject screenshot: QtObject { + property int iconSize: 40 + property string icon : 'screenshot_custom' + property string name : 'screenshot' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color + } + property QtObject recordOn: QtObject { + property int iconSize: 40 + property string icon : 'record_custom' + property string name : 'recordOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_p_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_p_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color + } + property QtObject recordOff: QtObject { + property int iconSize: 40 + property string icon : 'record_custom' + property string name : 'recordOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color + } + property QtObject fullscreen: QtObject { + property int iconSize: 40 + property string icon : 'fullscreen_custom' + property string name : 'fullscreen' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject stopFullscreen: QtObject { + property int iconSize: 40 + property string icon : 'stop_fullscreen_custom' + property string name : 'stopFullscreen' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color + } + property QtObject microOn: QtObject { + property int iconSize: 40 + property string icon : 'micro_on_custom' + property string name : 'microOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject microOff: QtObject { + property int iconSize: 40 + property string icon : 'micro_off_custom' + property string name : 'microOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject speakerOn: QtObject { + property int iconSize: 40 + property string icon : 'speaker_on_custom' + property string name : 'speakerOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject speakerOff: QtObject { + property int iconSize: 40 + property string icon : 'speaker_off_custom' + property string name : 'speakerOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject cameraOn: QtObject { + property int iconSize: 40 + property string icon : 'camera_on_custom' + property string name : 'cameraOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject cameraOff: QtObject { + property int iconSize: 40 + property string icon : 'camera_off_custom' + property string name : 'cameraOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject options: QtObject { + property int iconSize: 40 + property string icon : 'options_custom' + property string name : 'options' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject pause: QtObject { + property int iconSize: 40 + property string icon : 'pause_custom' + property string name : 'pause' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject play: QtObject { + property int iconSize: 40 + property string icon : 'play_custom' + property string name : 'play' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject chat: QtObject { + property int iconSize: 40 + property string icon : 'chat_custom' + property string name : 'chat' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject history: QtObject { + property int iconSize: 40 + property string icon : 'history_custom' + property string name : 'history' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject hangup: QtObject { + property int iconSize: 40 + property string icon : 'hangup_custom' + property string name : 'hangup' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + } + property QtObject acceptVideoCall: QtObject { + property int iconSize: 40 + property string icon : 'video_call_accept_custom' + property string name : 'videoCallAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } + property QtObject acceptCall: QtObject { + property int iconSize: 40 + property string icon : 'call_accept_custom' + property string name : 'callAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } + } +} diff --git a/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml index da7a7f381..2ebce71fb 100644 --- a/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml @@ -7,95 +7,363 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("Call_background", "f").color - - property QtObject actionArea: QtObject { - property int height: 100 - property int iconSize: 40 - property int leftButtonsGroupMargin: 50 - property int lowWidth: 650 - property int rightButtonsGroupMargin: 50 - - property QtObject userVideo: QtObject { - property int height: 200 - property int width: 130 - property int heightReference: 1200 // height and width are fixed from these references - property int widthReference: 780 - } - - property QtObject vu: QtObject { - property int spacing: 5 - } - - property QtObject callError: QtObject { - property color color: ColorsList.add("Call_action_error", "i").color - property int pointSize: Units.dp * 12 - } - } - - property QtObject container: QtObject { - property int margins: 15 - - property QtObject avatar: QtObject { - property color backgroundColor: ColorsList.add("Call_container_avatar_background", "n").color - property int maxSize: 300 - } - - property QtObject pause: QtObject { - property color color: ColorsList.add("Call_container_pause", "g90").color - - property QtObject text: QtObject { - property color color: ColorsList.add("Call_container_pause_text", "q").color - property int pointSizeFactor: 5 - } - } - } - - property QtObject header: QtObject { - property int buttonIconSize: 40 - property int iconSize: 16 - property int leftMargin: 20 - property int rightMargin: 20 - property int spacing: 10 - property int topMargin: 26 - - property QtObject busyIndicator: QtObject { - property color color: ColorsList.add("Call_header_busy", "g").color - property int height: 30 - property int width: 30 - } - - property QtObject contactDescription: QtObject { - property int height: 50 - property int width: 150 - } - - property QtObject elapsedTime: QtObject { - property color color: ColorsList.add("Call_header_elapsed_time", "j").color - property int pointSize: Units.dp * 10 - - property QtObject fullscreen: QtObject { - property int pointSize: Units.dp * 12 - } - } - - property QtObject stats: QtObject { - property int relativeY: 90 - } - } - - property QtObject zrtpArea: QtObject { - property int height: 50 - - property QtObject buttons: QtObject { - property int spacing: 10 - } - - property QtObject text: QtObject { - property color colorA: ColorsList.add("Call_zrtp_text_a", "j").color - property color colorB: ColorsList.add("Call_zrtp_text_b", "i").color - property int pointSize: Units.dp * 10 - property int wordsSpacing: 5 - } - } + property string sectionName : 'Call' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color + + property QtObject actionArea: QtObject { + property int height: 100 + property int iconSize: 40 + property int leftButtonsGroupMargin: 50 + property int lowWidth: 650 + property int rightButtonsGroupMargin: 50 + + property QtObject userVideo: QtObject { + property int height: 200 + property int width: 130 + property int heightReference: 1200 // height and width are fixed from these references + property int widthReference: 780 + } + + property QtObject vu: QtObject { + property int spacing: 5 + } + + property QtObject callError: QtObject { + property color color: ColorsList.add(sectionName+'_action_error', 'i').color + property int pointSize: Units.dp * 12 + } + } + + property QtObject container: QtObject { + property int margins: 15 + + property QtObject avatar: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n').color + property int maxSize: 300 + } + + property QtObject pause: QtObject { + property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color + + property QtObject text: QtObject { + property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color + property int pointSizeFactor: 5 + } + } + } + + property QtObject header: QtObject { + property int buttonIconSize: 40 + property int iconSize: 16 + property int leftMargin: 20 + property int rightMargin: 20 + property int spacing: 10 + property int topMargin: 26 + + property QtObject busyIndicator: QtObject { + property color color: ColorsList.add(sectionName+'_header_busy', 'g').color + property int height: 30 + property int width: 30 + } + + property QtObject contactDescription: QtObject { + property int height: 50 + property int width: 150 + } + + property QtObject elapsedTime: QtObject { + property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color + property int pointSize: Units.dp * 10 + + property QtObject fullscreen: QtObject { + property int pointSize: Units.dp * 12 + } + } + + property QtObject stats: QtObject { + property int relativeY: 90 + } + } + + property QtObject zrtpArea: QtObject { + property int height: 50 + + property QtObject buttons: QtObject { + property int spacing: 10 + } + + property QtObject text: QtObject { + property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color + property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color + property int pointSize: Units.dp * 10 + property int wordsSpacing: 5 + } + } + // Button colors + property QtObject buttons: QtObject { + property QtObject callQuality: QtObject { + property int iconSize: 16 + property string name : 'quality' + property string icon : 'call_quality_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject telKeyad: QtObject { + property int iconSize: 16 + property string name : 'telKeypad' + property string icon : 'tel_keypad_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject secure: QtObject { + property int iconSize: 16 + property string icon : 'call_chat_secure_custom' + property string name : 'secure' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b').color + } + property QtObject unsecure: QtObject { + property int iconSize: 16 + property string icon : 'call_chat_unsecure_custom' + property string name : 'unsecure' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000').color + } + property QtObject screenshot: QtObject { + property int iconSize: 40 + property string icon : 'screenshot_custom' + property string name : 'screenshot' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject recordOn: QtObject { + property int iconSize: 40 + property string icon : 'record_custom' + property string name : 'recordOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_p_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_p_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject recordOff: QtObject { + property int iconSize: 40 + property string icon : 'record_custom' + property string name : 'recordOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject fullscreen: QtObject { + property int iconSize: 40 + property string icon : 'fullscreen_custom' + property string name : 'fullscreen' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject stopFullscreen: QtObject { + property int iconSize: 40 + property string icon : 'stop_fullscreen_custom' + property string name : 'stopFullscreen' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject microOn: QtObject { + property int iconSize: 40 + property string icon : 'micro_on_custom' + property string name : 'microOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject microOff: QtObject { + property int iconSize: 40 + property string icon : 'micro_off_custom' + property string name : 'microOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject speakerOn: QtObject { + property int iconSize: 40 + property string icon : 'speaker_on_custom' + property string name : 'speakerOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject speakerOff: QtObject { + property int iconSize: 40 + property string icon : 'speaker_off_custom' + property string name : 'speakerOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject cameraOn: QtObject { + property int iconSize: 40 + property string icon : 'camera_on_custom' + property string name : 'cameraOn' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject cameraOff: QtObject { + property int iconSize: 40 + property string icon : 'camera_off_custom' + property string name : 'cameraOff' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject options: QtObject { + property int iconSize: 40 + property string icon : 'options_custom' + property string name : 'options' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject pause: QtObject { + property int iconSize: 40 + property string icon : 'pause_custom' + property string name : 'pause' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject play: QtObject { + property int iconSize: 40 + property string icon : 'play_custom' + property string name : 'play' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject chat: QtObject { + property int iconSize: 40 + property string icon : 'chat_custom' + property string name : 'chat' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject history: QtObject { + property int iconSize: 40 + property string icon : 'history_custom' + property string name : 'history' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject hangup: QtObject { + property int iconSize: 40 + property string icon : 'hangup_custom' + property string name : 'hangup' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + } + property QtObject acceptVideoCall: QtObject { + property int iconSize: 40 + property string icon : 'video_call_accept_custom' + property string name : 'videoCallAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } + property QtObject acceptCall: QtObject { + property int iconSize: 40 + property string icon : 'call_accept_custom' + property string name : 'callAccept' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color + } + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml index b17799e14..13cd5bee6 100644 --- a/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml @@ -5,29 +5,52 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int minimumHeight: 480 - property int minimumWidth: 960 - - property QtObject call: QtObject { - property int minimumWidth: 395 - } - - property QtObject callsList: QtObject { - property color color: ColorsList.add("CallsWindow_list_background", "q").color - property int defaultWidth: 250 - property int maximumWidth: 250 - property int minimumWidth: 110 - - property QtObject header: QtObject { - property color color1: ColorsList.add("CallsWindow_list_header_a", "q").color - property color color2: ColorsList.add("CallsWindow_list_header_b", "f").color - property int height: 60 - property int iconSize: 40 - property int leftMargin: 10 - } - } - - property QtObject chat: QtObject { - property int minimumWidth: 300 - } + property string sectionName: 'CallsWindow' + property int minimumHeight: 480 + property int minimumWidth: 960 + + property QtObject call: QtObject { + property int minimumWidth: 395 + } + + property QtObject callsList: QtObject { + property color color: ColorsList.add(sectionName+'_list_bg', 'q').color + property int defaultWidth: 250 + property int maximumWidth: 250 + property int minimumWidth: 110 + + property QtObject header: QtObject { + property color color1: ColorsList.add(sectionName+'_list_header_a', 'q').color + property color color2: ColorsList.add(sectionName+'_list_header_b', 'f').color + property int height: 60 + property int iconSize: 40 + property int leftMargin: 10 + } + property QtObject newCall: QtObject { + property int iconSize: 40 + property string name : 'newCall' + property string icon : 'new_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + } + property QtObject newConference: QtObject { + property int iconSize: 40 + property string name : 'newConference' + property string icon : 'new_conference_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + } + } + + property QtObject chat: QtObject { + property int minimumWidth: 300 + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml index dcaf4102f..698809613 100644 --- a/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml @@ -7,24 +7,25 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject description: QtObject { - property color color: ColorsList.add("Conference_description", "j").color - property int pointSize: Units.dp * 12 - property int height: 60 - property int width: 150 - } - - property QtObject grid: QtObject { - property int spacing: 5 - - property QtObject cell: QtObject { - property int height: 145 - property int spacing: 5 - property int width: 154 - - property QtObject contactDescription: QtObject { - property int height: 35 - } - } - } + property string sectionName: 'Conference' + property QtObject description: QtObject { + property color color: ColorsList.add(sectionName+'_description', 'j').color + property int pointSize: Units.dp * 12 + property int height: 60 + property int width: 150 + } + + property QtObject grid: QtObject { + property int spacing: 5 + + property QtObject cell: QtObject { + property int height: 145 + property int spacing: 5 + property int width: 154 + + property QtObject contactDescription: QtObject { + property int height: 35 + } + } + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml index 2d6720f76..577c6c6ca 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml @@ -1,10 +1,38 @@ pragma Singleton import QtQml 2.2 +import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 420 - property int spacing: 10 - property int width: 450 + property string sectionName : 'CallSipAddress' + property int height: 420 + property int spacing: 10 + property int width: 450 + + property QtObject videoCall: QtObject { + property int iconSize: 36 + property string name : 'videoCall' + property string icon : 'video_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject call: QtObject { + property int iconSize: 36 + property string name : 'call' + property string icon : 'call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject searchField: QtObject { + property color color: ColorsList.add(sectionName+'_searchField', 'c').color + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml index 2d6720f76..f9df761e3 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml @@ -1,10 +1,26 @@ pragma Singleton import QtQml 2.2 +import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 420 - property int spacing: 10 - property int width: 450 + property string sectionName: 'CallTransfer' + property int height: 420 + property int spacing: 10 + property int width: 450 + property QtObject transfer: QtObject { + property int iconSize: 36 + property string icon : 'transfer_custom' + property string name : 'transfer' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject searchField: QtObject { + property color color: ColorsList.add(sectionName+'_searchField', 'c').color + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml index ac442e29a..a195dbd87 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml @@ -6,19 +6,45 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 420 - property int width: 740 - - property QtObject columns: QtObject { - property QtObject selector: QtObject { - property int spacing: 10 - } - - property QtObject separator: QtObject { - property color color: ColorsList.add("ConferenceManager_separator", "c").color - property int leftMargin: 25 - property int rightMargin: 25 - property int width: 1 - } - } + property string sectionName: 'ConferenceManager' + property int height: 420 + property int width: 740 + + property QtObject columns: QtObject { + property QtObject selector: QtObject { + property int spacing: 10 + } + + property QtObject separator: QtObject { + property color color: ColorsList.add(sectionName+'_separator', 'c').color + property int leftMargin: 25 + property int rightMargin: 25 + property int width: 1 + } + } + property QtObject transfer: QtObject { + property int iconSize: 36 + property string icon : 'transfer_custom' + property string name : 'transfer' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject cancel: QtObject { + property int iconSize: 36 + property string icon : 'cancel_custom' + property string name : 'cancel' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject searchField: QtObject { + property color color: ColorsList.add(sectionName+'_searchField', 'c').color + } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml index 1aa924caa..42d19ed30 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml @@ -1,19 +1,39 @@ pragma Singleton import QtQml 2.2 - +import ColorsList 1.0 // ============================================================================= QtObject { - property int height: 312 - property int width: 450 - - property QtObject column: QtObject { - property int spacing: 24 - - property QtObject entry: QtObject { - property int iconSize: 24 - property int spacing: 10 - property int spacing2: 5 - } - } + property string sectionName: 'MultimediaParams' + property int height: 312 + property int width: 450 + + property QtObject column: QtObject { + property int spacing: 24 + + property QtObject entry: QtObject { + property int iconSize: 24 + property int spacing: 10 + property int spacing2: 5 + property QtObject speaker: QtObject { + property int iconSize: 30 + property string icon : 'speaker_on_custom' + property string name : 'speaker' + property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + } + property QtObject micro: QtObject { + property int iconSize: 30 + property string icon : 'micro_on_custom' + property string name : 'micro' + property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + } + property QtObject camera: QtObject { + property int iconSize: 30 + property string icon : 'camera_on_custom' + property string name : 'camera' + property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + } + } + } + } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml index 9f57db1e2..9ec53e2b6 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml @@ -7,10 +7,11 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 20 - - property QtObject activationSteps: QtObject { - property color color: ColorsList.add("ActivateApp_email_steps", "g").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'ActivateApp' + property int spacing: 20 + + property QtObject activationSteps: QtObject { + property color color: ColorsList.add(sectionName+'_email_steps', 'g').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml index 1aad8008a..fc8e857cc 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml @@ -7,10 +7,11 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int spacing: 20 - - property QtObject activationSteps: QtObject { - property color color: ColorsList.add("ActivateApp_phone_steps", "g").color - property int pointSize: Units.dp * 10 - } + property string sectionName: 'ActivateApp' + property int spacing: 20 + + property QtObject activationSteps: QtObject { + property color color: ColorsList.add(sectionName+'_phone_steps', 'g').color + property int pointSize: Units.dp * 10 + } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml index 30d79a7ce..1c97b4d6f 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml @@ -7,26 +7,27 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject buttons: QtObject { - property int spacing: 10 - } - - property QtObject content: QtObject { - property int height: 375 - property int width: 400 - } - - property QtObject info: QtObject { - property int spacing: 20 - - property QtObject description: QtObject { - property color color: ColorsList.add("Assistant_info_description", "g").color - property int pointSize: Units.dp * 11 - } - - property QtObject title: QtObject { - property color color: ColorsList.add("Assistant_info_title", "g").color - property int pointSize: Units.dp * 11 - } - } + property string sectionName: 'Assistant' + property QtObject buttons: QtObject { + property int spacing: 10 + } + + property QtObject content: QtObject { + property int height: 375 + property int width: 400 + } + + property QtObject info: QtObject { + property int spacing: 20 + + property QtObject description: QtObject { + property color color: ColorsList.add(sectionName+'_info_description', 'g').color + property int pointSize: Units.dp * 11 + } + + property QtObject title: QtObject { + property color color: ColorsList.add(sectionName+'_info_title', 'g').color + property int pointSize: Units.dp * 11 + } + } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml index c1445426d..ce4886150 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml @@ -7,26 +7,27 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject info: QtObject { - property int height: 245 - property int iconSize: 150 - - property QtObject description: QtObject { - property color color: ColorsList.add("Assistant_home_description", "g").color - property int pointSize: Units.dp * 10 - property int height: 40 - } - - property QtObject title: QtObject { - property color color: ColorsList.add("Assistant_home_title", "g").color - property int pointSize: Units.dp * 11 - property int height: 40 - } - } - - property QtObject buttons: QtObject { - property int height: 90 - property int maxWidth: 690 - property int spacing: 5 - } + property string sectionName: 'Assistant' + property QtObject info: QtObject { + property int height: 245 + property int iconSize: 150 + + property QtObject description: QtObject { + property color color: ColorsList.add(sectionName+'_home_description', 'g').color + property int pointSize: Units.dp * 10 + property int height: 40 + } + + property QtObject title: QtObject { + property color color: ColorsList.add(sectionName+'_home_title', 'g').color + property int pointSize: Units.dp * 11 + property int height: 40 + } + } + + property QtObject buttons: QtObject { + property int height: 90 + property int maxWidth: 690 + property int spacing: 5 + } } diff --git a/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml b/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml index 0c5f3a3b6..58317fb4a 100644 --- a/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml @@ -6,13 +6,14 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Assistant", "k").color - property int bottomMargin: 35 - property int leftMargin: 90 - property int rightMargin: 90 - property int topMargin: 50 - - property QtObject stackAnimation: QtObject { - property int duration: 400 - } + property string sectionName: 'Assistant' + property color color: ColorsList.add(sectionName, 'k').color + property int bottomMargin: 35 + property int leftMargin: 90 + property int rightMargin: 90 + property int topMargin: 50 + + property QtObject stackAnimation: QtObject { + property int duration: 400 + } } diff --git a/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml index db9521c47..52d9e8e0c 100644 --- a/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -7,59 +7,117 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject buttons: QtObject { - property int spacing: 20 - property int topMargin: 20 - } - - property QtObject bar: QtObject { - property color color: ColorsList.add("ContactEdit_bar", "e").color - property int avatarSize: 60 - property int height: 80 - property int leftMargin: 40 - property int rightMargin: 30 - property int spacing: 20 - - property QtObject actions: QtObject { - property int spacing: 40 - - property QtObject del: QtObject { - property int iconSize: 22 - } - - property QtObject edit: QtObject { - property int iconSize: 22 - } - - property QtObject history: QtObject { - property int iconSize: 40 - } - } - - property QtObject buttons: QtObject { - property int size: 40 - property int spacing: 20 - } - - property QtObject username: QtObject { - property color color: ColorsList.add("ContactEdit_username", "j").color - property int pointSize: Units.dp * 13 - } - } - - property QtObject content: QtObject { - property color color: ColorsList.add("ContactEdit_content", "k").color - } - - property QtObject values: QtObject { - property int bottomMargin: 20 - property int leftMargin: 40 - property int rightMargin: 20 - property int topMargin: 20 - - property QtObject separator: QtObject { - property color color: ColorsList.add("ContactEdit_separator", "f").color - property int height: 1 - } - } + property string sectionName: 'ContactEdit' + property QtObject buttons: QtObject { + property int spacing: 20 + property int topMargin: 20 + } + + property QtObject bar: QtObject { + property color color: ColorsList.add(sectionName+'_bar', 'e').color + property int avatarSize: 60 + property int height: 80 + property int leftMargin: 40 + property int rightMargin: 30 + property int spacing: 20 + + property QtObject actions: QtObject { + property int spacing: 40 + + property QtObject del: QtObject { + property int iconSize: 36 + property QtObject colorSet: QtObject { + property int iconSize: 36 + property string name : 'delete' + property string icon : 'contact_delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + } + + property QtObject edit: QtObject { + property int iconSize: 36 + property QtObject colorSet: QtObject { + property int iconSize: 36 + property string name : 'edit' + property string icon : 'contact_edit_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + } + + property QtObject history: QtObject { + property int iconSize: 40 + } + } + property QtObject avatarTakePicture: QtObject { + property int iconSize: 60 + property string icon : 'contact_card_photo_custom' + property string name : 'avatarTakePicture' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color + property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color + property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject buttons: QtObject { + property int size: 40 + property int spacing: 20 + } + + property QtObject username: QtObject { + property color color: ColorsList.add(sectionName+'_username', 'j').color + property int pointSize: Units.dp * 13 + } + } + + property QtObject content: QtObject { + property color color: ColorsList.add(sectionName+'_content', 'k').color + } + + property QtObject values: QtObject { + property int bottomMargin: 20 + property int leftMargin: 40 + property int rightMargin: 20 + property int topMargin: 20 + + property QtObject separator: QtObject { + property color color: ColorsList.add(sectionName+'_separator', 'f').color + property int height: 1 + } + } + property QtObject chat: QtObject { + property int iconSize: 40 + property string name : 'chat' + property string icon : 'chat_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject history: QtObject { + property int iconSize: 40 + property string icon : 'history_custom' + property string name : 'history' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml index 3626b3503..e040be43d 100644 --- a/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml @@ -7,50 +7,110 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color backgroundColor: ColorsList.add("Contacts_background", "k").color - property int spacing: 20 - - property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add("Contacts_bar_background", "e").color - property int height: 60 - property int leftMargin: 18 - property int rightMargin: 18 - } - - property QtObject contact: QtObject { - property int actionButtonsSize: 36 - property int avatarSize: 30 - property int deleteButtonSize: 22 - property int height: 50 - property int leftMargin: 40 - property int presenceLevelSize: 12 - property int rightMargin: 25 - property int spacing: 15 - - property QtObject backgroundColor: QtObject { - property color normal: ColorsList.add("Contacts_contact_background_normal", "k").color - property color hovered: ColorsList.add("Contacts_contact_background_hovered", "g10").color - } - - property QtObject border: QtObject { - property color color: ColorsList.add("Contacts_contact_border", "f").color - property int width: 1 - } - - property QtObject indicator: QtObject { - property color color: ColorsList.add("Contacts_contact_indicator", "i").color - property int width: 5 - } - - property QtObject presence: QtObject { - property int pointSize: Units.dp * 10 - property color color: ColorsList.add("Contacts_contact_presence", "n").color - } - - property QtObject username: QtObject { - property color color: ColorsList.add("Contacts_contact_username", "j").color - property int pointSize: Units.dp * 10 - property int width: 220 - } - } + property string sectionName: 'Contacts' + property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color + property int spacing: 20 + + property QtObject filter: QtObject { + property string icon: 'filter_custom' + property color color: ColorsList.add(sectionName+'_filter_icon', 'c').color + } + property QtObject bar: QtObject { + property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color + property int height: 60 + property int leftMargin: 18 + property int rightMargin: 18 + } + + property QtObject contact: QtObject { + property int actionButtonsSize: 36 + property int avatarSize: 30 + property int deleteButtonSize: 22 + property int height: 50 + property int leftMargin: 40 + property int presenceLevelSize: 12 + property int rightMargin: 25 + property int spacing: 15 + + property QtObject backgroundColor: QtObject { + property color normal: ColorsList.add(sectionName+'_contact_bg_n', 'k').color + property color hovered: ColorsList.add(sectionName+'_contact_bg_h', 'g10').color + } + + property QtObject border: QtObject { + property color color: ColorsList.add(sectionName+'_contact_border', 'f').color + property int width: 1 + } + + property QtObject indicator: QtObject { + property color color: ColorsList.add(sectionName+'_contact_indicator', 'i').color + property int width: 5 + } + + property QtObject presence: QtObject { + property int pointSize: Units.dp * 10 + property color color: ColorsList.add(sectionName+'_contact_presence', 'n').color + } + + property QtObject username: QtObject { + property color color: ColorsList.add(sectionName+'_contact_username', 'j').color + property int pointSize: Units.dp * 10 + property int width: 220 + } + } + property QtObject videoCall: QtObject { + property int iconSize: 36 + property string name : 'videoCall' + property string icon : 'video_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject call: QtObject { + property int iconSize: 36 + property string name : 'call' + property string icon : 'call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject chat: QtObject { + property int iconSize: 36 + property string name : 'chat' + property string icon : 'chat_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject history: QtObject { + property int iconSize: 36 + property string icon : 'history_custom' + property string name : 'history' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject deleteAction: QtObject { + property int iconSize: 36 + property string name : 'delete' + property string icon : 'contact_delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml index c3538098d..5dba895f1 100644 --- a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml @@ -8,44 +8,144 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName : 'Conversation' property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add("Conversation_bar_background", "e").color + property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color + property color searchIconColor: ColorsList.add(sectionName+'_bar_search', 'c').color property int avatarSize: 60 - property int groupChatSize: 55 + property int groupChatSize: 80 + property string groupChatIcon: 'chat_room_custom' + property color groupChatColor: ColorsList.add(sectionName+'_bar_groupChat', 'g').color + property int height: 80 property int leftMargin: 40 property int rightMargin: 10 property int spacing: 20 + property QtObject status: QtObject { + property string adminStatusIcon: 'admin_selected_custom' + property int adminStatusIconSize: 24 + property color adminStatusColor: ColorsList.add(sectionName+'_bar_status', 's').color + property color adminTextColor : ColorsList.add(sectionName+'_description_admin_status', 'af').color + } + property QtObject actions: QtObject { property int spacing: 20 property QtObject call: QtObject { property int iconSize: 40 + property string name : 'call' + property string icon : 'call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject chat: QtObject { + property int iconSize: 40 + property string name : 'chat' + property string icon : 'chat_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject groupChat: QtObject { + property int iconSize: 40 + property string name : 'groupChat' + property string icon : 'group_chat_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + + property QtObject videoCall: QtObject { + property int iconSize: 40 + property string name : 'videoCall' + property string icon : 'video_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color } property QtObject del: QtObject { - property int iconSize: 22 + property int iconSize: 40 + property QtObject deleteHistory: QtObject { + property int iconSize: 40 + property string name : 'deleteHistory' + property string icon : 'delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } } property QtObject edit: QtObject { - property int iconSize: 22 + property int iconSize: 40 + property QtObject addContact: QtObject { + property int iconSize: 40 + property string name : 'addContact' + property string icon : 'contact_add_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } + property QtObject viewContact: QtObject { + property int iconSize: 40 + property string name : 'viewContact' + property string icon : 'contact_view_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } } + property QtObject openMenu: QtObject { + property int iconSize: 40 + property string name : 'other' + property string icon : 'menu_vdots_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } } property QtObject contactDescription : QtObject { property QtObject sipAddress: QtObject { - property color color: ColorsList.add("Conversation_description_sipAddress", "n").color + property color color: ColorsList.add(sectionName+'_description_sipAddress', 'n').color property int pointSize: Units.dp * 10 property int weight: Font.Light } property QtObject username: QtObject { - property color color: ColorsList.add("Conversation_description_username", "j").color + property color color: ColorsList.add(sectionName+'_description_username', 'j').color property int pointSize: Units.dp * 11 property int weight: Font.Normal property QtObject status : QtObject{ - property color color : ColorsList.add("Conversation_description_username_status", "g").color + property color color : ColorsList.add(sectionName+'_description_username_status', 'g').color property int pointSize : Units.dp * 9 } } @@ -53,16 +153,19 @@ QtObject { } property QtObject filters: QtObject { - property color backgroundColor: ColorsList.add("Conversation_filters_background", "q").color + property color backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q').color + property color iconColor: ColorsList.add(sectionName+'_filters_icon', 'c').color property int height: 51 property int leftMargin: 40 property QtObject border: QtObject { - property color color: ColorsList.add("Conversation_filters_border", "g10").color + property color color: ColorsList.add(sectionName+'_filters_border', 'g10').color property int bottomWidth: 1 property int topWidth: 0 } } - + property QtObject menu: QtObject{ + property color separatorColor: ColorsList.add(sectionName+'_separator', 'u').color + } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml index 9946844c1..eff569be8 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml @@ -7,6 +7,7 @@ import Units 1.0 // ============================================================================= QtObject { + property string sectionName: 'About' property int height: 225 property int spacing: 20 property int width: 400 @@ -15,12 +16,12 @@ QtObject { property int spacing: 10 property QtObject license: QtObject { - property color color: ColorsList.add("About_license", "d").color + property color color: ColorsList.add(sectionName+'_license', 'd').color property int pointSize: Units.dp * 10 } property QtObject url: QtObject { - property color color: ColorsList.add("About_url", "i").color + property color color: ColorsList.add(sectionName+'_url', 'i').color property int pointSize: Units.dp * 10 } } @@ -30,12 +31,12 @@ QtObject { property int spacing: 10 property QtObject appVersion: QtObject { - property color color: ColorsList.add("About_appVersion", "d").color + property color color: ColorsList.add(sectionName+'_appVersion', 'd').color property int pointSize: Units.dp * 10 } property QtObject coreVersion: QtObject { - property color color: ColorsList.add("About_coreVersion", "d").color + property color color: ColorsList.add(sectionName+'_coreVersion', 'd').color property int pointSize: Units.dp * 10 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml index bbd4f2348..a285e3a68 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml @@ -7,6 +7,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'EphemeralChatRoom' property int height: 320 property int width: 450 @@ -18,16 +19,18 @@ QtObject { } property QtObject timer: QtObject { - property int iconSize: 40 - property int preferredHeight: 50 - property int preferredWidth: 50 + property int iconSize: 60 + property int preferredHeight: 60 + property int preferredWidth: 60 + property string icon: 'timer_custom' + property color timerColor: ColorsList.addImageColor(sectionName+'_timer', icon, 'ad').color } property QtObject descriptionText: QtObject { property int preferredWidth: 200 property int leftMargin: 10 property int rightMargin: 10 property real pointSize: Units.dp * 11 - property color color: ColorsList.add("Ephemeral_popup_description", "d").color + property color color: ColorsList.add(sectionName+'_popup_description', 'd').color } property QtObject timerPicker: QtObject { property int preferredWidth: 150 diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml index 8859ea12a..5e6898d7f 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml @@ -7,6 +7,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'InfoChatRoom' property int height: 500 property int width: 450 @@ -23,11 +24,11 @@ QtObject { property QtObject results : QtObject{ property int topMargin : 10 - property color color : ColorsList.add("InfoChatRoom_results", "g").color + property color color : ColorsList.add(sectionName+'_results', 'g').color property QtObject title : QtObject{ property int topMargin: 10 property int leftMargin: 20 - property color color: ColorsList.add("InfoChatRoom_results_title", "j").color + property color color: ColorsList.add(sectionName+'_results_title', 'j').color property int pointSize : Units.dp * 11 property int weight : Font.DemiBold } @@ -43,23 +44,45 @@ QtObject { property QtObject leaveButton : QtObject { property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add("InfoChatRoom_leave_background_disabled", "o").color - property color hovered: ColorsList.add("InfoChatRoom_leave_background_hovered", "j").color - property color normal: ColorsList.add("InfoChatRoom_leave_background_normal", "k").color - property color pressed: ColorsList.add("InfoChatRoom_leave_background_pressed", "i").color + property color disabled: ColorsList.add(sectionName+'_leave_bg_d', 'o').color + property color hovered: ColorsList.add(sectionName+'_leave_bg_h', 'j').color + property color normal: ColorsList.add(sectionName+'_leave_bg_n', 'k').color + property color pressed: ColorsList.add(sectionName+'_leave_bg_p', 'i').color } property QtObject textColor: QtObject { - property color disabled: ColorsList.add("InfoChatRoom_leave_text_disabled", "q").color - property color hovered: ColorsList.add("InfoChatRoom_leave_text_hovered", "q").color - property color normal: ColorsList.add("InfoChatRoom_leave_text_normal", "i").color - property color pressed: ColorsList.add("InfoChatRoom_leave_text_pressed", "q").color + property color disabled: ColorsList.add(sectionName+'_leave_text_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_leave_text_h', 'q').color + property color normal: ColorsList.add(sectionName+'_leave_text_n', 'i').color + property color pressed: ColorsList.add(sectionName+'_leave_text_p', 'q').color } property QtObject borderColor : QtObject{ - property color disabled: ColorsList.add("InfoChatRoom_leave_border_disabled", "q").color - property color hovered: ColorsList.add("InfoChatRoom_leave_border_hovered", "q").color - property color normal: ColorsList.add("InfoChatRoom_leave_border_normal", "i").color - property color pressed: ColorsList.add("InfoChatRoom_leave_border_pressed", "q").color + property color disabled: ColorsList.add(sectionName+'_leave_border_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_leave_border_h', 'q').color + property color normal: ColorsList.add(sectionName+'_leave_border_n', 'i').color + property color pressed: ColorsList.add(sectionName+'_leave_border_p', 'q').color } } + property QtObject addParticipant: QtObject { + property int iconSize: 30 + property string name : 'addParticipant' + property string icon : 'add_participant_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } + property QtObject removeParticipant: QtObject { + property int iconSize: 30 + property string name : 'removeParticipant' + property string icon : 'remove_participant_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml index 32fdd57db..96a3c6b8c 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml @@ -9,6 +9,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'InfoEncryption' property int height: 353 property int width: 450 @@ -21,17 +22,17 @@ QtObject { property QtObject okButton : QtObject{ property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add("InfoEncryption_ok_background_disabled", "i30").color - property color hovered: ColorsList.add("InfoEncryption_ok_background_hovered", "b").color - property color normal: ColorsList.add("InfoEncryption_ok_background_normal", "s").color - property color pressed: ColorsList.add("InfoEncryption_ok_background_pressed", "m").color + property color disabled: ColorsList.add(sectionName+'_ok_bg_d', 'i30').color + property color hovered: ColorsList.add(sectionName+'_ok_bg_h', 'b').color + property color normal: ColorsList.add(sectionName+'_ok_bg_n', 's').color + property color pressed: ColorsList.add(sectionName+'_ok_bg_p', 'm').color } property QtObject textColor: QtObject { - property color disabled: ColorsList.add("InfoEncryption_ok_text_disabled", "q").color - property color hovered: ColorsList.add("InfoEncryption_ok_text_hovered", "q").color - property color normal: ColorsList.add("InfoEncryption_ok_text_normal", "q").color - property color pressed: ColorsList.add("InfoEncryption_ok_text_pressed", "q").color + property color disabled: ColorsList.add(sectionName+'_ok_text_d', 'q').color + property color hovered: ColorsList.add(sectionName+'_ok_text_h', 'q').color + property color normal: ColorsList.add(sectionName+'_ok_text_n', 'q').color + property color pressed: ColorsList.add(sectionName+'_ok_text_p', 'q').color } } @@ -45,6 +46,6 @@ QtObject { property int leftMargin: 10 property int rightMargin: 10 property real pointSize: Units.dp * 11 - property color color: ColorsList.add("InfoEncryption_description", "d").color + property color color: ColorsList.add(sectionName+'_description', 'd').color } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml index af55f0346..d0949fe5b 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml @@ -1,9 +1,11 @@ pragma Singleton import QtQml 2.2 +import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'ManageAccounts' property int height: 383 property int heightWithoutPresence: 314 property int width: 450 @@ -11,4 +13,15 @@ QtObject { property QtObject accountSelector: QtObject { property int height: 176 } + property QtObject options: QtObject { + property int iconSize: 30 + property string icon : 'options_custom' + property string name : 'options' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml new file mode 100644 index 000000000..f82b5a93d --- /dev/null +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml @@ -0,0 +1,43 @@ +pragma Singleton +import QtQml 2.2 +import QtQuick 2.7 + +import Units 1.0 +import ColorsList 1.0 + +// ============================================================================= +QtObject { + property string sectionName: 'NewChatRoom' + + property color askEncryptionColor: ColorsList.add(sectionName+'_ask_encryption', 'g').color + property color subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g').color + property color recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g').color + property color recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g').color + property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'l').color + property color addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g').color + property color requiredColor: ColorsList.add(sectionName+'_required_text', 'g').color + + + property QtObject addParticipant: QtObject { + property int iconSize: 30 + property string name : 'addParticipant' + property string icon : 'add_participant_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } + property QtObject removeParticipant: QtObject { + property int iconSize: 30 + property string name : 'removeParticipant' + property string icon : 'remove_participant_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } +} \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml new file mode 100644 index 000000000..a35e3085a --- /dev/null +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml @@ -0,0 +1,36 @@ +pragma Singleton +import QtQml 2.2 +import QtQuick 2.7 + +import Units 1.0 +import ColorsList 1.0 + +// ============================================================================= +QtObject { + property string sectionName: 'ParticipantsDevices' + property color lineBackgroundColor: ColorsList.add(sectionName+'_line_bg', 'ah').color + property color lineSeparatorColor: ColorsList.add(sectionName+'_separator', 'ag').color + + property QtObject collapsed: QtObject { + property int iconSize: 30 + property string name : 'collapsed' + property string icon : 'collapsed_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } + property QtObject expanded: QtObject { + property int iconSize: 30 + property string name : 'expanded' + property string icon : 'expanded_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color + } +} \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml b/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml index 2042d9a38..c6134dd4c 100644 --- a/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml @@ -5,8 +5,9 @@ import ColorsList 1.0 // ============================================================================= QtObject { + property string sectionName: 'HistoryView' property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add("HistoryView_bar_background", "e").color + property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color property int avatarSize: 60 property int height: 80 property int leftMargin: 40 @@ -30,20 +31,53 @@ QtObject { } property QtObject description: QtObject { - property color sipAddressColor: ColorsList.add("HistoryView_bar_description_sipAddress", "g").color - property color usernameColor: ColorsList.add("HistoryView_bar_description_username", "j").color + property color sipAddressColor: ColorsList.add(sectionName+'_bar_description_sipAddress', 'g').color + property color usernameColor: ColorsList.add(sectionName+'_bar_description_username', 'j').color } } property QtObject filters: QtObject { - property color backgroundColor: ColorsList.add("HistoryView_filters_background", "q").color + property color backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q').color property int height: 51 property int leftMargin: 40 property QtObject border: QtObject { - property color color: ColorsList.add("HistoryView_filters_border", "g10").color + property color color: ColorsList.add(sectionName+'_filters_border', 'g10').color property int bottomWidth: 1 property int topWidth: 0 } } + property QtObject videoCall: QtObject { + property int iconSize: 40 + property string name : 'videoCall' + property string icon : 'video_call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject call: QtObject { + property int iconSize: 40 + property string name : 'call' + property string icon : 'call_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject deleteAction: QtObject { + property int iconSize: 22 + property string name : 'delete' + property string icon : 'delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml index e4a1aa981..746c47472 100644 --- a/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml @@ -5,6 +5,7 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Home_background", "k").color - property int spacing: 20 + property string sectionName: 'Home' + property color color: ColorsList.add(sectionName+'_bg', 'k').color + property int spacing: 20 } diff --git a/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml b/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml index 5b5d80053..77f92cf55 100644 --- a/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml @@ -6,15 +6,16 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("InviteFriends_background", "k").color - property int width: 400 - - property QtObject message: QtObject { - property int height: 140 - } - - property QtObject buttons: QtObject { - property int bottomMargin: 35 - property int spacing: 10 - } + property string sectionName: 'InviteFriends' + property color color: ColorsList.add(sectionName+'_bg', 'k').color + property int width: 400 + + property QtObject message: QtObject { + property int height: 140 + } + + property QtObject buttons: QtObject { + property int bottomMargin: 35 + property int spacing: 10 + } } diff --git a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml index 767779360..b22ee0efb 100644 --- a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml @@ -7,45 +7,108 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property int menuBurgerSize: 16 - property int newConferenceSize: 40 - property int minimumHeight: 610 - property int minimumWidth: 950 - property int width: 950 - property int panelButtonSize : 20 - property int homeButtonSize: 40 - - property QtObject accountStatus: QtObject { - property int width: 200 - } - - property QtObject autoAnswerStatus: QtObject { - property int iconSize: 16 - property int width: 28 - - property QtObject text: QtObject { - property int pointSize: Units.dp * 8 - property color color: ColorsList.add("MainWindow_auto_answer_text", "i").color - } - } - - property QtObject menu: QtObject { - property int height: 50 - property int width: 250 - } - - property QtObject searchBox: QtObject { - property int maxHeight: 300 // See Hick's law for good choice. - } - - property QtObject toolBar: QtObject { - property int height: 70 - property int leftMargin: 18 - property int rightMargin: 18 - property int spacing: 16 - - property var background: Rectangle { - color: ColorsList.add("MainWindow_toolbar_background", "f").color - } - } + property string sectionName : 'MainWindow' + property int menuBurgerSize: 40 + property int newConferenceSize: 40 + property int minimumHeight: 610 + property int minimumWidth: 950 + property int width: 950 + property int panelButtonSize : 20 + property int homeButtonSize: 40 + + property QtObject accountStatus: QtObject { + property int width: 200 + } + + property QtObject autoAnswerStatus: QtObject { + property int iconSize: 16 + property int width: 28 + + property QtObject text: QtObject { + property int pointSize: Units.dp * 8 + property color color: ColorsList.add(sectionName+'_auto_answer_text', 'i').color + } + } + + property QtObject menu: QtObject { + property int height: 50 + property int width: 250 + + property QtObject direction: QtObject { + property string icon: 'panel_arrow_custom' + property int iconSize: 30 + } + property QtObject contacts: QtObject { + property string icon: 'contact_custom' + property int iconSize: 50 + property color color: ColorsList.add(sectionName+'_me_contacts', 'me_n_b_inv_fg').color + property color selectedColor: ColorsList.add(sectionName+'_me_contacts_c', 'me_p_b_inv_fg').color + } + /* + property string conferencesIcon: 'conference' + property color conferencesColor: ColorsList.add(sectionName+'_me_confs', 'me_n_b_inv_fg').color + property color conferencesSelectedColor: ColorsList.add(sectionName+'_me_confs_selected', 'me_p_b_inv_fg').color*/ + + } + + property QtObject searchBox: QtObject { + property int maxHeight: 300 // See Hick's law for good choice. + } + + property QtObject toolBar: QtObject { + property int height: 70 + property int leftMargin: 18 + property int rightMargin: 18 + property int spacing: 16 + + property var background: Rectangle { + color: ColorsList.add(sectionName+'_toolbar_bg', 'f').color + } + } + property QtObject buttons: QtObject { + property QtObject home: QtObject { + property int iconSize: 40 + property string name : 'home' + property string icon : 'home_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + } + property QtObject newChatGroup: QtObject { + property int iconSize: 40 + property string name : 'newChatGroup' + property string icon : 'new_chat_group_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + } + property QtObject newConference: QtObject { + property int iconSize: 40 + property string name : 'newConference' + property string icon : 'new_conference_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + } + property QtObject burgerMenu: QtObject { + property int iconSize: 40 + property string name : 'burgerMenu' + property string icon : 'burger_menu_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml index 248c7d17f..bf15391de 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml @@ -6,20 +6,54 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject buttons: QtObject { - property int spacing: 10 - } - - property QtObject error: QtObject { - property color color: ColorsList.add("SettingsAdvanced_error", "error").color - } - property QtObject info: QtObject { - property color color: ColorsList.add("SettingsAdvanced_info", "j").color - property int pointSize: Units.dp * 11 - } - property QtObject lists: QtObject { - property int spacing: 20 - property real iconScale : 0.8 - property int margin: 10 - } + property string sectionName : 'SettingsAdvanced' + property QtObject buttons: QtObject { + property int spacing: 10 + } + + property QtObject error: QtObject { + property color color: ColorsList.add(sectionName+'_error', 'error').color + } + property QtObject info: QtObject { + property color color: ColorsList.add(sectionName+'_info', 'j').color + property int pointSize: Units.dp * 11 + } + property QtObject lists: QtObject { + property int spacing: 20 + property real iconScale : 0.8 + property int margin: 10 + } + property QtObject add: QtObject { + property int iconSize: 35 + property string name : 'add' + property string icon : 'add_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject cancel: QtObject { + property int iconSize: 35 + property string icon : 'cancel_custom' + property string name : 'cancel' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } + property QtObject options: QtObject { + property int iconSize: 35 + property string icon : 'options_custom' + property string name : 'options' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml index a7145c284..90ad0f672 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml @@ -1,13 +1,45 @@ pragma Singleton import QtQml 2.2 - +import ColorsList 1.0 // ============================================================================= QtObject { - property QtObject ringPlayer: QtObject { - property int leftMargin: 10 - } - property QtObject warningMessage: QtObject { - property int iconSize: 20 - } + property string sectionName: 'SettingsAudio' + + property color sliderBackgroundColor: ColorsList.add(sectionName+'_slider_bg', 'slider_bg').color + property color sliderHighColor: ColorsList.add(sectionName+'_slider_high', 'slider_high').color + property color sliderLowColor: ColorsList.add(sectionName+'_slider_low', 'slider_low').color + + property QtObject ringPlayer: QtObject { + property int leftMargin: 10 + } + property QtObject warningMessage: QtObject { + property int iconSize: 20 + } + property QtObject pause: QtObject { + property int iconSize: 40 + property string icon : 'pause_custom' + property string name : 'pause' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } + property QtObject play: QtObject { + property int iconSize: 40 + property string icon : 'play_custom' + property string name : 'play' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml new file mode 100644 index 000000000..75fdeaf01 --- /dev/null +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml @@ -0,0 +1,21 @@ +pragma Singleton +import QtQml 2.2 + +import Units 1.0 +import ColorsList 1.0 +// ============================================================================= + +QtObject { + property string sectionName : 'SettingsUi' + property QtObject options: QtObject { + property int iconSize: 25 + property string icon : 'options_custom' + property string name : 'options' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + } +} diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml index 0a3d113ac..1d463f6c3 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml @@ -6,28 +6,53 @@ import ColorsList 1.0 // ============================================================================= QtObject { - property color color: ColorsList.add("Settings_background", "k").color - property int height: 640 - property int width: 1024 - - property QtObject forms: QtObject { - property int spacing: 10 - } - - property QtObject validButton: QtObject { - property int bottomMargin: 30 - property int rightMargin: 30 - property int topMargin: 30 - } - - property QtObject sipAccounts: QtObject { - property int buttonsSpacing: 8 - property int iconSize: 22 - property int legendLineWidth: 280 - } - property QtObject video: QtObject { - property QtObject warningMessage: QtObject { - property int iconSize: 20 - } - } + property string sectionName: 'SettingsWindow' + property color color: ColorsList.add(sectionName+'_bg', 'k').color + property int height: 640 + property int width: 1024 + + property QtObject forms: QtObject { + property int spacing: 10 + } + + property QtObject validButton: QtObject { + property int bottomMargin: 30 + property int rightMargin: 30 + property int topMargin: 30 + } + + property QtObject sipAccounts: QtObject { + property int buttonsSpacing: 8 + property int iconSize: 22 + property int legendLineWidth: 280 + } + property QtObject video: QtObject { + property QtObject warningMessage: QtObject { + property int iconSize: 20 + } + } + property QtObject buttons: QtObject { + property QtObject editProxy: QtObject { + property int iconSize: 36 + property string name : 'editProxy' + property string icon : 'edit_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + property QtObject deleteProxy: QtObject { + property int iconSize: 36 + property string name : 'deleteProxy' + property string icon : 'delete_custom' + property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color + property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color + property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color + property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color + property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color + property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color + } + } } diff --git a/linphone-app/ui/views/App/Styles/qmldir b/linphone-app/ui/views/App/Styles/qmldir index 7b90951e0..9e0dd7975 100644 --- a/linphone-app/ui/views/App/Styles/qmldir +++ b/linphone-app/ui/views/App/Styles/qmldir @@ -6,6 +6,7 @@ module App.Styles # Calls Window ----------------------------------------------------------------- +singleton CallFullscreenStyle 1.0 Calls/CallFullscreenStyle.qml singleton CallStyle 1.0 Calls/CallStyle.qml singleton CallsWindowStyle 1.0 Calls/CallsWindowStyle.qml singleton ConferenceStyle 1.0 Calls/ConferenceStyle.qml @@ -36,15 +37,18 @@ singleton MainWindowStyle 1.0 Main/MainWindowStyl singleton AboutStyle 1.0 Main/Dialogs/AboutStyle.qml singleton AuthenticationRequestStyle 1.0 Main/Dialogs/AuthenticationRequestStyle.qml singleton EphemeralChatRoomStyle 1.0 Main/Dialogs/EphemeralChatRoomStyle.qml -singleton ManageAccountsStyle 1.0 Main/Dialogs/ManageAccountsStyle.qml singleton InfoChatRoomStyle 1.0 Main/Dialogs/InfoChatRoomStyle.qml singleton InfoEncryptionStyle 1.0 Main/Dialogs/InfoEncryptionStyle.qml +singleton ManageAccountsStyle 1.0 Main/Dialogs/ManageAccountsStyle.qml +singleton NewChatRoomStyle 1.0 Main/Dialogs/NewChatRoomStyle.qml +singleton ParticipantsDevicesStyle 1.0 Main/Dialogs/ParticipantsDevicesStyle.qml # Settings Window -------------------------------------------------------------- singleton SettingsAdvancedStyle 1.0 Settings/SettingsAdvancedStyle.qml singleton SettingsAudioStyle 1.0 Settings/SettingsAudioStyle.qml +singleton SettingsUiStyle 1.0 Settings/SettingsUiStyle.qml singleton SettingsWindowStyle 1.0 Settings/SettingsWindowStyle.qml singleton SettingsSipAccountsEditStyle 1.0 Settings/Dialogs/SettingsSipAccountsEditStyle.qml diff --git a/linphone-sdk b/linphone-sdk index 199426572..1fe0f0721 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 199426572fa9517c44c74f6e77ec63c449eee575 +Subproject commit 1fe0f0721c991221b8ebdb61c9223c88e3ddd2b4