packaging: add fedora 39, ubuntu 23.10

Change-Id: I2da6a821b25c3a5ae26ba8f59f3dc8b6656751b5

CMakeLists.txt

@@ -74,16 +74,19 @@ set(TESTS_DIR ${PROJECT_SOURCE_DIR}/tests)
 # Here we let find_package(<PackageName>...) try to find Qt 6,
 # If it is found, find_package will succeed, and the CMake variable
 # QT_VERSION_MAJOR will be defined 6.
+set(QT6_MINVER_MINOR 4)
 if(QT6_VER AND QT6_PATH)
   find_package(QT NAMES Qt6 REQUIRED
     PATHS ${QT6_PATH} NO_DEFAULT_PATH)
 else()
+  message(STATUS "Looking for Qt 6" ${CMAKE_PREFIX_PATH})
   find_package(QT NAMES Qt6 REQUIRED)
 endif()
-if (${QT_VERSION_MAJOR} STRLESS 6)
-  if (${QT_VERSION_MINOR} STRLESS 4)
-    message(FATAL_ERROR "Qt 6.4 or higher is required.")
-  endif()
+if (${QT_VERSION_MINOR} GREATER_EQUAL ${QT6_MINVER_MINOR})
+  # Qt version is 6.4 or higher
+  message(STATUS "Found a suitable Qt version ${QT_VERSION}")
+else()
+  message(FATAL_ERROR "Qt 6.4 or higher is required. Found ${QT_VERSION}")
 endif()
 
 if(MSVC)

build.py

@@ -416,6 +416,11 @@ def run_install(args):
 
     command = ['extras/scripts/install.sh'] + install_args
 
+    if 'TARBALLS' not in os.environ:
+        print('info: consider setting the TARBALLS environment variable '
+              'to a stable writable location to avoid loosing '
+              'cached tarballs')
+
     if args.distribution == 'guix':
         if args.global_install:
             print('error: global install is not supported when using Guix.')
@@ -425,10 +430,6 @@ def run_install(args):
         if 'TARBALLS' in os.environ:
             share_tarballs_args = ['--preserve=TARBALLS',
                                    f'--share={os.environ["TARBALLS"]}']
-        else:
-            print('info: consider setting the TARBALLS environment variable '
-                  'to a stable writable location to avoid loosing '
-                  'cached tarballs')
         command = ['guix', 'shell', f'--manifest={GUIX_MANIFEST}',
                    '--symlink=/usr/bin/env=bin/env',
                    '--symlink=/etc/ssl/certs=etc/ssl/certs',

extras/packaging/gnu-linux/Makefile

@@ -49,7 +49,7 @@ QT_MAJOR := 6
 QT_MINOR := 4
 QT_PATCH := 3
 QT_TARBALL_CHECKSUM := 29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-2
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-3
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami
 
@@ -166,10 +166,11 @@ DISTRIBUTIONS := \
 	debian_unstable \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
-	ubuntu_22.10 \
 	ubuntu_23.04 \
+	ubuntu_23.10 \
 	fedora_37 \
 	fedora_38 \
+	fedora_39 \
 	opensuse-leap_15.4 \
 	snap
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_39

@@ -0,0 +1,105 @@
+FROM fedora:39
+
+RUN dnf clean all
+RUN dnf update -y
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf groupinstall -y "X Software Development"
+
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3-html5lib \
+        cups-devel \
+        python-six
+
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+
+CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10

@@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.10
 
 ENV DEBIAN_FRONTEND=noninteractive
 

extras/packaging/gnu-linux/rules/debian-qt/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/debian-qt/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/debian-qt/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/rules/debian-qt/patches/series

@@ -1,2 +1,5 @@
 0001-fix-gcc13.patch
-0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+0003-fix-mathops.patch
+0004-fix-binary-tokenizer.patch
+0005-importlib.patch

extras/packaging/gnu-linux/rules/debian/jami-all.postinst

@@ -99,10 +99,10 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_20.04"
     elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
         ENDTAG="ubuntu_22.04"
-    elif [ "${UBUNTU_CODENAME}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then
-        ENDTAG="ubuntu_22.10"
     elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then
         ENDTAG="ubuntu_23.04"
+    elif [ "${UBUNTU_CODENAME}" = "mantic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.10" ]; then
+        ENDTAG="ubuntu_23.10"
     elif [ "${ID}" = "debian" ] && \
              [ "$(command -v lsb_release)" ] && \
              [ "$(lsb_release -rs)" = "testing" ]; then

extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec

@@ -28,6 +28,9 @@ URL:           https://jami.net/
 Source:        jami-libqt-%{version}.tar.xz
 Patch0:        0001-fix-gcc13.patch
 Patch1:        0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+Patch2:        0003-fix-mathops.patch
+Patch3:        0004-fix-binary-tokenizer.patch
+Patch4:        0005-importlib.patch
 
 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -42,6 +45,7 @@ BuildRequires: bison
 BuildRequires: gperf
 BuildRequires: flex
 BuildRequires: vulkan-devel
+BuildRequires: python-six
 %if %{defined suse_version}
 BuildRequires: ffmpeg-devel
 BuildRequires: ffmpeg
@@ -64,6 +68,9 @@ This package contains Qt libraries for Jami.
 %setup -n qt-everywhere-src-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 echo "Building Qt using %{job_count} parallel jobs"

extras/packaging/gnu-linux/rules/rpm/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/rpm/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/scripts/build-package-rpm.sh

@@ -46,7 +46,7 @@ CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}"
 QT_MAJOR=6
 QT_MINOR=4
 QT_PATCH=3
-QT_RELEASE_PATCH=2
+QT_RELEASE_PATCH=3
 
 QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR}
 QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
@@ -105,18 +105,14 @@ if [ ! -f "${RPM_PATH}" ]; then
         # Cache the built Qt RPM package.
         if [[ "${DISTRIBUTION:0:4}" == "rhel" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el8.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_33" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc33.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_34" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc34.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_35" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_38" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.x86_64.rpm "${RPM_PATH}"
         else
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
         fi

extras/packaging/gnu-linux/scripts/deploy-packages.sh

@@ -272,7 +272,7 @@ function package()
 {
     if [[ $DISTRIBUTION =~ debian|ubuntu|raspbian|guix-deb-pack ]]; then
         package_deb
-    elif [[ $DISTRIBUTION =~ fedora|rhel|opensuse|guix-rpm-pack ]]; then
+    elif [[ $DISTRIBUTION =~ alma|fedora|rhel|opensuse|guix-rpm-pack ]]; then
         package_rpm
     elif [[ $DISTRIBUTION =~ snap ]]; then
         package_snap

extras/scripts/install.sh

@@ -125,6 +125,8 @@ else
       if [[ "$OSTYPE" != "darwin"* ]]; then
         CONFIGURE_FLAGS+=" --disable-shared"
       fi
+    else
+      CONFIGURE_FLAGS+="--without-dbus"
     fi
 
     BUILD_TYPE="Release"

resources/icons/Icon_Donate.svg

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="43" height="52.655" viewBox="0 0 43 52.655">
+  <defs>
+    <clipPath id="clip-path">
+      <rect id="Rectangle_268" data-name="Rectangle 268" width="38" height="24" transform="translate(-0.407 0.083)" fill="#fff" stroke="#707070" stroke-width="1"/>
+    </clipPath>
+  </defs>
+  <g id="Icon_Donate" transform="translate(-22 -189.345)">
+    <rect id="Rectangle_267" data-name="Rectangle 267" width="43" height="10" rx="5" transform="translate(22 232)" fill="#9eb3c3"/>
+    <path id="Path_459" data-name="Path 459" d="M9.674,17.083,8.562,16.07C4.609,12.486,2,10.122,2,7.221A4.18,4.18,0,0,1,6.221,3,4.6,4.6,0,0,1,9.674,4.6,4.6,4.6,0,0,1,13.128,3a4.18,4.18,0,0,1,4.221,4.221c0,2.9-2.609,5.265-6.562,8.856Z" transform="translate(22.407 199.828)" fill="#ff0045" opacity="0.3"/>
+    <path id="Path_460" data-name="Path 460" d="M6.953,12.088l-.718-.654C3.684,9.122,2,7.6,2,5.724A2.7,2.7,0,0,1,4.724,3,2.966,2.966,0,0,1,6.953,4.035,2.966,2.966,0,0,1,9.182,3a2.7,2.7,0,0,1,2.724,2.724c0,1.872-1.684,3.4-4.235,5.716Z" transform="translate(45.571 186.345)" fill="#ff0045" opacity="0.16"/>
+    <g id="Mask_Group_38" data-name="Mask Group 38" transform="translate(24.407 213.918)" clip-path="url(#clip-path)">
+      <path id="Path_270" data-name="Path 270" d="M12.649,22.542l-1.544-1.406C5.621,16.163,2,12.883,2,8.857A5.8,5.8,0,0,1,7.857,3a6.377,6.377,0,0,1,4.792,2.226A6.377,6.377,0,0,1,17.442,3,5.8,5.8,0,0,1,23.3,8.857c0,4.025-3.621,7.306-9.105,12.289Z" transform="translate(5.992 5.54)" fill="#ff0045"/>
+    </g>
+  </g>
+</svg>

resources/icons/favorite_black_24dp.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="21.5" height="20.112" viewBox="0 0 21.5 20.112">
+  <g id="favorite_black_24dp" transform="translate(-1.25 -2.25)">
+    <path id="Path_270" data-name="Path 270" d="M12,21.35l-1.45-1.32C5.4,15.36,2,12.28,2,8.5A5.447,5.447,0,0,1,7.5,3,5.988,5.988,0,0,1,12,5.09,5.988,5.988,0,0,1,16.5,3,5.447,5.447,0,0,1,22,8.5c0,3.78-3.4,6.86-8.55,11.54Z" fill="none" stroke="#03b9e9" stroke-width="1.5"/>
+  </g>
+</svg>

src/app/MainApplicationWindow.qml

@@ -65,6 +65,15 @@ ApplicationWindow {
         }
     }
 
+    header: Loader {
+        active: true
+        sourceComponent: GenericErrorsRow {
+            id: genericError
+            text: CurrentAccount.enabled ? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount
+            height: visible? JamiTheme.chatViewHeaderPreferredHeight : 0
+        }
+    }
+
     Rectangle {
         id: focusOverlay
         objectName: "focusOverlay"
@@ -259,7 +268,7 @@ ApplicationWindow {
     }
 
     function presentUpdateInfoDialog(infoText) {
-        viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
+        return viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
                 "title": JamiStrings.updateDialogTitle,
                 "infoText": infoText,
                 "buttonTitles": [JamiStrings.optionOk],
@@ -268,6 +277,36 @@ ApplicationWindow {
             });
     }
 
+    function presentUpdateConfirmInstallDialog(switchToBeta=false) {
+        return viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
+                "title": JamiStrings.updateDialogTitle,
+                "infoText": switchToBeta ? JamiStrings.confirmBeta : JamiStrings.updateFound,
+                "buttonTitles": [JamiStrings.optionUpgrade, JamiStrings.optionLater],
+                "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlue],
+                "buttonCallBacks": [function () {
+                        AppVersionManager.applyUpdates(switchToBeta);
+                    }]
+            });
+    }
+
+    function translateErrorToString(error) {
+        switch (error) {
+        case NetworkManager.DISCONNECTED:
+            return JamiStrings.networkDisconnected;
+        case NetworkManager.CONTENT_NOT_FOUND:
+            return JamiStrings.contentNotFoundError;
+        case NetworkManager.ACCESS_DENIED:
+            return JamiStrings.accessError;
+        case NetworkManager.SSL_ERROR:
+            return JamiStrings.updateSSLError;
+        case NetworkManager.CANCELED:
+            return JamiStrings.updateDownloadCanceled;
+        case NetworkManager.NETWORK_ERROR:
+        default:
+            return JamiStrings.updateNetworkError;
+        }
+    }
+
     Connections {
         target: AppVersionManager
 
@@ -279,41 +318,22 @@ ApplicationWindow {
 
         function onUpdateCheckReplyReceived(ok, found) {
             if (!ok) {
+                // Show an error dialog describing that we could not successfully check for an update.
                 presentUpdateInfoDialog(JamiStrings.updateCheckError);
                 return;
             }
             if (!found) {
+                // Show a dialog describing that no update was found.
                 presentUpdateInfoDialog(JamiStrings.updateNotFound);
             } else {
-                viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
-                        "title": JamiStrings.updateDialogTitle,
-                        "infoText": JamiStrings.updateFound,
-                        "buttonTitles": [JamiStrings.optionUpgrade, JamiStrings.optionLater],
-                        "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlue],
-                        "buttonCallBacks": [function () {
-                                AppVersionManager.applyUpdates();
-                            }]
-                    });
+                // Show a dialog describing that an update were found, and offering to install it.
+                presentUpdateConfirmInstallDialog()
             }
         }
 
-        function onUpdateErrorOccurred(error) {
-            presentUpdateInfoDialog((function () {
-                        switch (error) {
-                        case NetworkManager.ACCESS_DENIED:
-                            return JamiStrings.genericError;
-                        case NetworkManager.DISCONNECTED:
-                            return JamiStrings.networkDisconnected;
-                        case NetworkManager.NETWORK_ERROR:
-                            return JamiStrings.updateNetworkError;
-                        case NetworkManager.SSL_ERROR:
-                            return JamiStrings.updateSSLError;
-                        case NetworkManager.CANCELED:
-                            return JamiStrings.updateDownloadCanceled;
-                        default:
-                            return {};
-                        }
-                    })());
+        function onNetworkErrorOccurred(error) {
+            var errorStr = translateErrorToString(error);
+            presentUpdateInfoDialog(errorStr);
         }
     }
 

src/app/ViewCoordinator.qml

@@ -74,7 +74,7 @@ QtObject {
     // Create, present, and return a dialog object.
     function presentDialog(parent, path, props = {}) {
         // Open the dialog once the object is created
-        return viewManager.createView(path, parent, function (obj) {
+        return viewManager.createUniqueView(path, parent, function (obj) {
                 const doneCb = function () {
                     viewManager.destroyView(path);
                 };

src/app/ViewManager.qml

@@ -36,36 +36,70 @@ QtObject {
         }
     }
 
+    // Create a view from a path only if it doesn't already exist. This is used
+    // by the view coordinator to create views that are not self-destructing
+    // (main views) and only exist once per instance of the app.
     function createView(path, parent = null, cb = null, props = {}) {
-        if (views.hasOwnProperty(path)) {
-            // an instance of <path> already exists
+        const component = Qt.createComponent(Qt.resolvedUrl(path));
+        return createViewFromComponent(component, path, parent, cb, props);
+    }
+
+    // Create a new view. Useful when we want to create multiple views that are
+    // self-destructing (dialogs).
+    function createUniqueView(path, parent = null, cb = null, props = {}) {
+        const component = Qt.createComponent(Qt.resolvedUrl(path));
+        return createViewFromComponent(component, getViewName(path), parent, cb,
+                                       props);
+    }
+
+    // Create a new view from a component. If a view with the same path already
+    // exists, it is returned instead.
+    function createViewFromComponent(component, viewName, parent = null,
+                                     cb = null, props = {}) {
+        if (views.hasOwnProperty(viewName)) {
+            // an instance of the view already exists
             if (cb !== null) {
-                cb(views[path])
+                cb(views[viewName])
             }
-            return views[path]
+            return views[viewName]
         }
-        const component = Qt.createComponent(Qt.resolvedUrl(path))
         if (component.status === Component.Ready) {
             const obj = component.createObject(parent, props)
             if (obj === null) {
-                print("error creating object")
+                console.error("error creating object")
                 return null
             }
-            views[path] = obj
+            views[viewName] = obj
             // Set the view name to the object name if it has one.
-            const viewName = obj.objectName.toString() !== '' ? obj.objectName : path.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
-            viewPaths[viewName] = path
+            const friendlyName = obj.objectName.toString() !== '' ?
+                obj.objectName :
+                viewName.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
+            viewPaths[friendlyName] = viewName
             if (cb !== null) {
                 cb(obj)
             }
-            return views[path]
+            return views[viewName]
         }
-        print("error creating component", path)
+        console.error("error creating component", component.url)
         console.error(component.errorString())
         Qt.exit(1)
         return null
     }
 
+    // Finds a unique view name for a given path by appending a number to the
+    // base name. For example, if a view named "MyView" already exists, the next
+    // view will be named "MyView_1".
+    function getViewName(path) {
+        const baseName = path.replace(/^.*[\\\/]/, '').replace(/\.[^/.]+$/, "")
+        let viewName = baseName
+        let suffix = 1
+        while (views.hasOwnProperty(viewName)) {
+            viewName = `${baseName}_${suffix}`
+            suffix++
+        }
+        return viewName
+    }
+
     function destroyView(path) {
         // The view may already have been destroyed.
         if (!views.hasOwnProperty(path)) {

src/app/appsettingsmanager.h

@@ -46,7 +46,7 @@ extern const QString defaultDownloadPath;
     X(AppTheme, "System") \
     X(BaseZoom, 1.0) \
     X(ParticipantsSide, false) \
-    X(HideSelf, false) \
+    X(HideSelf, true) \
     X(HideSpectators, false) \
     X(AutoUpdate, true) \
     X(PluginAutoUpdate, false) \
@@ -57,12 +57,16 @@ extern const QString defaultDownloadPath;
     X(WindowState, QWindow::AutomaticVisibility) \
     X(EnableExperimentalSwarm, false) \
     X(LANG, "SYSTEM") \
+    X(PluginStoreEndpoint, "https://plugins.jami.net") \
     X(PositionShareDuration, 15) \
     X(PositionShareLimit, true) \
     X(FlipSelf, true) \
     X(ShowMardownOption, false) \
     X(ChatViewEnterIsNewLine, false) \
-    X(ShowSendOption, false)
+    X(ShowSendOption, false) \
+    X(DonationVisibleDate, "2023-11-01 05:00") \
+    X(IsDonationVisible, true) \
+    X(DonationEndDate, "2024-01-01 00:00")
 
 /*
  * A class to expose settings keys in both c++ and QML.

src/app/appversionmanager.cpp

@@ -44,7 +44,6 @@ struct AppVersionManager::Impl : public QObject
         , parent_(parent)
         , lrcInstance_(instance)
         , baseUrlString_(url.isEmpty() ? downloadUrl : url)
-        , tempPath_(QDir::tempPath())
         , updateTimer_(new QTimer(this))
     {
         connect(updateTimer_, &QTimer::timeout, this, [this] {
@@ -62,11 +61,11 @@ struct AppVersionManager::Impl : public QObject
             connect(&parent_,
                     &NetworkManager::errorOccurred,
                     &parent_,
-                    &AppVersionManager::updateErrorOccurred);
+                    &AppVersionManager::networkErrorOccurred);
 
         cleanUpdateFiles();
-        QUrl versionUrl {isBeta ? QUrl::fromUserInput(baseUrlString_ + betaVersionSubUrl)
-                                : QUrl::fromUserInput(baseUrlString_ + versionSubUrl)};
+        const QUrl versionUrl {isBeta ? QUrl::fromUserInput(baseUrlString_ + betaVersionSubUrl)
+                                      : QUrl::fromUserInput(baseUrlString_ + versionSubUrl)};
         parent_.sendGetRequest(versionUrl, [this, quiet](const QByteArray& latestVersionString) {
             if (latestVersionString.isEmpty()) {
                 qWarning() << "Error checking version";
@@ -76,14 +75,15 @@ struct AppVersionManager::Impl : public QObject
             }
             auto currentVersion = QString(VERSION_STRING).toULongLong();
             auto latestVersion = latestVersionString.toULongLong();
-            qDebug() << "latest: " << latestVersion << " current: " << currentVersion;
-            if (latestVersion > currentVersion) {
-                qDebug() << "New version found";
+            const QString channelStr = isBeta ? "beta" : "stable";
+            const auto newVersionFound = latestVersion > currentVersion;
+            qInfo().noquote() << "--------- Version info ------------"
+                              << QString("\n - Current: %1 (%2)").arg(currentVersion).arg(channelStr);
+            if (newVersionFound) {
+                qDebug() << " - Latest: " << latestVersion;
                 Q_EMIT parent_.updateCheckReplyReceived(true, true);
-            } else {
-                qDebug() << "No new version found";
-                if (!quiet)
-                    Q_EMIT parent_.updateCheckReplyReceived(true, false);
+            } else if (!quiet) {
+                Q_EMIT parent_.updateCheckReplyReceived(true, false);
             }
         });
     };
@@ -94,20 +94,21 @@ struct AppVersionManager::Impl : public QObject
         connect(&parent_,
                 &NetworkManager::errorOccurred,
                 &parent_,
-                &AppVersionManager::updateErrorOccurred);
+                &AppVersionManager::networkErrorOccurred);
 
         const QUrl downloadUrl {(beta || isBeta)
                                     ? QUrl::fromUserInput(baseUrlString_ + betaMsiSubUrl)
                                     : QUrl::fromUserInput(baseUrlString_ + msiSubUrl)};
 
-        int uuid = parent_.downloadFile(
+        const auto lastDownloadReplyId = parent_.replyId_;
+        parent_.replyId_ = parent_.downloadFile(
             downloadUrl,
-            *(parent_.replyId_),
-            [this, downloadUrl](bool success, const QString& errorMessage) {
+            lastDownloadReplyId,
+            [downloadUrl](bool success, const QString& errorMessage) {
                 Q_UNUSED(success)
                 Q_UNUSED(errorMessage)
-                const QProcess process;
-                auto basePath = tempPath_ + QDir::separator();
+                QProcess process;
+                auto basePath = QDir::tempPath() + QDir::separator();
                 auto msiPath = QDir::toNativeSeparators(basePath + downloadUrl.fileName());
                 auto logPath = QDir::toNativeSeparators(basePath + "jami_x64_install.log");
                 process.startDetached("msiexec",
@@ -116,13 +117,12 @@ struct AppVersionManager::Impl : public QObject
                                                     << "WIXNONUILAUNCH=1"
                                                     << "/L*V" << logPath);
             },
-            tempPath_);
-        parent_.replyId_.reset(&uuid);
+            QDir::tempPath());
     };
 
     void cancelUpdate()
     {
-        parent_.cancelDownload(*(parent_.replyId_));
+        parent_.cancelDownload(parent_.replyId_);
     };
 
     void setAutoUpdateCheck(bool state)
@@ -138,7 +138,7 @@ struct AppVersionManager::Impl : public QObject
     void cleanUpdateFiles()
     {
         // Delete all logs and msi in the temporary directory before launching.
-        QString dir = QDir::tempPath();
+        const QString dir = QDir::tempPath();
         QDir log_dir(dir, {"jami*.log"});
         for (const QString& filename : log_dir.entryList()) {
             log_dir.remove(filename);
@@ -157,7 +157,6 @@ struct AppVersionManager::Impl : public QObject
 
     LRCInstance* lrcInstance_ {nullptr};
     QString baseUrlString_;
-    QString tempPath_;
     QTimer* updateTimer_;
 };
 
@@ -166,13 +165,13 @@ AppVersionManager::AppVersionManager(const QString& url,
                                      LRCInstance* instance,
                                      QObject* parent)
     : NetworkManager(cm, parent)
-    , replyId_(new int(0))
+    , replyId_(0)
     , pimpl_(std::make_unique<Impl>(url, instance, *this))
 {}
 
 AppVersionManager::~AppVersionManager()
 {
-    cancelDownload(*replyId_);
+    cancelDownload(replyId_);
 }
 
 void

src/app/appversionmanager.h

@@ -47,10 +47,10 @@ Q_SIGNALS:
     void appCloseRequested();
     void updateCheckReplyReceived(bool ok, bool found = false);
     void updateDownloadProgressChanged(qint64 bytesRead, qint64 totalBytes);
-    void updateErrorOccurred(const NetworkManager::GetError& error);
+    void networkErrorOccurred(const NetworkManager::GetError& error);
 
 private:
-    QScopedPointer<int> replyId_;
+    int replyId_;
     struct Impl;
     friend struct Impl;
     std::unique_ptr<Impl> pimpl_;

src/app/avatarimageprovider.h

@@ -53,21 +53,21 @@ public:
             return {};
         }
 
-        auto imageId = idInfo.at(1);
+        const auto& imageId = idInfo.at(1);
         if (!imageId.size()) {
             qWarning() << Q_FUNC_INFO << "Missing id in the image url";
             return {};
         }
 
-        auto type = idInfo.at(0);
+        const auto& type = idInfo.at(0);
         if (type == "conversation") {
             if (imageId == "temp")
                 return Utils::tempConversationAvatar(requestedSize);
-
             return Utils::conversationAvatar(lrcInstance_, imageId, requestedSize);
-        } else if (type == "account")
+        }
+        if (type == "account")
             return Utils::accountPhoto(lrcInstance_, imageId, requestedSize);
-        else if (type == "contact")
+        if (type == "contact")
             return Utils::contactPhoto(lrcInstance_, imageId, requestedSize);
 
         qWarning() << Q_FUNC_INFO << "Missing valid prefix in the image url";

src/app/commoncomponents/Avatar.qml

@@ -38,7 +38,7 @@ Item {
     property string imageId
 
     readonly property string divider: '_'
-    readonly property string baseProviderPrefix: 'image://avatarImage'
+    readonly property string baseProviderPrefix: 'image://avatarimage'
     property string typePrefix: {
         switch (mode) {
         case Avatar.Mode.Account:

src/app/commoncomponents/BaseModalDialog.qml

@@ -20,6 +20,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import net.jami.Constants 1.1
+import "../mainview/components"
 
 Popup {
     id: root
@@ -28,65 +29,80 @@ Popup {
     property bool autoClose: true
     property alias backgroundColor: container.color
     property alias title: titleText.text
-    property var popupContentLoader: containerSubContentLoader
+    property var popupcontainerSubContentLoader: containerSubContentLoader
+    property bool topLayoutVisible: true
     property alias popupContentLoadStatus: containerSubContentLoader.status
     property alias popupContent: containerSubContentLoader.sourceComponent
-    property int popupContentPreferredHeight: 0
-    property int popupContentPreferredWidth: 0
-    property int popupContentMargins: 0
+    property int popupContentMargins: JamiTheme.preferredMarginSize
 
     parent: Overlay.overlay
-
-    // center in parent
-    x: Math.round((parent.width - width) / 2)
-    y: Math.round((parent.height - height) / 2)
-
+    anchors.centerIn: parent
     modal: true
+    padding: popupContentMargins
 
-    padding: 0
-
-    // A popup is invisible until opened.
-    visible: false
     focus: true
     closePolicy: autoClose ? (Popup.CloseOnEscape | Popup.CloseOnPressOutside) : Popup.NoAutoClose
 
-    Rectangle {
+    contentItem: Control {
         id: container
 
-        anchors.fill: parent
+        property color color: JamiTheme.secondaryBackgroundColor
+        padding: popupContentMargins
+        anchors.margins: popupContentMargins
+        anchors.centerIn: parent
 
-        ColumnLayout {
-            anchors.fill: parent
+        background: Rectangle {
+            id: bgRect
+            radius: JamiTheme.modalPopupRadius
+            color: container.color
+            layer.enabled: true
+            layer.effect: DropShadow {
+                horizontalOffset: 3.0
+                verticalOffset: 3.0
+                radius: bgRect.radius * 4
+                color: JamiTheme.shadowColor
+                source: bgRect
+                transparentBorder: true
+                samples: radius + 1
+            }
+        }
 
-            spacing: 0
+        contentItem: ColumnLayout {
+            id: contentLayout
 
-            Text {
-                id: titleText
+            RowLayout {
+                Layout.preferredWidth: parent.width
+                Layout.bottomMargin: JamiTheme.preferredMarginSize
+                visible: topLayoutVisible
 
-                Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-                Layout.margins: text.length === 0 ? 0 : 10
+                Label {
+                    id: titleText
 
-                Layout.preferredHeight: text.length === 0 ? 0 : contentHeight
+                    Layout.alignment: Qt.AlignTop | Qt.AlignLeft
+                    font.pointSize: JamiTheme.menuFontSize
+                    color: JamiTheme.textColor
 
-                font.pointSize: JamiTheme.menuFontSize
-                color: JamiTheme.textColor
+
+                    visible: text.length > 0
+                }
+
+                JamiPushButton {
+                    id: closeButton
+                    Layout.alignment: Qt.AlignRight
+                    imageColor: "grey"
+                    normalColor: "transparent"
+
+                    source: JamiResources.round_close_24dp_svg
+                    onClicked: close()
+                }
             }
 
             Loader {
                 id: containerSubContentLoader
 
-                Layout.topMargin: popupContentMargins
-                Layout.bottomMargin: popupContentMargins
                 Layout.alignment: Qt.AlignCenter
-                Layout.fillWidth: popupContentPreferredWidth === 0
-                Layout.fillHeight: popupContentPreferredHeight === 0
-                Layout.preferredHeight: popupContentPreferredHeight
-                Layout.preferredWidth: popupContentPreferredWidth
             }
         }
-
-        radius: JamiTheme.modalPopupRadius
-        color: JamiTheme.secondaryBackgroundColor
     }
 
     background: Rectangle {
@@ -103,19 +119,6 @@ Popup {
         }
     }
 
-    DropShadow {
-        z: -1
-        width: root.width
-        height: root.height
-        horizontalOffset: 3.0
-        verticalOffset: 3.0
-        radius: container.radius * 4
-        color: JamiTheme.shadowColor
-        source: container
-        transparentBorder: true
-        samples: radius + 1
-    }
-
     enter: Transition {
         NumberAnimation {
             properties: "opacity"

src/app/commoncomponents/ConfirmDialog.qml

@@ -27,9 +27,6 @@ BaseModalDialog {
 
     signal accepted
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     property string confirmLabel: ""
     property string textLabel: ""
 
@@ -40,7 +37,7 @@ BaseModalDialog {
             id: labelAction
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: column.width - JamiTheme.preferredMarginSize * 2
+            Layout.maximumWidth: root.width - JamiTheme.preferredMarginSize * 4
 
             color: JamiTheme.textColor
             text: root.textLabel
@@ -55,8 +52,8 @@ BaseModalDialog {
 
         RowLayout {
             spacing: 16
-            Layout.fillWidth: true
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: JamiTheme.preferredMarginSize
 
             MaterialButton {
                 id: primaryBtn

src/app/commoncomponents/DaemonReconnectPopup.qml

@@ -68,7 +68,8 @@ BaseModalDialog {
             id: daemonReconnectPopupTextLabel
 
             Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            Layout.topMargin: preferredMargin
+            Layout.maximumWidth: root.parent.width - 4 * JamiTheme.preferredMarginSize
+            wrapMode: Text.Wrap
 
             text: connectionFailed ? JamiStrings.reconnectionFailed : JamiStrings.reconnectDaemon
             font.pointSize: JamiTheme.textFontSize + 2

src/app/commoncomponents/DataTransferMessageDelegate.qml

@@ -88,8 +88,11 @@ Loader {
                         target: parent
                         enabled: canOpen
                         onHoveredChanged: {
-                            dataTransferItem.hoveredLink = enabled && hovered ?
-                                        ("file:///" + Body) : ""
+                            if (enabled && hovered) {
+                                dataTransferItem.hoveredLink = UtilsAdapter.urlFromLocalPath(Body)
+                            } else {
+                                dataTransferItem.hoveredLink = ""
+                            }
                         }
                         cursorShape: enabled ?
                                          Qt.PointingHandCursor :
@@ -199,10 +202,12 @@ Loader {
                                                  Qt.PointingHandCursor :
                                                  Qt.ArrowCursor
                                 onClicked: function (mouse) {
-                                    dataTransferItem.hoveredLink = canOpen ?
-                                                ("file:///" + Body) : ""
-                                    if (dataTransferItem.hoveredLink)
+                                    if (canOpen) {
+                                        dataTransferItem.hoveredLink = UtilsAdapter.urlFromLocalPath(Body)
                                         Qt.openUrlExternally(new Url(dataTransferItem.hoveredLink))
+                                    } else {
+                                        dataTransferItem.hoveredLink = ""
+                                    }
                                 }
                             }
                         }
@@ -303,7 +308,7 @@ Loader {
                             antialiasing: true
                             autoTransform: true
                             asynchronous: true
-                            source: "file:///" + Body
+                            source: UtilsAdapter.urlFromLocalPath(Body)
                             property real aspectRatio: implicitWidth / implicitHeight
                             property real adjustedWidth: Math.min(maxSize,
                                                                   Math.max(minSize,
@@ -348,7 +353,7 @@ Loader {
                             antialiasing: true
                             autoTransform: true
                             asynchronous: true
-                            source: Body !== undefined ? "file:///" + Body : ''
+                            source: Body !== undefined ? UtilsAdapter.urlFromLocalPath(Body) : ''
 
                             // The sourceSize represents the maximum source dimensions.
                             // This should not be a dynamic binding, as property changes

src/app/commoncomponents/DeleteAccountDialog.qml

@@ -33,17 +33,15 @@ BaseModalDialog {
 
     title: JamiStrings.deleteAccount
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     popupContent: ColumnLayout {
         id: deleteAccountContentColumnLayout
+        anchors.centerIn: parent
 
         Label {
             id: labelDeletion
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.maximumWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             color: JamiTheme.textColor
             text: JamiStrings.confirmDeleteQuestion
@@ -51,8 +49,6 @@ BaseModalDialog {
             font.pointSize: JamiTheme.textFontSize
             font.kerning: true
 
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -60,7 +56,6 @@ BaseModalDialog {
             id: labelBestId
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
 
             color: JamiTheme.textColor
             text: bestName
@@ -68,9 +63,6 @@ BaseModalDialog {
             font.pointSize: JamiTheme.textFontSize
             font.kerning: true
             font.bold: true
-
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -78,7 +70,7 @@ BaseModalDialog {
             id: labelAccountHash
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             color: JamiTheme.textColor
             text: accountId
@@ -87,7 +79,6 @@ BaseModalDialog {
             font.kerning: true
 
             horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
 
@@ -97,7 +88,7 @@ BaseModalDialog {
             visible: !isSIP
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: deleteAccountContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
 
             text: JamiStrings.deleteAccountInfos
 
@@ -120,6 +111,7 @@ BaseModalDialog {
                 id: btnDelete
 
                 Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
 
                 preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
                 buttontextHeightMargin: JamiTheme.buttontextHeightMargin
@@ -164,6 +156,7 @@ BaseModalDialog {
                 id: btnCancel
 
                 Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
 
                 preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
                 buttontextHeightMargin: JamiTheme.buttontextHeightMargin

src/app/commoncomponents/EditedPopup.qml

@@ -25,19 +25,13 @@ import net.jami.Constants 1.1
 BaseModalDialog {
     id: root
 
-    width: 488
-    height: 256
+    width: JamiTheme.secondaryDialogDimension
 
     property var previousBodies: undefined
 
-    popupContent: Item {
-        id: rect
-
-        width: root.width
-
-        JamiListView {
-            anchors.fill: parent
-            anchors.margins: JamiTheme.preferredMarginSize
+    popupContent: JamiListView {
+            width: root.width - 4 * JamiTheme.preferredMarginSize
+            height: Math.min(count * 50, 150)
 
             model: root.previousBodies
 
@@ -79,17 +73,4 @@ BaseModalDialog {
                 }
             }
         }
-
-        PushButton {
-            id: btnCancel
-            imageColor: "grey"
-            normalColor: "transparent"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.rightMargin: 10
-            source: JamiResources.round_close_24dp_svg
-            onClicked: close()
-        }
     }
-}

src/app/commoncomponents/JamiIdentifier.qml

@@ -24,6 +24,7 @@ import net.jami.Constants 1.1
 
 Item {
     id: jamiId
+
     property bool slimDisplay: true
     property color backgroundColor: JamiTheme.welcomeBlockColor
     property color contentColor: JamiTheme.tintedBlue
@@ -104,6 +105,8 @@ Item {
                     visible: usernameTextEdit.readOnly
                     Layout.alignment: Qt.AlignVCenter
                     Layout.rightMargin: JamiTheme.pushButtonMargins
+                    Layout.maximumWidth: leftRect.width - 50
+                    elide: Text.ElideRight
                     color: jamiId.contentColor
                     font.pixelSize : text.length > 16 ? JamiTheme.jamiIdSmallFontSize : JamiTheme.bigFontSize
                     property string registeredName: CurrentAccount.registeredName

src/app/commoncomponents/JamiSplitView.qml

@@ -68,6 +68,7 @@ SplitView {
     }
 
     handle: Rectangle {
+        visible: !isSinglePane
         implicitWidth: JamiTheme.splitViewHandlePreferredWidth
         implicitHeight: root.height
         color: JamiTheme.primaryBackgroundColor

src/app/commoncomponents/MessageOptionsPopup.qml

@@ -228,6 +228,18 @@ Popup {
                 }
             }
 
+            MessageOptionButton {
+                visible: type === Interaction.Type.DATA_TRANSFER && Status === Interaction.Status.TRANSFER_FINISHED
+                textButton: JamiStrings.removeLocally
+                iconSource: JamiResources.trash_black_24dp_svg
+                Layout.fillWidth: true
+                Layout.margins: 5
+                onClicked: {
+                    MessagesAdapter.removeFile(msgId, root.location)
+                    close()
+                }
+            }
+
             MessageOptionButton {
                 id: buttonEdit
 

src/app/commoncomponents/PasswordDialog.qml

@@ -35,9 +35,6 @@ BaseModalDialog {
 
     signal done(bool success, int purpose)
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     title: {
         switch (purpose) {
         case PasswordDialog.ExportAccount:
@@ -75,7 +72,7 @@ BaseModalDialog {
     popupContent: ColumnLayout {
         id: popupContentColumnLayout
 
-        spacing: 0
+        spacing: 16
 
         function validatePassword() {
             switch (purpose) {
@@ -128,6 +125,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.ExportAccount
             placeholderText: JamiStrings.enterCurrentPassword
@@ -141,6 +140,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -155,6 +156,8 @@ BaseModalDialog {
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -163,49 +166,24 @@ BaseModalDialog {
             onDynamicTextChanged: popupContentColumnLayout.validatePassword()
         }
 
-        RowLayout {
-            spacing: 16
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignCenter
+        MaterialButton {
+            id: btnConfirm
 
-            MaterialButton {
-                id: btnConfirm
+            Layout.alignment: Qt.AlignHCenter
+            preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
 
-                Layout.alignment: Qt.AlignHCenter
+            color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
+            hoveredColor: JamiTheme.buttonTintedBlackHovered
+            pressedColor: JamiTheme.buttonTintedBlackPressed
+            secondary: true
+            autoAccelerator: true
+            enabled: purpose === PasswordDialog.SetPassword
 
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
+            text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
 
-                color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-                autoAccelerator: true
-                enabled: purpose === PasswordDialog.SetPassword
-
-                text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
-
-                onClicked: {
-                    btnConfirm.enabled = false;
-                    timerToOperate.restart();
-                }
-            }
-
-            MaterialButton {
-                id: btnCancel
-
-                Layout.alignment: Qt.AlignHCenter
-
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-
-                color: JamiTheme.buttonTintedBlack
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-                autoAccelerator: true
-
-                text: JamiStrings.optionCancel
-
-                onClicked: close()
+            onClicked: {
+                btnConfirm.enabled = false;
+                timerToOperate.restart();
             }
         }
     }

src/app/commoncomponents/PhotoboothPopup.qml

@@ -32,15 +32,12 @@ import "../mainview/components"
 BaseModalDialog {
     id: root
 
-    height: 157
-    x: - width / 2
-    y: - height / 5
-
     property string imageId
     property bool newItem
     property real buttonSize: JamiTheme.smartListAvatarSize
     property real imageSize: 25
 
+
     signal focusOnPreviousItem
     signal focusOnNextItem
 
@@ -60,9 +57,15 @@ BaseModalDialog {
         importButton.forceActiveFocus()
     }
 
+    width: JamiTheme.preferredDialogWidth
+
+    title: JamiStrings.chooseAvatarPicture
+
     RecordBox {
         id: recordBox
 
+        anchors.centerIn: parent
+
         isPhoto: true
         visible: false
 
@@ -77,223 +80,176 @@ BaseModalDialog {
         }
     }
 
-    popupContent: Item {
+    popupContent: RowLayout {
+            id: buttonsRowLayout
 
-        Component.onCompleted: {
-            root.width = Qt.binding(() => clearButton.visible ? 283 : 210)
-        }
-
-        Rectangle {
-            id: container
-
-            anchors.fill: parent
-            radius: JamiTheme.photoPopupRadius
-            color: JamiTheme.inviteHoverColor
+            spacing: 10
 
             PushButton {
-                id: btnCancel
-                imageColor: "grey"
+                id: takePhotoButton
+
+                objectName: "takePhotoButton"
+
+                Layout.alignment: Qt.AlignHCenter
+
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
                 normalColor: "transparent"
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.topMargin: 10
-                anchors.rightMargin: 10
-                source: JamiResources.round_close_24dp_svg
-                onClicked: { close();}
-            }
+                imageColor: JamiTheme.buttonTintedBlue
+                toolTipText: JamiStrings.takePhoto
+                source: JamiResources.baseline_camera_alt_24dp_svg
+                hoveredColor: JamiTheme.smartListHoveredColor
 
-
-            ColumnLayout {
-                id:  mainLayout
-                anchors.fill: parent
-                anchors.margins: JamiTheme.preferredMarginSize
-
-                Text {
-                    id: informativeLabel
-
-                    Layout.alignment: Qt.AlignCenter
-                    Layout.fillWidth: true
-                    Layout.topMargin: 26
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    text: JamiStrings.chooseAvatarPicture
-                    color: JamiTheme.primaryForegroundColor
-                    font.pixelSize: JamiTheme.popupPhotoTextSize
-                    elide: Text.ElideRight
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Up) {
+                        root.focusOnPreviousItem()
+                        keyEvent.accepted = true
+                    }
                 }
 
-                RowLayout {
-                    id: buttonsRowLayout
-                    Layout.preferredHeight: childrenRect.height
-                    Layout.alignment: Qt.AlignCenter
-                    spacing: 10
+                KeyNavigation.tab: {
+                    if (clearButton.visible)
+                        return clearButton
+                    return importButton
+                }
+                KeyNavigation.down: KeyNavigation.tab
 
-                    PushButton {
-                        id: takePhotoButton
+                onClicked: {
+                    recordBox.parent = buttonsRowLayout
 
-                        objectName: "takePhotoButton"
+                    recordBox.x = Qt.binding(function() {
+                        var buttonCenterX = buttonsRowLayout.width / 2
+                        return buttonCenterX - recordBox.width / 2
+                    })
+                    recordBox.y = Qt.binding(function() {
+                        return - recordBox.height / 2
+                    })
+                    startBooth()
+                }
+            }
 
-                        Layout.alignment: Qt.AlignHCenter
+            PushButton {
+                id: importButton
 
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        imageColor: JamiTheme.buttonTintedBlue
-                        toolTipText: JamiStrings.takePhoto
-                        source: JamiResources.baseline_camera_alt_24dp_svg
-                        hoveredColor: JamiTheme.smartListHoveredColor
+                objectName: "photoboothViewImportButton"
 
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Up) {
-                                root.focusOnPreviousItem()
-                                keyEvent.accepted = true
-                            }
-                        }
+                Layout.alignment: Qt.AlignHCenter
+                visible: parent.visible
 
-                        KeyNavigation.tab: {
-                            if (clearButton.visible)
-                                return clearButton
-                            return importButton
-                        }
-                        KeyNavigation.down: KeyNavigation.tab
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
+                normalColor: "transparent"
+                source: JamiResources.round_folder_24dp_svg
+                toolTipText: JamiStrings.importFromFile
+                imageColor: JamiTheme.buttonTintedBlue
+                hoveredColor: JamiTheme.smartListHoveredColor
 
-                        onClicked: {
-                            recordBox.parent = buttonsRowLayout
 
-                            recordBox.x = Qt.binding(function() {
-                                var buttonCenterX = buttonsRowLayout.width / 2
-                                return buttonCenterX - recordBox.width / 2
-                            })
-                            recordBox.y = Qt.binding(function() {
-                                return - recordBox.height / 2
-                            })
-                            startBooth()
-                        }
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Down ||
+                               keyEvent.key === Qt.Key_Tab) {
+                        clearButton.forceActiveFocus()
+                        keyEvent.accepted = true
                     }
+                }
 
-                    PushButton {
-                        id: importButton
+                KeyNavigation.up: takePhotoButton
 
-                        objectName: "photoboothViewImportButton"
-
-                        Layout.alignment: Qt.AlignHCenter
-                        visible: parent.visible
-
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        source: JamiResources.round_folder_24dp_svg
-                        toolTipText: JamiStrings.importFromFile
-                        imageColor: JamiTheme.buttonTintedBlue
-                        hoveredColor: JamiTheme.smartListHoveredColor
-
-
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Down ||
-                                       keyEvent.key === Qt.Key_Tab) {
-                                clearButton.forceActiveFocus()
-                                keyEvent.accepted = true
-                            }
+                onClicked: {
+                    stopBooth()
+                    var dlg = viewCoordinator.presentDialog(
+                                appWindow,
+                                "commoncomponents/JamiFileDialog.qml",
+                                {
+                                    title: JamiStrings.chooseAvatarImage,
+                                    fileMode: JamiFileDialog.OpenFile,
+                                    folder: StandardPaths.writableLocation(
+                                                StandardPaths.PicturesLocation),
+                                    nameFilters: [JamiStrings.imageFiles,
+                                        JamiStrings.allFiles]
+                                })
+                    dlg.fileAccepted.connect(function(file) {
+                        var filePath = UtilsAdapter.getAbsPath(file)
+                        if (!root.newItem) {
+                            AccountAdapter.setCurrentAccountAvatarFile(filePath)
+                        } else {
+                            UtilsAdapter.setTempCreationImageFromFile(filePath, root.imageId)
                         }
+                        root.close()
+                    })
+                }
+            }
 
-                        KeyNavigation.up: takePhotoButton
+            PushButton {
+                id: clearButton
 
-                        onClicked: {
-                            stopBooth()
-                            var dlg = viewCoordinator.presentDialog(
-                                        appWindow,
-                                        "commoncomponents/JamiFileDialog.qml",
-                                        {
-                                            title: JamiStrings.chooseAvatarImage,
-                                            fileMode: JamiFileDialog.OpenFile,
-                                            folder: StandardPaths.writableLocation(
-                                                        StandardPaths.PicturesLocation),
-                                            nameFilters: [JamiStrings.imageFiles,
-                                                JamiStrings.allFiles]
-                                        })
-                            dlg.fileAccepted.connect(function(file) {
-                                var filePath = UtilsAdapter.getAbsPath(file)
-                                if (!root.newItem) {
-                                    AccountAdapter.setCurrentAccountAvatarFile(filePath)
-                                } else {
-                                    UtilsAdapter.setTempCreationImageFromFile(filePath, root.imageId)
-                                }
-                                root.close()
-                            })
-                        }
+                objectName: "photoboothViewClearButton"
+
+                Layout.alignment: Qt.AlignHCenter
+
+                height: buttonSize
+                width: buttonSize
+                imageContainerWidth: imageSize
+                imageContainerHeight: imageSize
+                radius: height / 2
+                border.color: JamiTheme.buttonTintedBlue
+                normalColor: "transparent"
+                source: JamiResources.ic_hangup_participant_24dp_svg
+                toolTipText: JamiStrings.clearAvatar
+                imageColor: JamiTheme.buttonTintedBlue
+                hoveredColor: JamiTheme.smartListHoveredColor
+
+
+                visible: {
+                    if (!newItem && LRCInstance.currentAccountAvatarSet)
+                        return true
+                    if (newItem && UtilsAdapter.tempCreationImage(imageId).length !== 0)
+                        return true
+                    return false
+                }
+
+                KeyNavigation.up: importButton
+
+                Keys.onPressed: function (keyEvent) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
+                        clicked()
+                        importButton.forceActiveFocus()
+                        keyEvent.accepted = true
+                    } else if (keyEvent.key === Qt.Key_Down ||
+                               keyEvent.key === Qt.Key_Tab) {
+                        btnCancel.forceActiveFocus()
+                        keyEvent.accepted = true
                     }
+                }
 
-                    PushButton {
-                        id: clearButton
-
-                        objectName: "photoboothViewClearButton"
-
-                        Layout.alignment: Qt.AlignHCenter
-
-                        height: buttonSize
-                        width: buttonSize
-                        imageContainerWidth: imageSize
-                        imageContainerHeight: imageSize
-                        radius: height / 2
-                        border.color: JamiTheme.buttonTintedBlue
-                        normalColor: "transparent"
-                        source: JamiResources.ic_hangup_participant_24dp_svg
-                        toolTipText: JamiStrings.clearAvatar
-                        imageColor: JamiTheme.buttonTintedBlue
-                        hoveredColor: JamiTheme.smartListHoveredColor
-
-
-                        visible: {
-                            if (!newItem && LRCInstance.currentAccountAvatarSet)
-                                return true
-                            if (newItem && UtilsAdapter.tempCreationImage(imageId).length !== 0)
-                                return true
-                            return false
-                        }
-
-                        KeyNavigation.up: importButton
-
-                        Keys.onPressed: function (keyEvent) {
-                            if (keyEvent.key === Qt.Key_Enter ||
-                                    keyEvent.key === Qt.Key_Return) {
-                                clicked()
-                                importButton.forceActiveFocus()
-                                keyEvent.accepted = true
-                            } else if (keyEvent.key === Qt.Key_Down ||
-                                       keyEvent.key === Qt.Key_Tab) {
-                                btnCancel.forceActiveFocus()
-                                keyEvent.accepted = true
-                            }
-                        }
-
-                        onClicked: {
-                            if (!root.newItem)
-                                AccountAdapter.setCurrentAccountAvatarBase64()
-                            else
-                                UtilsAdapter.setTempCreationImageFromString("", imageId)
-                            visible = false
-                            stopBooth()
-                            root.close()
-                        }
-                    }
+                onClicked: {
+                    if (!root.newItem)
+                        AccountAdapter.setCurrentAccountAvatarBase64()
+                    else
+                        UtilsAdapter.setTempCreationImageFromString("", imageId)
+                    visible = false
+                    stopBooth()
+                    root.close()
                 }
             }
         }
     }
-}
+
+

src/app/commoncomponents/SBSMessageBase.qml

@@ -278,7 +278,7 @@ Control {
                         anchors.leftMargin: !isOutgoing ? 10 : 0
 
                         imageColor: JamiTheme.emojiReactPushButtonColor
-                        normalColor: JamiTheme.transparentColor
+                        normalColor: JamiTheme.primaryBackgroundColor
                         toolTipText: JamiStrings.moreOptions
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.right: isOutgoing ? optionButtonItem.right : undefined
@@ -287,6 +287,7 @@ Control {
                         source: JamiResources.more_vert_24dp_svg
                         width: optionButtonItem.width / 2
                         height: optionButtonItem.height
+                        circled: false
 
                         onClicked: {
                             var component = Qt.createComponent("qrc:/commoncomponents/MessageOptionsPopup.qml");
@@ -308,15 +309,17 @@ Control {
                         id: reply
 
                         imageColor: JamiTheme.emojiReactPushButtonColor
-                        normalColor: JamiTheme.transparentColor
+                        normalColor: JamiTheme.primaryBackgroundColor
                         toolTipText: JamiStrings.reply
                         source: JamiResources.reply_svg
                         width: optionButtonItem.width / 2
                         height: optionButtonItem.height
                         anchors.verticalCenter: parent.verticalCenter
+                        anchors.rightMargin: 5
                         anchors.right: isOutgoing ? more.left : undefined
                         anchors.left: !isOutgoing ? more.right : undefined
                         visible: CurrentAccount.type !== Profile.Type.SIP && Body !== "" && (bubbleArea.bubbleHovered || hovered || more.hovered || bgHandler.hovered)
+                        circled: false
 
                         onClicked: {
                             MessagesAdapter.editId = "";

src/app/commoncomponents/SharePopup.qml

@@ -79,8 +79,8 @@ Popup {
                 contentItem: RowLayout {
                     Rectangle {
                         id: image
-                        width: 26
-                        height: 26
+                        width: 20
+                        height: 20
                         radius: 5
                         color: JamiTheme.transparentColor
                         ResponsiveImage {
@@ -92,7 +92,8 @@ Popup {
                     Text {
                         Layout.alignment: Qt.AlignLeft
                         text: control.text
-                        color: control.hovered ? JamiTheme.chatViewFooterImgHoverColor : "#7f7f7f"
+                        color: JamiTheme.chatViewFooterImgHoverColor
+                        font.pixelSize: JamiTheme.menuFontSize
                     }
                 }
                 background: Rectangle {
@@ -108,6 +109,20 @@ Popup {
         }
     }
 
+    DropShadow {
+        z: -1
+
+        width: rect.width
+        height: rect.height
+        horizontalOffset: 3.0
+        verticalOffset: 3.0
+        radius: rect.radius * 4
+        color: JamiTheme.shadowColor
+        source: rect
+        transparentBorder: true
+        samples: radius + 1
+    }
+
     background: Rectangle {
         anchors.fill: parent
         color: JamiTheme.transparentColor

src/app/commoncomponents/SimpleMessageDialog.qml

@@ -44,9 +44,6 @@ BaseModalDialog {
         open();
     }
 
-    width: Math.max(JamiTheme.preferredDialogWidth, buttonTitles.length * (JamiTheme.preferredFieldWidth / 2 + JamiTheme.preferredMarginSize))
-    height: JamiTheme.preferredDialogHeight / 2 - JamiTheme.preferredMarginSize
-
     popupContent: ColumnLayout {
         Label {
             id: infoTextLabel
@@ -72,12 +69,10 @@ BaseModalDialog {
 
             data: innerContentData
         }
-
         RowLayout {
             spacing: JamiTheme.preferredMarginSize
 
             Layout.fillWidth: true
-            Layout.preferredHeight: contentHeight
             Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
             Layout.bottomMargin: JamiTheme.preferredMarginSize
 

src/app/constant/JamiQmlUtils.qml

@@ -20,6 +20,7 @@
 pragma Singleton
 import QtQuick
 import net.jami.Adapters 1.1
+import net.jami.Enums 1.1
 
 Item {
     property string qmlFilePrefix: "file:/"
@@ -69,4 +70,13 @@ Item {
     function clamp(val, min, max) {
         return Math.min(Math.max(val, min), max);
     }
+
+    function isDonationBannerVisible() {
+        // The banner is visible if the current date is after the date set in the settings and before the end date
+        // And if the donation toggle is checked
+        var isDonationVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible);
+        var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationEndDate)));
+        var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationVisibleDate)));
+        return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible;
+    }
 }

src/app/constant/JamiStrings.qml

@@ -47,7 +47,7 @@ Item {
     // AboutPopUp
     property string version: qsTr("Version") + (AppVersionManager.isCurrentVersionBeta() ? " (Beta)" : "")
     property string declarationYear: "© 2015-2023"
-    property string slogan: "Világfa"
+    property string slogan: "Eleutheria"
     property string declaration: qsTr("Jami is a free universal communication software that respects the freedom and privacy of its users.")
 
     // AccountComboBox
@@ -436,7 +436,7 @@ Item {
 
     // LinkedDevices
     property string tipLinkNewDevice: qsTr("Link a new device to this account")
-    property string linkNewDevice: qsTr("Exporting account…")
+    property string linkDevice: qsTr("Exporting account…")
     property string removeDevice: qsTr("Remove Device")
     property string sureToRemoveDevice: qsTr("Are you sure you wish to remove this device?")
     property string yourPinIs: qsTr("Your PIN is:")
@@ -496,6 +496,7 @@ Item {
     // Context Menu
     property string saveFile: qsTr("Save file")
     property string openLocation: qsTr("Open location")
+    property string removeLocally: qsTr("Delete file from device")
 
     // Updates
     property string betaInstall: qsTr("Install beta version")
@@ -512,6 +513,8 @@ Item {
     property string updateDownloading: "Downloading"
     property string confirmBeta: qsTr("This will uninstall your current Release version and you can always download the latest Release version on our website")
     property string networkDisconnected: qsTr("Network disconnected")
+    property string accessError: qsTr("Content access error")
+    property string contentNotFoundError: qsTr("Content not found")
     property string genericError: qsTr("Something went wrong")
 
     //Troubleshoot Settings
@@ -574,13 +577,20 @@ Item {
     // LinkDevicesDialog
     property string pinTimerInfos: qsTr("The PIN and the account password should be entered in your device within 10 minutes.")
     property string close: qsTr("Close")
-    property string enterAccountPassword: qsTr("Enter account's password")
+    property string enterAccountPassword: qsTr("Enter account password")
+    property string enterPasswordPinCode: qsTr("This account is password encrypted, enter the password to generate a PIN code.")
     property string addDevice: qsTr("Add Device")
+    property string pinExpired: qsTr("PIN expired")
+    property string onAnotherDevice: qsTr("On another device")
+    property string onAnotherDeviceInstruction: qsTr("Install and launch Jami, select \"Import from another device\" and scan the QR code.")
+    property string linkNewDevice: qsTr("Link new device")
+    property string linkingInstructions: qsTr("In Jami, scan QR code or manually enter the PIN.")
+    property string pinValidity: qsTr("The PIN code is valid for: ")
 
     // PasswordDialog
-    property string enterPassword: qsTr("Enter the password")
+    property string enterPassword: qsTr("Enter password")
     property string enterCurrentPassword: qsTr("Enter current password")
-    property string confirmRemoval: qsTr("Enter this account's password to confirm the removal of this device")
+    property string confirmRemoval: qsTr("Enter account password to confirm the removal of this device")
     property string enterNewPassword: qsTr("Enter new password")
     property string confirmNewPassword: qsTr("Confirm new password")
     property string change: qsTr("Change")
@@ -720,7 +730,10 @@ Item {
     property string leaveAudioMessage: qsTr("Audio message")
     property string leaveVideoMessage: qsTr("Video message")
     property string showMore: qsTr("Show more")
+    property string showLess: qsTr("Show less")
 
+    property string showPreview: qsTr("Show preview")
+    property string continueEditing: qsTr("Continue editing")
     property string bold: qsTr("Bold")
     property string italic: qsTr("Italic")
     property string strikethrough: qsTr("Strikethrough")
@@ -824,4 +837,17 @@ Item {
     // Appearence
     property string theme: qsTr("Theme")
     property string zoomLevel: qsTr("Text zoom level")
+
+    //Donation campaign
+    property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/donate/\">Donate</a> to expand it.")
+    property string donation: qsTr("Donate")
+    property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?")
+    property string notNow: qsTr("Not now")
+    property string enableDonation: qsTr("Enable donation campaign")
+
+    //Chat setting page
+    property string enter: qsTr("ENTER")
+    property string shiftEnter: qsTr("SHIFT+ENTER")
+    property string textFormattingDescription: qsTr("ENTER or SHIFT+ENTER to insert a new line")
+    property string textFormatting: qsTr("Text formatting")
 }

src/app/constant/JamiTheme.qml

@@ -492,6 +492,7 @@ Item {
 
     // MessageBar
     property int messageBarMarginSize: 10
+    property int messageBarMinimumWidth: 438
 
     // InvitationView
     property real invitationViewAvatarSize: 112
@@ -532,6 +533,7 @@ Item {
 
     // WizardView Welcome Page
     property real welcomeLabelPointSize: 30
+    property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
     property real welcomeLogoWidth: 100
     property real welcomeLogoHeight: 100
     property real wizardButtonWidth: 400
@@ -543,7 +545,7 @@ Item {
     property real welcomeGridWidth: 3 * JamiTheme.tipBoxWidth + 2 * JamiTheme.welcomePageSpacing
     property real welcomeHalfGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 2
     property real welcomeShortGridWidth: 2 * JamiTheme.tipBoxWidth + JamiTheme.welcomePageSpacing
-    readonly property string welcomeBg: darkTheme ? JamiResources.bg_darkmode_id_jami_png : JamiResources.bg_lightmode_id_jami_png
+    readonly property string welcomeBg: darkTheme ? JamiResources.background_don_dark_jpg : JamiResources.background_don_white_jpg
     property color welcomeBlockColor: darkTheme ? "#4D000000" : "#4DFFFFFF"
 
     // WizardView Advanced Account Settings
@@ -643,6 +645,9 @@ Item {
     property int settingsMenuHeaderButtonHeight: 50
     property int settingsListViewsSpacing: 10
 
+    // Link Device
+    property color pinBackgroundColor: "#D6E4EF"
+
     // MaterialRadioButton
     property int radioImageSize: 30
     property color radioBackgroundColor: darkTheme ? "#303030" : "#F0EFEF"
@@ -654,7 +659,17 @@ Item {
     property color darkThemeCheckedColor: "#03B9E9"
     property color darkThemeBorderColor: "#03B9E9"
 
+    // Donation campaign
+    property color donationButtonTextColor: "#005699"
+    property color donationBackgroundColor: "#D5E4EF"
+    property string donationUrl: "https://jami.net/donate/"
+
     function setTheme(dark) {
         darkTheme = dark;
     }
+
+    //Chat setting page
+    property color chatSettingButtonBackgroundColor: "#F0EFEF"
+    property color chatSettingButtonBorderColor: "#005699"
+    property color chatSettingButtonTextColor: "#000000"
 }

src/app/imagedownloader.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "imagedownloader.h"
+
 #include <QDir>
 #include <QLockFile>
 
@@ -38,29 +39,29 @@ ImageDownloader::downloadImage(const QUrl& url, const QString& localPath)
 void
 ImageDownloader::onDownloadImageFinished(const QByteArray& data, const QString& localPath)
 {
-    if (!data.isEmpty()) {
-        // Check if the parent folders exist create them if not
-        QString dirPath = localPath.left(localPath.lastIndexOf('/'));
-        QDir dir;
-        dir.mkpath(dirPath);
+    if (data.isEmpty()) {
+        Q_EMIT downloadImageFailed(localPath);
+        return;
+    }
 
-        QLockFile lf(localPath + ".lock");
-        QFile file(localPath);
-
-        if (!lf.lock()) {
-            qWarning().noquote() << "Can't lock file for writing: " << file.fileName();
-            return;
-        }
-        if (!file.open(QIODevice::WriteOnly)) {
-            qWarning().noquote() << "Can't open file for writing: " << file.fileName();
-            return;
-        }
+    // Make sure the parent folders exists.
+    const QString dirPath = localPath.left(localPath.lastIndexOf('/'));
+    const QDir dir;
+    if (!dir.mkpath(dirPath)) {
+        qWarning() << Q_FUNC_INFO << "Failed to create directory" << dirPath;
+        Q_EMIT downloadImageFailed(localPath);
+        return;
+    }
 
+    QLockFile lf(localPath + ".lock");
+    QFile file(localPath);
+    if (lf.lock() && file.open(QIODevice::WriteOnly)) {
         file.write(data);
         file.close();
-        qWarning() << Q_FUNC_INFO;
         Q_EMIT downloadImageSuccessful(localPath);
         return;
     }
+
+    qWarning() << Q_FUNC_INFO << "Failed to write image to" << localPath;
     Q_EMIT downloadImageFailed(localPath);
 }

src/app/mainapplication.cpp

@@ -105,7 +105,7 @@ ScreenInfo::onPhysicalDotsPerInchChanged()
 }
 
 MainApplication::MainApplication(int& argc, char** argv)
-    : QApplication(argc, argv)
+    : QApplication(argc, argv), isCleanupped(false)
 {
     const char* qtVersion = qVersion();
     qInfo() << "Using Qt runtime version:" << qtVersion;
@@ -231,7 +231,6 @@ MainApplication::initLrc(const QString& downloadUrl,
                          bool debugMode,
                          bool muteDaemon)
 {
-    lrc::api::Lrc::cacheAvatars.store(false);
     /*
      * Init mainwindow and finish splash when mainwindow shows up.
      */
@@ -402,7 +401,12 @@ MainApplication::initSystray()
 void
 MainApplication::cleanup()
 {
-    QApplication::exit(0);
+    // In Qt 6.5, QApplication::exit(0) will signal aboutToQuit, and aboutToQuit is connected to cleanup
+    // TODO: delete cleanup.
+    if (!isCleanupped) {
+        isCleanupped = true;
+        QApplication::exit(0);
+    }
 }
 
 #ifdef Q_OS_MACOS

src/app/mainapplication.h

@@ -121,4 +121,6 @@ private:
     QScopedPointer<ImageDownloader> imageDownloader_;
 
     ScreenInfo screenInfo_;
+
+    bool isCleanupped;
 };

src/app/mainview/components/AboutPopUp.qml

@@ -26,191 +26,169 @@ import "../../commoncomponents"
 
 BaseModalDialog {
     id: root
-
-    width: Math.min(parent.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-    height: Math.min(parent.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-
-    popupContentMargins: 14
-
-    PushButton {
-        id: btnClose
-
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: JamiTheme.preferredMarginSize
-        anchors.rightMargin: JamiTheme.preferredMarginSize
-        imageColor: "grey"
-        normalColor: JamiTheme.transparentColor
-
-        source: JamiResources.round_close_24dp_svg
-
-        onClicked: {
-            close();
-        }
-    }
+    margins: JamiTheme.preferredMarginSize
 
     popupContent: JamiFlickable {
-        id: aboutPopUpScrollView
+            id: aboutPopUpScrollView
+            width: aboutPopUpContentRectColumnLayout.implicitWidth
+            height: JamiTheme.preferredDialogHeight
 
-        width: root.width
-        contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
+            contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
 
-        ColumnLayout {
-            id: aboutPopUpContentRectColumnLayout
+            ColumnLayout {
+                id: aboutPopUpContentRectColumnLayout
+                anchors.centerIn: parent
 
-            width: root.width
+                ResponsiveImage {
+                    id: aboutPopUPJamiLogoImage
 
-            ResponsiveImage {
-                id: aboutPopUPJamiLogoImage
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
+                    Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.topMargin: JamiTheme.preferredMarginSize
-                Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
-                Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
-
-                source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
-            }
-
-            TextEdit {
-                id: jamiSlogansText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width
-                Layout.topMargin: 26
-
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.bigFontSize
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                text: textMetricsjamiSlogansText.text
-                selectByMouse: true
-                readOnly: true
-                color: JamiTheme.tintedBlue
-
-                TextMetrics {
-                    id: textMetricsjamiSlogansText
-                    font: jamiSlogansText.font
-                    text: JamiStrings.slogan
-                }
-            }
-
-            TextEdit {
-                id: jamiVersionText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width
-
-                font.pixelSize: JamiTheme.tinyCreditsTextSize
-
-                padding: 0
-
-                text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
-                selectByMouse: true
-                readOnly: true
-                color: JamiTheme.textColor
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-
-            TextEdit {
-                id: jamiDeclarationText
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width - JamiTheme.preferredMarginSize * 2
-                Layout.topMargin: 15
-
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.creditsTextSize
-                color: JamiTheme.textColor
-
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                // TextMetrics does not work for multi-line.
-                text: JamiStrings.declaration
-                selectByMouse: true
-                readOnly: true
-            }
-
-            TextEdit {
-                id: jamiDeclarationHyperText
-
-                Layout.alignment: Qt.AlignCenter
-
-                // Strangely, hoveredLink works badly when width grows too large
-                Layout.preferredWidth: 50
-                Layout.topMargin: 15
-
-                color: JamiTheme.textColor
-
-                font.pixelSize: JamiTheme.creditsTextSize
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                text: textMetricsjamiDeclarationHyperText.text
-                textFormat: TextEdit.RichText
-                selectByMouse: true
-                readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
-
-                TextMetrics {
-                    id: textMetricsjamiDeclarationHyperText
-                    font: jamiDeclarationHyperText.font
-                    text: '<a href="https://jami.net" style="color: ' + JamiTheme.blueLinkColor + '">jami.net</a>'
+                    source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
                 }
 
-                MouseArea {
-                    anchors.fill: parent
+                TextEdit {
+                    id: jamiSlogansText
 
-                    // We don't want to eat clicks on the Text.
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                }
-            }
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 26
 
-            TextEdit {
-                id: jamiNoneWarrantyHyperText
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.bigFontSize
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: Math.min(390, root.width)
-                Layout.topMargin: 15
-                wrapMode: Text.WordWrap
-                font.pixelSize: JamiTheme.tinyCreditsTextSize
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
 
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignTop
-                color: JamiTheme.textColor
+                    text: textMetricsjamiSlogansText.text
+                    selectByMouse: true
+                    readOnly: true
+                    color: JamiTheme.tintedBlue
 
-                text: textMetricsjamiNoneWarrantyHyperText.text
-                textFormat: TextEdit.RichText
-                selectByMouse: true
-                readOnly: true
-                onLinkActivated: Qt.openUrlExternally(link)
-
-                TextMetrics {
-                    id: textMetricsjamiNoneWarrantyHyperText
-                    font: jamiDeclarationHyperText.font
-                    text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.blueLinkColor + '">Savoir-faire Linux Inc.</a><br>' + 'This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.blueLinkColor + '">GNU General Public License</a>, version 3 or later for details.'
+                    TextMetrics {
+                        id: textMetricsjamiSlogansText
+                        font: jamiSlogansText.font
+                        text: JamiStrings.slogan
+                    }
                 }
 
-                MouseArea {
-                    anchors.fill: parent
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                }
-            }
+                TextEdit {
+                    id: jamiVersionText
 
-            ProjectCreditsScrollView {
-                id: projectCreditsScrollView
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: aboutPopUpScrollView.width - JamiTheme.preferredMarginSize * 2
-                Layout.preferredHeight: 100
-                Layout.topMargin: 25
-                Layout.margins: JamiTheme.preferredMarginSize
-            }
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+
+                    font.pixelSize: JamiTheme.tinyCreditsTextSize
+
+                    padding: 0
+
+                    text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
+                    selectByMouse: true
+                    readOnly: true
+                    color: JamiTheme.textColor
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                }
+
+                TextEdit {
+                    id: jamiDeclarationText
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.creditsTextSize
+                    color: JamiTheme.textColor
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    // TextMetrics does not work for multi-line.
+                    text: JamiStrings.declaration
+                    selectByMouse: true
+                    readOnly: true
+                }
+
+                TextEdit {
+                    id: jamiDeclarationHyperText
+
+                    Layout.alignment: Qt.AlignCenter
+
+                    // Strangely, hoveredLink works badly when width grows too large
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+
+                    color: JamiTheme.textColor
+
+                    font.pixelSize: JamiTheme.creditsTextSize
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    text: textMetricsjamiDeclarationHyperText.text
+                    textFormat: TextEdit.RichText
+                    selectByMouse: true
+                    readOnly: true
+                    onLinkActivated: Qt.openUrlExternally(link)
+
+                    TextMetrics {
+                        id: textMetricsjamiDeclarationHyperText
+                        font: jamiDeclarationHyperText.font
+                        text: '<a href="https://jami.net" style="color: ' + JamiTheme.blueLinkColor + '">jami.net</a>'
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+
+                        // We don't want to eat clicks on the Text.
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                TextEdit {
+                    id: jamiNoneWarrantyHyperText
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.topMargin: 15
+                    wrapMode: Text.WordWrap
+                    font.pixelSize: JamiTheme.tinyCreditsTextSize
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignTop
+                    color: JamiTheme.textColor
+
+                    text: textMetricsjamiNoneWarrantyHyperText.text
+                    textFormat: TextEdit.RichText
+                    selectByMouse: true
+                    readOnly: true
+                    onLinkActivated: Qt.openUrlExternally(link)
+
+                    TextMetrics {
+                        id: textMetricsjamiNoneWarrantyHyperText
+                        font: jamiDeclarationHyperText.font
+                        text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.blueLinkColor + '">Savoir-faire Linux Inc.</a><br>' + 'This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.blueLinkColor + '">GNU General Public License</a>, version 3 or later for details.'
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                ProjectCreditsScrollView {
+                    id: projectCreditsScrollView
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+                    Layout.preferredHeight: 100
+                    Layout.topMargin: 25
+                    Layout.margins: JamiTheme.preferredMarginSize
+                }
         }
     }
 }

src/app/mainview/components/CachedImage.qml

@@ -42,7 +42,10 @@ Item {
         fillMode: imageFillMode
         smooth: true
         antialiasing: true
-        property bool isGif: getIsGif(this)
+        property bool isGif: {
+            // True only for local gifs.
+            UtilsAdapter.getMimeNameForUrl(source).startsWith("image/gif");
+        }
 
         source: defaultImage
         onStatusChanged: {
@@ -52,22 +55,11 @@ Item {
         }
     }
 
-    function getIsGif(img) {
-        if (img.source && img.source != "") {
-            var localPath = img.source.toString();
-            if (localPath.startsWith("file://")) {
-                localPath = localPath.substring(7);
-            }
-            return UtilsAdapter.getMimeName(localPath).startsWith("image/gif");
-        }
-        return false;
-    }
-
     Connections {
         target: ImageDownloader
         function onDownloadImageSuccessful(localPath) {
             if (localPath === cachedImage.localPath) {
-                image.source = "file://" + localPath;
+                image.source = UtilsAdapter.urlFromLocalPath(localPath);
             }
         }
     }
@@ -92,7 +84,7 @@ Item {
             if (!UtilsAdapter.fileExists(localPath)) {
                 ImageDownloader.downloadImage(downloadUrl, localPath);
             } else {
-                image.source = "file://" + localPath;
+                image.source = UtilsAdapter.urlFromLocalPath(localPath);
                 if (image.isGif) {
                     image.playing = true;
                 }

src/app/mainview/components/CallButtonDelegate.qml

@@ -203,61 +203,70 @@ ItemDelegate {
                 anchors.fill: parent
                 color: menuItem.down ? "#c4aaaaaa" : menuItem.hovered ? "#c4777777" : "transparent"
             }
-            contentItem: ColumnLayout {
+            // After update to qt 6.4.3 the layout was broken, adding a Rectangle
+            // as top level in the contentIntem is a workaround which removal can be
+            // tested with newer qt versions
+            contentItem: Rectangle {
                 anchors.fill: parent
-                spacing: 0
-                RowLayout {
-                    Layout.fillWidth: true
-                    Layout.rightMargin: 15
-                    Layout.leftMargin: 20
-                    Layout.fillHeight: true
-                    Layout.alignment: {
-                        if (menuAction.popupMode !== CallActionBar.ActionPopupMode.LayoutOption || TopMargin && BottomMargin) {
-                            return Qt.AlignLeft | Qt.AlignVCenter;
-                        }
-                        if (TopMargin) {
-                            Layout.bottomMargin = 4;
-                            return Qt.AlignBottom;
-                        }
-                        Layout.topMargin = 4;
-                        return Qt.AlignTop;
-                    }
+                color: "transparent"
+                ColumnLayout {
+                    anchors.fill: parent
+                    spacing: 0
 
-                    spacing: 6
-                    ResponsiveImage {
-                        source: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? IconSource : (menuItem.ListView.isCurrentItem ? JamiResources.check_box_24dp_svg : JamiResources.check_box_outline_blank_24dp_svg)
-                        color: "white"
-                        width: 20
-                        height: 20
-                    }
-                    Text {
-                        id: delegateText
+                    RowLayout {
                         Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignLeft
-                        verticalAlignment: Text.AlignVCenter
-                        text: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? Name : DeviceName
-                        elide: Text.ElideRight
-                        font.pointSize: JamiTheme.participantFontSize
-                        color: "white"
+                        Layout.fillHeight: true
+                        Layout.rightMargin: 15
+                        Layout.leftMargin: 20
+
+                        Layout.alignment: {
+                            if (menuAction.popupMode !== CallActionBar.ActionPopupMode.LayoutOption || TopMargin && BottomMargin) {
+                                return Qt.AlignLeft | Qt.AlignVCenter;
+                            }
+                            if (TopMargin) {
+                                Layout.bottomMargin = 4;
+                                return Qt.AlignBottom;
+                            }
+                            Layout.topMargin = 4;
+                            return Qt.AlignTop;
+                        }
+
+                        spacing: 6
+                        ResponsiveImage {
+                            source: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? IconSource : (menuItem.ListView.isCurrentItem ? JamiResources.check_box_24dp_svg : JamiResources.check_box_outline_blank_24dp_svg)
+                            color: "white"
+                            width: 20
+                            height: 20
+                        }
+                        Text {
+                            id: delegateText
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+                            text: menuAction.popupMode === CallActionBar.ActionPopupMode.ListElement || menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? Name : DeviceName
+                            elide: Text.ElideRight
+                            font.pointSize: JamiTheme.participantFontSize
+                            color: "white"
+                        }
+                        ResponsiveImage {
+                            source: JamiResources.check_black_24dp_svg
+                            color: "white"
+                            width: 20
+                            height: 20
+                            visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? ActiveSetting : false
+                        }
                     }
-                    ResponsiveImage {
-                        source: JamiResources.check_black_24dp_svg
-                        color: "white"
-                        width: 20
-                        height: 20
-                        visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? ActiveSetting : false
+                    Rectangle {
+                        id: buttonDiv
+                        visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? SectionEnd : false
+                        Layout.fillWidth: true
+                        height: 1
+                        opacity: 0.2
+                        border.width: 0
+                        color: JamiTheme.separationLine
+                        Layout.alignment: Qt.AlignBottom
                     }
                 }
-                Rectangle {
-                    id: buttonDiv
-                    visible: menuAction.popupMode === CallActionBar.ActionPopupMode.LayoutOption ? SectionEnd : false
-                    Layout.fillWidth: true
-                    height: 1
-                    opacity: 0.2
-                    border.width: 0
-                    color: JamiTheme.separationLine
-                    Layout.alignment: Qt.AlignBottom
-                }
             }
         }
 

src/app/mainview/components/ChatView.qml

@@ -169,12 +169,6 @@ Rectangle {
             }
         }
 
-        GenericErrorsRow {
-            id: genericError
-            Layout.fillWidth: true
-            Layout.preferredHeight: JamiTheme.chatViewHeaderPreferredHeight
-        }
-
         ConversationErrorsRow {
             id: errorRect
             Layout.fillWidth: true

src/app/mainview/components/ChatViewFooter.qml

@@ -79,6 +79,8 @@ Rectangle {
                 var editedMessageBody = MessagesAdapter.dataForInteraction(MessagesAdapter.editId, MessageList.Body);
                 messageBar.textAreaObj.insertText(editedMessageBody);
                 messageBar.textAreaObj.forceActiveFocus();
+            } else {
+                messageBar.textAreaObj.clearText();
             }
         }
 
@@ -115,7 +117,6 @@ Rectangle {
 
         EditContainer {
             id: editContainer
-
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
             Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
@@ -129,7 +130,7 @@ Rectangle {
 
             Layout.alignment: Qt.AlignHCenter
             Layout.preferredWidth: footerColumnLayout.width
-            Layout.leftMargin: marginSize
+            Layout.leftMargin: 0
             Layout.rightMargin: marginSize
             Layout.bottomMargin: marginSize
             Layout.preferredHeight: height

src/app/mainview/components/ChatViewHeader.qml

@@ -86,8 +86,7 @@ Rectangle {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
             Layout.leftMargin: 8
 
-            preferredSize: 24
-
+            //preferredSize: 24
             mirror: UtilsAdapter.isRTL
 
             source: JamiResources.back_24dp_svg
@@ -155,12 +154,12 @@ Rectangle {
 
             Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
             Layout.preferredHeight: 30
-            Layout.preferredWidth: 40 + (isOpen? JamiTheme.searchbarSize : 0)
+            Layout.preferredWidth: 40 + (isOpen ? JamiTheme.searchbarSize : 0)
             colorSearchBar: JamiTheme.backgroundColor
 
             hoverButtonRadius: JamiTheme.chatViewHeaderButtonRadius
 
-            Behavior on Layout.preferredWidth {
+            Behavior on Layout.preferredWidth  {
                 NumberAnimation {
                     duration: 150
                 }
@@ -168,7 +167,7 @@ Rectangle {
 
             visible: root.swarmDetailsVisibility
 
-            onSearchBarTextChanged: function(text){
+            onSearchBarTextChanged: function (text) {
                 MessagesAdapter.searchbarPrompt = text;
             }
 

src/app/mainview/components/ContactPicker.qml

@@ -28,11 +28,6 @@ BaseModalDialog {
 
     property int type: ContactList.CONFERENCE
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
-    padding: 0
-
     title: {
         switch (type) {
         case ContactList.CONFERENCE:
@@ -48,6 +43,8 @@ BaseModalDialog {
 
     popupContent: ColumnLayout {
         id: contactPickerPopupRectColumnLayout
+        anchors.centerIn: parent
+        width: 400
 
         Searchbar {
             id: contactPickerContactSearchBar
@@ -81,8 +78,4 @@ BaseModalDialog {
             }
         }
     }
-
-    onAboutToShow: {
-        contactPickerListView.model = ContactAdapter.getContactSelectableModel(type);
-    }
 }

src/app/mainview/components/DevicesListPopup.qml

@@ -27,44 +27,26 @@ import "../../commoncomponents"
 BaseModalDialog {
     id: root
 
-    width: 488
-    height: 320
+    width: JamiTheme.secondaryDialogDimension
 
-    popupContent: Rectangle {
-        id: rect
+    title: JamiStrings.defaultCallHost
 
-        color: JamiTheme.transparentColor
-        width: root.width
-
-        PushButton {
-            id: btnCancel
-            imageColor: "grey"
-            normalColor: "transparent"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.rightMargin: 10
-            source: JamiResources.round_close_24dp_svg
-            onClicked: {
-                close();
-            }
-        }
-
-        ColumnLayout {
+    popupContent: ColumnLayout {
             id: mainLayout
-            anchors.fill: parent
+
+            anchors.centerIn: parent
             anchors.margins: JamiTheme.preferredMarginSize
             spacing: JamiTheme.preferredMarginSize
 
+
             Label {
                 id: informativeLabel
 
                 Layout.alignment: Qt.AlignCenter
-                Layout.fillWidth: true
-                Layout.topMargin: 26
-                wrapMode: Text.WordWrap
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
+                Layout.topMargin: JamiTheme.preferredMarginSize
+                Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
+
+                wrapMode: Text.Wrap
                 text: JamiStrings.chooseHoster
                 color: JamiTheme.primaryForegroundColor
             }
@@ -97,7 +79,7 @@ BaseModalDialog {
                     property bool isCurrent: DeviceName
 
                     implicitWidth: devicesListView.width
-                    width: devicesListView.width
+                    width: root.width - 4*JamiTheme.preferredMarginSize
                     height: 70
 
                     highlighted: ListView.isCurrentItem
@@ -136,7 +118,6 @@ BaseModalDialog {
                         ColumnLayout {
                             id: deviceInfoColumnLayout
 
-                            Layout.fillWidth: true
                             Layout.fillHeight: true
                             Layout.leftMargin: JamiTheme.preferredMarginSize
 
@@ -144,7 +125,6 @@ BaseModalDialog {
                                 id: labelDeviceName
 
                                 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                Layout.fillWidth: true
 
                                 elide: Text.ElideRight
                                 color: JamiTheme.textColor
@@ -155,7 +135,7 @@ BaseModalDialog {
                                 id: labelDeviceId
 
                                 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                Layout.fillWidth: true
+                                Layout.preferredWidth: root.width - 200
 
                                 elide: Text.ElideRight
                                 color: JamiTheme.textColor
@@ -175,9 +155,10 @@ BaseModalDialog {
                 }
             }
 
-            RowLayout {
+            ColumnLayout {
+                id: buttonLayout
                 spacing: JamiTheme.preferredMarginSize
-                Layout.preferredWidth: parent.width
+                Layout.preferredWidth: root.width - 240
 
                 MaterialButton {
                     id: chooseBtn
@@ -192,8 +173,8 @@ BaseModalDialog {
 
                     Layout.alignment: Qt.AlignCenter
                     Layout.fillWidth: true
+
                     primary: true
-                    preferredWidth: chooseBtnTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
                     enabled: devicesListView.currentItem
 
                     text: JamiStrings.chooseThisDevice
@@ -220,7 +201,6 @@ BaseModalDialog {
                     Layout.alignment: Qt.AlignCenter
                     Layout.fillWidth: true
                     primary: true
-                    preferredWidth: rmDeviceBtnTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
                     enabled: devicesListView.currentItem
 
                     text: JamiStrings.removeCurrentDevice
@@ -235,4 +215,4 @@ BaseModalDialog {
             }
         }
     }
-}
+

src/app/mainview/components/DonationBanner.qml

@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import net.jami.Adapters 1.1
+import net.jami.Constants 1.1
+import net.jami.Enums 1.1
+import net.jami.Models 1.1
+import "../../commoncomponents"
+import "../../settingsview/components"
+
+Rectangle {
+    id: donation
+
+    property bool donationVisible: JamiQmlUtils.isDonationBannerVisible()
+
+    width: parent.width - 30
+    height: donationTextRect.height + 45 > donationIcon.height + 20 ? donationTextRect.height + 45 : donationIcon.height + 20
+    radius: 5
+
+    color: JamiTheme.donationBackgroundColor
+
+    GridLayout {
+        id: donationLayout
+
+        anchors.fill: parent
+        columns: 3
+        rows: 2
+        rowSpacing: 0
+        columnSpacing: 10
+
+        Rectangle {
+            id: donationIcon
+
+            Layout.row: 0
+            Layout.column: 0
+            Layout.rowSpan: 2
+            Layout.preferredHeight: 70
+            Layout.preferredWidth: 45
+            Layout.leftMargin: 10
+            Layout.topMargin: 10
+            Layout.bottomMargin: 15
+
+            color: JamiTheme.transparentColor
+
+            Image {
+                id: donationImage
+                height: parent.height
+                width: 50
+                anchors.centerIn: parent
+                source: JamiResources.icon_donate_svg
+            }
+        }
+
+        Rectangle {
+            id: donationTextRect
+
+            Layout.topMargin: 10
+            Layout.row: 0
+            Layout.column: 1
+            Layout.columnSpan: 2
+            Layout.preferredHeight: donationText.height
+            Layout.preferredWidth: parent.width - 74
+            Layout.bottomMargin: 5
+            color: JamiTheme.transparentColor
+
+            Text {
+                id: donationText
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                width: parent.width
+                height: contentHeight
+                text: JamiStrings.donationText
+                wrapMode: Text.WordWrap
+
+                font.pointSize: JamiTheme.textFontSize
+            }
+        }
+
+        Rectangle {
+            id: notNowRect
+
+            Layout.row: 1
+            Layout.column: 1
+            Layout.preferredHeight: 30
+            Layout.preferredWidth: (parent.width - 55) / 2
+
+            color: JamiTheme.transparentColor
+
+            Text {
+                id: notNowText
+                MouseArea {
+                    cursorShape: Qt.PointingHandCursor
+                    anchors.fill: parent
+                    onClicked: {
+                        // When the user clicks on "Not now", we set the donation date to 7 days from now (1 for the test)
+                        UtilsAdapter.setAppValue(Settings.Key.DonationVisibleDate, new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 16).replace("T", " "));
+                        donation.donationVisible = Qt.binding(() => JamiQmlUtils.isDonationBannerVisible());
+                    }
+                }
+                text: JamiStrings.notNow
+                color: JamiTheme.donationButtonTextColor
+                anchors.top: parent.top
+                anchors.left: parent.left
+                font.pointSize: JamiTheme.textFontSize
+            }
+        }
+
+        Rectangle {
+            id: donateRect
+            Layout.row: 1
+            Layout.column: 2
+            Layout.preferredHeight: 30
+            Layout.preferredWidth: (parent.width - 50) / 2
+            color: JamiTheme.transparentColor
+
+            Text {
+                id: donateText
+                MouseArea {
+                    cursorShape: Qt.PointingHandCursor
+                    anchors.fill: parent
+                    onClicked: {
+                        Qt.openUrlExternally(JamiTheme.donationUrl);
+                    }
+                }
+                text: JamiStrings.donation
+                font.pointSize: JamiTheme.textFontSize
+                color: JamiTheme.donationButtonTextColor
+                anchors.top: parent.top
+                anchors.left: parent.left
+            }
+        }
+    }
+}

src/app/mainview/components/DonationTipBox.qml

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import net.jami.Constants 1.1
+import "../../commoncomponents"
+
+Item {
+    id: root
+    focus: true
+    width: parent.width
+    height: backupLayout.height
+
+    property real iconSize: 26
+    property real margin: 5
+    property real preferredWidth: 170
+
+    property real maxHeight: 250
+
+    property color textColor: JamiTheme.textColor
+    property color iconColor: JamiTheme.tintedBlue
+
+    ColumnLayout {
+        id: backupLayout
+
+        anchors.top: parent.top
+        width: parent.width
+
+        RowLayout {
+            id: rowlayout
+
+            Layout.leftMargin: 15
+            Layout.alignment: Qt.AlignLeft
+
+            ResponsiveImage {
+                id: icon
+
+                visible: !opened
+
+                Layout.alignment: Qt.AlignLeft
+                Layout.topMargin: root.margin
+                Layout.preferredWidth: root.iconSize
+                Layout.preferredHeight: root.iconSize
+
+                containerHeight: Layout.preferredHeight
+                containerWidth: Layout.preferredWidth
+
+                color: JamiTheme.tintedBlue
+
+                source: JamiResources.favorite_black_24dp_svg
+            }
+
+            Text {
+                id: title
+                text: JamiStrings.donation
+                color: root.textColor
+                font.weight: Font.Medium
+                Layout.topMargin: root.margin
+                Layout.alignment: Qt.AlignLeft
+                Layout.leftMargin: root.margin
+                Layout.preferredWidth: root.preferredWidth - 2 * root.margin - root.iconSize
+                font.pixelSize: JamiTheme.tipBoxTitleFontSize
+                horizontalAlignment: Text.AlignLeft
+                elide: Qt.ElideRight
+            }
+        }
+
+        Text {
+            id: content
+            Layout.preferredWidth: root.preferredWidth
+            focus: true
+            Layout.leftMargin: 20
+            Layout.topMargin: 8
+            Layout.bottomMargin: 8
+            font.pixelSize: JamiTheme.tipBoxContentFontSize
+            visible: true
+            wrapMode: Text.WordWrap
+            font.weight: Font.Normal
+            text: JamiStrings.donationTipBoxText
+            color: root.textColor
+            horizontalAlignment: Text.AlignLeft
+            linkColor: JamiTheme.buttonTintedBlue
+            onLinkActivated: {
+                Qt.openUrlExternally(JamiTheme.donationUrl);
+            }
+        }
+    }
+}

src/app/mainview/components/GenericErrorsRow.qml

@@ -31,7 +31,11 @@ Rectangle {
     property alias text: errorLabel.text
 
     color: JamiTheme.filterBadgeColor
-    visible: CurrentAccount.status === Account.Status.UNREGISTERED
+    visible: CurrentAccount.id !== ""
+             && CurrentAccount.status !== Account.Status.REGISTERED
+             && CurrentAccount.status !== Account.Status.READY
+             && CurrentAccount.status !== Account.Status.TRYING
+             && CurrentAccount.status !== Account.Status.INITIALIZING
 
     RowLayout {
         anchors.fill: parent
@@ -41,7 +45,6 @@ Rectangle {
             id: errorLabel
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignVCenter
-            text: CurrentAccount.enabled ? JamiStrings.noNetworkConnectivity : JamiStrings.disabledAccount
             color: JamiTheme.filterBadgeTextColor
             font.pixelSize: JamiTheme.headerFontSize
             elide: Text.ElideRight

src/app/mainview/components/HostPopup.qml

@@ -26,45 +26,21 @@ import "../../commoncomponents"
 BaseModalDialog {
     id: root
 
-    width: 488
-    height: 256
-
     property bool isAdmin: {
         var role = UtilsAdapter.getParticipantRole(CurrentAccount.id, CurrentConversation.id, CurrentAccount.uri);
         return role === Member.Role.ADMIN;
     }
 
-    popupContent: Rectangle {
-        id: rect
-
-        color: JamiTheme.transparentColor
-        width: root.width
-
-        PushButton {
-            id: btnCancel
-            imageColor: "grey"
-            normalColor: "transparent"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 10
-            anchors.rightMargin: 10
-            source: JamiResources.round_close_24dp_svg
-            onClicked: {
-                close();
-            }
-        }
-
-        ColumnLayout {
+    popupContent: ColumnLayout {
             id: mainLayout
-            anchors.fill: parent
-            anchors.margins: JamiTheme.preferredMarginSize
+            spacing: JamiTheme.preferredMarginSize
 
             Label {
                 id: informativeLabel
 
                 Layout.alignment: Qt.AlignCenter
                 Layout.fillWidth: true
-                Layout.topMargin: 26
+                Layout.maximumWidth: root.parent.width - 4*JamiTheme.preferredMarginSize
                 wrapMode: Text.WordWrap
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
@@ -77,7 +53,7 @@ BaseModalDialog {
 
                 Layout.alignment: Qt.AlignCenter
 
-                Layout.topMargin: 26
+                Layout.margins: JamiTheme.preferredMarginSize
                 text: isAdmin ? JamiStrings.becomeHostOneCall : JamiStrings.hostThisCall
 
                 onClicked: {
@@ -90,6 +66,7 @@ BaseModalDialog {
                 id: becomeDefaultHostBtn
 
                 Layout.alignment: Qt.AlignCenter
+                Layout.margins: JamiTheme.preferredMarginSize
 
                 text: JamiStrings.becomeDefaultHost
                 toolTipText: JamiStrings.becomeDefaultHost
@@ -105,4 +82,4 @@ BaseModalDialog {
             }
         }
     }
-}
+//}

src/app/mainview/components/KeyboardShortcutKeyDelegate.qml

@@ -25,6 +25,9 @@ RowLayout {
 
     layoutDirection: UtilsAdapter.isRTL ? Qt.RightToLeft : Qt.LeftToRight
 
+    focus: true
+
+    // Needs to get focus so Orca can read the shortcut
     Rectangle {
         id: descriptionTextRect
 
@@ -36,6 +39,8 @@ RowLayout {
 
         color: JamiTheme.transparentColor
 
+        focus: true
+
         Text {
             id: descriptionText
 
@@ -48,6 +53,7 @@ RowLayout {
         }
     }
 
+    // Needs to get focus as well so Orca can read the shortcut
     Rectangle {
         id: shortcutTextRect
 
@@ -58,6 +64,7 @@ RowLayout {
         Layout.rightMargin: 10
 
         color: JamiTheme.backgroundColor
+
         radius: JamiTheme.primaryRadius
 
         Text {

src/app/mainview/components/KeyboardShortcutTable.qml

@@ -32,342 +32,317 @@ Window {
     height: 480
     minimumHeight: 300
 
-    ListModel {
-        id: keyboardGeneralShortcutsModel
+    readonly property list<ListModel> keyboardShortcutsModelList: [
+        ListModel {
+            id: keyboardGeneralShortcutsModel
 
-        ListElement {
-            shortcut: "Ctrl + J"
-            shortcut2: ""
-            description: qsTr("Open account list")
-        }
-        ListElement {
-            shortcut: "Ctrl + L"
-            shortcut2: ""
-            description: qsTr("Focus conversations list")
-        }
-        ListElement {
-            shortcut: "Ctrl + R"
-            shortcut2: ""
-            description: qsTr("Requests list")
-        }
-        ListElement {
-            shortcut: "Ctrl + ↑"
-            shortcut2: ""
-            description: qsTr("Previous conversation")
-        }
-        ListElement {
-            shortcut: "Ctrl + ↓"
-            shortcut2: ""
-            description: qsTr("Next conversation")
-        }
-        ListElement {
-            shortcut: "Ctrl + F"
-            shortcut2: ""
-            description: qsTr("Search bar")
-        }
-        ListElement {
-            shortcut: "F11"
-            shortcut2: ""
-            description: qsTr("Full screen")
-        }
-        ListElement {
-            shortcut: "Ctrl + +"
-            shortcut2: ""
-            description: qsTr("Increase font size")
-        }
-        ListElement {
-            shortcut: "Ctrl + -"
-            shortcut2: ""
-            description: qsTr("Decrease font size")
-        }
-        ListElement {
-            shortcut: "Ctrl + 0"
-            shortcut2: ""
-            description: qsTr("Reset font size")
-        }
-    }
+            ListElement {
+                shortcut: "Ctrl + J"
+                description: qsTr("Open account list")
+            }
+            ListElement {
+                shortcut: "Ctrl + L"
+                description: qsTr("Focus conversations list")
+            }
+            ListElement {
+                shortcut: "Ctrl + R"
+                description: qsTr("Requests list")
+            }
+            ListElement {
+                shortcut: "Ctrl + ↑"
+                description: qsTr("Previous conversation")
+            }
+            ListElement {
+                shortcut: "Ctrl + ↓"
+                description: qsTr("Next conversation")
+            }
+            ListElement {
+                shortcut: "Ctrl + F"
+                description: qsTr("Search bar")
+            }
+            ListElement {
+                shortcut: "F11"
+                description: qsTr("Full screen")
+            }
+            ListElement {
+                shortcut: "Ctrl + +"
+                description: qsTr("Increase font size")
+            }
+            ListElement {
+                shortcut: "Ctrl + -"
+                description: qsTr("Decrease font size")
+            }
+            ListElement {
+                shortcut: "Ctrl + 0"
+                description: qsTr("Reset font size")
+            }
+        },
+        ListModel {
+            id: keyboardConversationShortcutsModel
 
-    ListModel {
-        id: keyboardConversationShortcutsModel
+            ListElement {
+                shortcut: "Ctrl + Shift + C"
+                description: qsTr("Start an audio call")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + X"
+                description: qsTr("Start a video call")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + L"
+                description: qsTr("Clear history")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + F"
+                description: qsTr("Search messages/files")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + B"
+                description: qsTr("Block contact")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + Delete"
+                description: qsTr("Remove conversation")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + A"
+                description: qsTr("Accept contact request")
+            }
+            ListElement {
+                shortcut: "↑"
+                description: qsTr("Edit last message")
+            }
+            ListElement {
+                shortcut: "Esc"
+                description: qsTr("Cancel message edition")
+            }
+        },
+        ListModel {
+            id: keyboardSettingsShortcutsModel
 
-        ListElement {
-            shortcut: "Ctrl + Shift + C"
-            shortcut2: ""
-            description: qsTr("Start an audio call")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + X"
-            shortcut2: ""
-            description: qsTr("Start a video call")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + L"
-            shortcut2: ""
-            description: qsTr("Clear history")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + F"
-            shortcut2: ""
-            description: qsTr("Search messages/files")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + B"
-            shortcut2: ""
-            description: qsTr("Block contact")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + Delete"
-            shortcut2: ""
-            description: qsTr("Remove conversation")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + A"
-            shortcut2: ""
-            description: qsTr("Accept contact request")
-        }
-        ListElement {
-            shortcut: "↑"
-            shortcut2: ""
-            description: qsTr("Edit last message")
-        }
-        ListElement {
-            shortcut: "Esc"
-            shortcut2: ""
-            description: qsTr("Cancel message edition")
-        }
-    }
+            ListElement {
+                shortcut: "Ctrl + M"
+                description: qsTr("Media settings")
+            }
+            ListElement {
+                shortcut: "Ctrl + G"
+                description: qsTr("General settings")
+            }
+            ListElement {
+                shortcut: "Ctrl + Alt + I"
+                description: qsTr("Account settings")
+            }
+            ListElement {
+                shortcut: "Ctrl + P"
+                description: qsTr("Plugin settings")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + N"
+                description: qsTr("Open account creation wizard")
+            }
+            ListElement {
+                shortcut: "F10"
+                shortcut2: ""
+                description: qsTr("Open keyboard shortcut table")
+            }
+        },
+        ListModel {
+            id: keyboardCallsShortcutsModel
 
-    ListModel {
-        id: keyboardSettingsShortcutsModel
+            ListElement {
+                shortcut: "Ctrl + Y"
+                description: qsTr("Answer an incoming call")
+            }
+            ListElement {
+                shortcut: "Ctrl + D"
+                description: qsTr("End call")
+            }
+            ListElement {
+                shortcut: "Ctrl + Shift + D"
+                description: qsTr("Decline the call request")
+            }
+            ListElement {
+                shortcut: "M"
+                description: qsTr("Mute microphone")
+            }
+            ListElement {
+                shortcut: "V"
+                description: qsTr("Stop camera")
+            }
+            ListElement {
+                shortcut: "Ctrl + Mouse middle click"
+                description: qsTr("Take tile screenshot")
+            }
+        },
+        ListModel {
+            id: keyboardMarkdownShortcutsModel
 
-        ListElement {
-            shortcut: "Ctrl + M"
-            shortcut2: ""
-            description: qsTr("Media settings")
+            ListElement {
+                shortcut: "Ctrl + B"
+                description: qsTr("Bold")
+            }
+            ListElement {
+                shortcut: "Ctrl + I"
+                description: qsTr("Italic")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + X"
+                description: qsTr("Strikethrough")
+            }
+            ListElement {
+                shortcut: "Ctrl + Alt + H"
+                description: qsTr("Heading")
+            }
+            ListElement {
+                shortcut: "Ctrl + Alt + K"
+                description: qsTr("Link")
+            }
+            ListElement {
+                shortcut: "Ctrl + Alt + C"
+                description: qsTr("Code")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + 9"
+                description: qsTr("Quote")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + 8"
+                description: qsTr("Unordered list")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + 7"
+                description: qsTr("Ordered list")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + T"
+                description: qsTr("Show formatting")
+            }
+            ListElement {
+                shortcut: "Shift + Alt + P"
+                description: qsTr("Show preview")
+            }
         }
-        ListElement {
-            shortcut: "Ctrl + G"
-            shortcut2: ""
-            description: qsTr("General settings")
-        }
-        ListElement {
-            shortcut: "Ctrl + Alt + I"
-            shortcut2: ""
-            description: qsTr("Account settings")
-        }
-        ListElement {
-            shortcut: "Ctrl + P"
-            shortcut2: ""
-            description: qsTr("Plugin settings")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + N"
-            shortcut2: ""
-            description: qsTr("Open account creation wizard")
-        }
-        ListElement {
-            shortcut: "F10"
-            shortcut2: ""
-            description: qsTr("Open keyboard shortcut table")
-        }
-    }
+    ]
 
-    ListModel {
-        id: keyboardCallsShortcutsModel
-
-        ListElement {
-            shortcut: "Ctrl + Y"
-            shortcut2: ""
-            description: qsTr("Answer an incoming call")
-        }
-        ListElement {
-            shortcut: "Ctrl + D"
-            shortcut2: ""
-            description: qsTr("End call")
-        }
-        ListElement {
-            shortcut: "Ctrl + Shift + D"
-            shortcut2: ""
-            description: qsTr("Decline the call request")
-        }
-        ListElement {
-            shortcut: "M"
-            shortcut2: ""
-            description: qsTr("Mute microphone")
-        }
-        ListElement {
-            shortcut: "V"
-            shortcut2: ""
-            description: qsTr("Stop camera")
-        }
-        ListElement {
-            shortcut: "Ctrl"
-            shortcut2: qsTr("Mouse middle click")
-            description: qsTr("Take tile screenshot")
-        }
-    }
-
-    ListModel {
-        id: keyboardMarkdownShortcutsModel
-
-        ListElement {
-            shortcut: "Ctrl + B"
-            shortcut2: ""
-            description: qsTr("Bold")
-        }
-        ListElement {
-            shortcut: "Ctrl + I"
-            shortcut2: ""
-            description: qsTr("Italic")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + X"
-            shortcut2: ""
-            description: qsTr("Strikethrough")
-        }
-        ListElement {
-            shortcut: "Ctrl + Alt + H"
-            shortcut2: ""
-            description: qsTr("Heading")
-        }
-        ListElement {
-            shortcut: "Ctrl + Alt + K"
-            shortcut2: ""
-            description: qsTr("Link")
-        }
-        ListElement {
-            shortcut: "Ctrl + Alt + C"
-            shortcut2: ""
-            description: qsTr("Code")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + 9"
-            shortcut2: ""
-            description: qsTr("Quote")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + 8"
-            shortcut2: ""
-            description: qsTr("Unordered list")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + 7"
-            shortcut2: ""
-            description: qsTr("Ordered list")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + T"
-            shortcut2: ""
-            description: qsTr("Show formatting")
-        }
-        ListElement {
-            shortcut: "Shift + Alt + P"
-            shortcut2: ""
-            description: qsTr("Show preview")
-        }
-    }
-
-    Rectangle {
-        id: windowRect
+    Page {
+        id: page
 
         anchors.fill: parent
 
-        color: JamiTheme.secondaryBackgroundColor
+        // make a list view of keyboardShortcutsModelList[selectionBar.currentIndex]
+        JamiListView {
+            id: keyboardShortcutsListView
 
-        Rectangle {
-            id: titleRect
+            anchors.fill: parent
+            anchors.leftMargin: 48
+            anchors.rightMargin: 48
 
-            anchors.top: parent.top
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.topMargin: JamiTheme.titleRectMargin
+            Keys.onUpPressed: keyboardShortcutsListView.decrementCurrentIndex()
+            Keys.onDownPressed: keyboardShortcutsListView.incrementCurrentIndex()
 
-            height: titleName.contentHeight + JamiTheme.titleRectMargin
-            width: titleName.contentWidth + JamiTheme.titleRectMargin
+            // on key tab forceActiveFocus
+            Keys.onTabPressed: if (activeFocus)
+                selectionBar.forceActiveFocus()
 
-            color: JamiTheme.backgroundColor
-            radius: JamiTheme.primaryRadius
+            model: keyboardShortcutsModelList[selectionBar.currentIndex]
+            spacing: 24
+            delegate: FocusScope {
+                id: fs
+                height: childrenRect.height
+                focus: true
 
-            Text {
-                id: titleName
+                // Accessible.role: Accessible.Button
+                Accessible.name: descriptionLabel.text
+                Accessible.description: shortcutLabel.text
 
-                anchors.centerIn: parent
-
-                font.pointSize: JamiTheme.titleFontSize
-                text: {
-                    var modelId = UtilsAdapter.isRTL ? 4 - selectionBar.currentIndex : selectionBar.currentIndex
-                    switch (modelId) {
-                    case 0:
-                        return JamiStrings.generalSettingsTitle;
-                    case 1:
-                        return JamiStrings.conversationKeyboardShortcuts;
-                    case 2:
-                        return JamiStrings.callKeyboardShortcuts;
-                    case 3:
-                        return JamiStrings.settings;
-                    case 4:
-                        return JamiStrings.markdownKeyboardShortcuts;
+                RowLayout {
+                    width: keyboardShortcutsListView.width
+                    Label {
+                        id: descriptionLabel
+                        Layout.alignment: Qt.AlignLeft
+                        Layout.topMargin: 8
+                        Layout.leftMargin: 20
+                        text: description
+                        background: Rectangle {
+                            width: parent.width + 16
+                            height: parent.height + 16
+                            border.color: fs.activeFocus ? "darkblue" : "transparent"
+                            border.width: 2
+                            radius: 5
+                            anchors.centerIn: parent
+                        }
+                    }
+                    Label {
+                        id: shortcutLabel
+                        Layout.alignment: Qt.AlignRight
+                        Layout.topMargin: 8
+                        Layout.rightMargin: 20
+                        text: shortcut
+                        background: Rectangle {
+                            width: parent.width + 16
+                            height: parent.height + 16
+                            border.color: fs.activeFocus ? "darkblue" : "transparent"
+                            border.width: 2
+                            radius: 5
+                            anchors.centerIn: parent
+                        }
                     }
                 }
-                color: JamiTheme.textColor
             }
         }
 
-        JamiListView {
-            id: keyboardShortCutList
-
-            anchors.top: titleRect.bottom
-            anchors.topMargin: 10
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            width: parent.width
-            height: parent.height - titleRect.height - JamiTheme.titleRectMargin - keyboardShortCutList.anchors.topMargin - selectionBar.height - selectionBar.anchors.bottomMargin
-
-            model: {
-                var modelId = UtilsAdapter.isRTL ? 4 - selectionBar.currentIndex : selectionBar.currentIndex
-                switch (modelId) {
-                case 0:
-                    return keyboardGeneralShortcutsModel;
-                case 1:
-                    return keyboardConversationShortcutsModel;
-                case 2:
-                    return keyboardCallsShortcutsModel;
-                case 3:
-                    return keyboardSettingsShortcutsModel;
-                case 4:
-                    return keyboardMarkdownShortcutsModel;
-                }
-            }
-            delegate: KeyboardShortcutKeyDelegate {
-                width: keyboardShortCutList.width
-                height: Math.max(JamiTheme.keyboardShortcutDelegateSize, implicitHeight)
-            }
-        }
-
-        TabBar {
+        header: TabBar {
             id: selectionBar
 
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 10
-            anchors.horizontalCenter: parent.horizontalCenter
+            readonly property real lambda: 12
 
-            width: 96
-            height: JamiTheme.keyboardShortcutTabBarSize
-            contentHeight: JamiTheme.keyboardShortcutTabBarSize
-            background: Rectangle {
-                color: windowRect.color
-            }
+            spacing: lambda
+            padding: lambda
+
+            focus: true
 
             Repeater {
-                model: UtilsAdapter.isRTL ? ["5", "4", "3", "2", "1"] : ["1", "2", "3", "4", "5"]
+                model: [JamiStrings.generalSettingsTitle, JamiStrings.conversationKeyboardShortcuts, JamiStrings.callKeyboardShortcuts, JamiStrings.settings, JamiStrings.markdownKeyboardShortcuts]
 
-                KeyboardShortcutTabButton {
-                    currentIndex: selectionBar.currentIndex
-                    text: modelData
+                TabButton {
+                    id: tabButton
+
+                    Accessible.name: modelData + "shortcuts category"
+
+                    Keys.onTabPressed: if (activeFocus)
+                        keyboardShortcutsListView.forceActiveFocus()
+
+                    contentItem: Text {
+                        text: modelData
+                        color: JamiTheme.textColor
+                        font.pixelSize: JamiTheme.titleFontSize
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    background: Rectangle {
+                        border.color: tabButton.activeFocus ? "darkblue" : "transparent"
+                        border.width: 2
+
+                        color: {
+                            if (tabButton.checked || tabButton.pressed)
+                                return JamiTheme.pressedButtonColor;
+                            if (tabButton.hovered)
+                                return JamiTheme.hoveredButtonColor;
+                            else
+                                return JamiTheme.normalButtonColor;
+                        }
+                        radius: JamiTheme.primaryRadius
+                    }
                 }
             }
+        }
 
-            Component.onCompleted: {
-                setCurrentIndex(UtilsAdapter.isRTL ? 4 : 0);
+        footer: Item {
+            height: JamiTheme.keyboardShortcutTabBarSize
+            PageIndicator {
+                anchors.centerIn: parent
+                count: selectionBar.count
+                currentIndex: selectionBar.currentIndex
             }
         }
     }

src/app/mainview/components/MessageBar.qml

@@ -54,9 +54,11 @@ RowLayout {
     height: showTypo || multiLine ? messageBarTextArea.height + 25 + 3 * marginSize + 1 : textAreaObj.height + marginSize + 1
 
     Rectangle {
+
         Layout.preferredHeight: parent.height
         Layout.preferredWidth: childrenRect.width
         visible: !CurrentConversation.isSip
+        color: JamiTheme.transparentColor
         ComboBox {
             id: showMoreButton
             width: JamiTheme.chatViewFooterButtonSize
@@ -98,14 +100,22 @@ RowLayout {
                     showMoreButton.indicator.color = hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor;
                     showMoreButton.background.color = hovered ? JamiTheme.hoveredButtonColor : JamiTheme.transparentColor;
                 }
+                toolTipMoreButton.text = sharePopup.opened ? JamiStrings.showLess : JamiStrings.showMore;
+            }
+
+            onPressedChanged: {
+                if (sharePopup.enabled)
+                    sharePopup.close();
             }
 
             popup: SharePopup {
                 id: sharePopup
-                y: -180
+                y: -160
                 x: -20
 
                 menuMoreButton: listViewMoreButton.menuMoreButton
+
+                onClosed: messageBar.textAreaObj.forceActiveFocus()
             }
         }
     }
@@ -123,8 +133,6 @@ RowLayout {
 
         Layout.fillWidth: true
         Layout.fillHeight: true
-        Layout.rightMargin: marginSize
-        Layout.leftMargin: marginSize
 
         radius: 5
         color: JamiTheme.transparentColor
@@ -133,12 +141,10 @@ RowLayout {
 
         onWidthChanged: {
             height = Qt.binding(() => root.height);
-            if (width < 468) {
+            if (width < JamiTheme.messageBarMinimumWidth) {
                 showTypoSecond = false;
             } else {
-                if (width >= 468) {
-                    showTypoSecond = true;
-                }
+                showTypoSecond = true;
             }
         }
 
@@ -181,8 +187,12 @@ RowLayout {
                 onSendMessagesRequired: {
                     sendMessageButtonClicked();
                 }
-                onTextChanged: MessagesAdapter.userIsComposing(text ? true : false)
-
+                onTextChanged: {
+                    MessagesAdapter.userIsComposing(text ? true : false);
+                    if (!text) {
+                        messageBarTextArea.heightBinding();
+                    }
+                }
                 property var markdownShortCut: {
                     "Bold": function () {
                         if (!showPreview) {
@@ -206,32 +216,32 @@ RowLayout {
                     },
                     "Link": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(0).action.triggered();
+                            listViewTypoFirst.itemAtIndex(4).action.triggered();
                         }
                     },
                     "Code": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(1).action.triggered();
+                            listViewTypoFirst.itemAtIndex(5).action.triggered();
                         }
                     },
                     "Quote": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(2).action.triggered();
+                            listViewTypoSecond.itemAtIndex(0).action.triggered();
                         }
                     },
                     "Unordered list": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(3).action.triggered();
+                            listViewTypoSecond.itemAtIndex(1).action.triggered();
                         }
                     },
                     "Ordered list": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(4).action.triggered();
+                            listViewTypoSecond.itemAtIndex(2).action.triggered();
                         }
                     },
                     "Enter is new line": function () {
                         if (!showPreview) {
-                            listViewTypoSecond.itemAtIndex(5).action.triggered();
+                            listViewTypoSecond.itemAtIndex(3).action.triggered();
                         }
                     }
                 }
@@ -295,6 +305,8 @@ RowLayout {
                     context: Qt.ApplicationShortcut
                     onActivated: {
                         showTypo = !showTypo;
+                        messageBarTextArea.isShowTypo = showTypo;
+                        UtilsAdapter.setAppValue(Settings.Key.ShowMardownOption, showTypo);
                     }
                 }
 
@@ -658,11 +670,11 @@ RowLayout {
 
                                 normalColor: {
                                     if (showPreview) {
-                                        return JamiTheme.transparentColor;
+                                        return JamiTheme.primaryBackgroundColor;
                                     } else if (modelData.isStyle) {
                                         return JamiTheme.hoveredButtonColor;
                                     } else {
-                                        return JamiTheme.transparentColor;
+                                        return JamiTheme.primaryBackgroundColor;
                                     }
                                 }
                                 imageColor: {
@@ -685,7 +697,7 @@ RowLayout {
 
                         Rectangle {
                             height: JamiTheme.chatViewFooterButtonSize
-                            color: JamiTheme.transparentColor
+                            color: JamiTheme.primaryBackgroundColor
                             visible: showTypo && showTypoSecond
                             width: 2
 
@@ -700,7 +712,7 @@ RowLayout {
                         Rectangle {
                             z: -1
                             radius: 0
-                            color: JamiTheme.transparentColor
+                            color: JamiTheme.primaryBackgroundColor
                             width: JamiTheme.chatViewFooterButtonSize
                             height: JamiTheme.chatViewFooterButtonSize
 
@@ -718,11 +730,10 @@ RowLayout {
 
                                 MaterialToolTip {
                                     id: toolTip
-
                                     parent: showMoreTypoButton
                                     visible: showMoreTypoButton.hovered && (text.length > 0)
                                     delay: Qt.styleHints.mousePressAndHoldInterval
-                                    text: JamiStrings.showMore
+                                    text: markdownPopup.visible ? JamiStrings.showLess : JamiStrings.showMore
                                 }
 
                                 background: Rectangle {
@@ -747,9 +758,10 @@ RowLayout {
                                 }
 
                                 popup: MarkdownPopup {
+                                    id: markdownPopup
                                     y: 1.5 * parent.height
                                     x: -parent.width * 2
-                                    width: 155
+                                    width: 105
                                     height: JamiTheme.chatViewFooterButtonSize
 
                                     menuTypoActionsSecond: listViewTypoSecond.menuTypoActionsSecond
@@ -805,20 +817,6 @@ RowLayout {
                                     onTriggered: function clickAction() {
                                         listViewTypo.addPrefixStyle(root.text, messageBarTextArea.selectionStart, messageBarTextArea.selectionEnd, "", true);
                                     }
-                                },
-                                Action {
-                                    id: shiftEnterActiom
-                                    property var iconSrc: JamiResources.shift_enter_black_24dp_svg
-                                    property var shortcutText: chatViewEnterIsNewLine ? JamiStrings.enterNewLine : JamiStrings.shiftEnterNewLine
-                                    property var imageColor: chatViewEnterIsNewLine ? JamiTheme.chatViewFooterImgHoverColor : "#7f7f7f"
-                                    property var normalColor: chatViewEnterIsNewLine ? JamiTheme.hoveredButtonColor : JamiTheme.transparentColor
-                                    property var hasShortcut: false
-                                    property var shortcutKey: null
-                                    property bool isStyle: false
-                                    onTriggered: function clickAction() {
-                                        root.chatViewEnterIsNewLine = !root.chatViewEnterIsNewLine;
-                                        UtilsAdapter.setAppValue(Settings.Key.ChatViewEnterIsNewLine, chatViewEnterIsNewLine);
-                                    }
                                 }
                             ]
 
@@ -842,13 +840,13 @@ RowLayout {
 
                                 normalColor: {
                                     if (showPreview) {
-                                        return JamiTheme.transparentColor;
+                                        return JamiTheme.primaryBackgroundColor;
                                     } else if (modelData.normalColor != null) {
                                         return modelData.normalColor;
                                     } else if (modelData.isStyle) {
                                         return JamiTheme.hoveredButtonColor;
                                     } else {
-                                        return JamiTheme.transparentColor;
+                                        return JamiTheme.primaryBackgroundColor;
                                     }
                                 }
                                 imageColor: {
@@ -887,24 +885,18 @@ RowLayout {
                         toolTipText: showTypo ? JamiStrings.hideFormatting : JamiStrings.showFormatting
                         source: JamiResources.text_edit_black_24dp_svg
 
-                        normalColor: showPreview ? JamiTheme.transparentColor : (showTypo ? JamiTheme.hoveredButtonColor : JamiTheme.transparentColor)
+                        normalColor: showPreview ? JamiTheme.primaryBackgroundColor : (showTypo ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor)
                         imageColor: showPreview ? JamiTheme.chatViewFooterImgDisableColor : (hovered || showTypo ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor)
                         hoveredColor: JamiTheme.hoveredButtonColor
                         pressedColor: hoveredColor
 
                         onClicked: {
                             showTypo = !showTypo;
+                            messageBarTextArea.isShowTypo = showTypo;
                             if (messageBar.width < messageBarLayoutMaximumWidth + sendMessageButton.width + 2 * JamiTheme.preferredMarginSize)
                                 showTypoSecond = false;
                             if (!showDefault)
                                 showDefault = true;
-                            if (showTypo) {
-                                root.chatViewEnterIsNewLine = true;
-                                UtilsAdapter.setAppValue(Settings.Key.ChatViewEnterIsNewLine, true);
-                            } else {
-                                root.chatViewEnterIsNewLine = false;
-                                UtilsAdapter.setAppValue(Settings.Key.ChatViewEnterIsNewLine, false);
-                            }
                             UtilsAdapter.setAppValue(Settings.Key.ShowMardownOption, showTypo);
                             UtilsAdapter.setAppValue(Settings.Key.ShowSendOption, !showDefault);
                         }
@@ -1009,7 +1001,7 @@ RowLayout {
                             toolTipText: modelData.toolTip
                             source: modelData.iconSrc
 
-                            normalColor: JamiTheme.transparentColor
+                            normalColor: JamiTheme.primaryBackgroundColor
                             imageColor: showPreview ? JamiTheme.chatViewFooterImgDisableColor : (hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor)
                             hoveredColor: JamiTheme.hoveredButtonColor
                             pressedColor: hoveredColor
@@ -1148,10 +1140,11 @@ RowLayout {
                     imageContainerHeight: 25
                     radius: 5
                     source: JamiResources.preview_black_24dp_svg
-                    normalColor: showPreview ? hoveredColor : JamiTheme.transparentColor
+                    normalColor: showPreview ? hoveredColor : JamiTheme.primaryBackgroundColor
                     imageColor: (hovered || showPreview) ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
                     hoveredColor: JamiTheme.hoveredButtonColor
                     pressedColor: hoveredColor
+                    toolTipText: showPreview ? JamiStrings.continueEditing : JamiStrings.showPreview
 
                     onClicked: {
                         showPreview = !showPreview;
@@ -1166,6 +1159,7 @@ RowLayout {
         Layout.preferredHeight: parent.height
         Layout.preferredWidth: childrenRect.width
         visible: sendButtonVisibility
+        color: JamiTheme.transparentColor
         PushButton {
             id: sendMessageButton
 

src/app/mainview/components/MessageBarTextArea.qml

@@ -41,6 +41,7 @@ JamiFlickable {
     property alias selectionStart: textArea.selectionStart
     property alias selectionEnd: textArea.selectionEnd
     property bool showPreview: false
+    property bool isShowTypo: UtilsAdapter.getAppValue(Settings.Key.ShowMardownOption)
 
     ScrollBar.vertical.visible: textArea.text
     ScrollBar.horizontal.visible: textArea.text
@@ -48,7 +49,7 @@ JamiFlickable {
     signal sendMessagesRequired
 
     function heightBinding() {
-        textArea.height = Qt.binding(() => textArea.paintedHeight);
+        textArea.height = Qt.binding(() => textArea.lineCount === 1 ? 35 : textArea.paintedHeight);
     }
 
     function selectText(start, end) {
@@ -60,7 +61,11 @@ JamiFlickable {
     }
 
     function clearText() {
+        var multiLine = textArea.lineCount !== 1;
         textArea.clear();
+        if (multiLine) {
+            heightBinding();
+        }
     }
 
     function pasteText() {
@@ -153,7 +158,7 @@ JamiFlickable {
 
         persistentSelection: true
 
-        height: this.paintedHeight
+        height: textArea.lineCount === 1 ? 35 : textArea.paintedHeight
 
         verticalAlignment: TextEdit.AlignVCenter
 
@@ -202,7 +207,13 @@ JamiFlickable {
                 const isEnterNewLine = UtilsAdapter.getAppValue(Settings.Key.ChatViewEnterIsNewLine);
                 const isShiftPressed = (keyEvent.modifiers & Qt.ShiftModifier);
                 const isCtrlPressed = (keyEvent.modifiers & Qt.ControlModifier);
-                if (!isEnterNewLine && !isShiftPressed || isCtrlPressed) {
+                if (!root.isShowTypo && !isShiftPressed) {
+                    root.sendMessagesRequired();
+                    keyEvent.accepted = true;
+                } else if (isCtrlPressed) {
+                    root.sendMessagesRequired();
+                    keyEvent.accepted = true;
+                } else if (!isEnterNewLine && !isShiftPressed) {
                     root.sendMessagesRequired();
                     keyEvent.accepted = true;
                 }

src/app/mainview/components/Searchbar.qml

@@ -75,7 +75,8 @@ Rectangle {
         radius: hoverButtonRadius
         hoveredColor: JamiTheme.hoveredButtonColor
         source: JamiResources.ic_baseline_search_24dp_svg
-        normalColor: "transparent"
+        toolTipText: JamiStrings.search
+        normalColor: JamiTheme.primaryBackgroundColor
         imageColor: {
             if (reductionEnabled) {
                 if (hovered) {

src/app/mainview/components/SidePanel.qml

@@ -16,21 +16,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
 import net.jami.Enums 1.1
 import net.jami.Models 1.1
-
 import "../../commoncomponents"
 import "../../settingsview/components"
 
 SidePanelBase {
     id: root
+
     objectName: "SidePanel"
 
     color: JamiTheme.backgroundColor
@@ -39,7 +37,7 @@ SidePanelBase {
         target: LRCInstance
 
         function onCurrentAccountIdChanged() {
-            clearContactSearchBar()
+            clearContactSearchBar();
         }
     }
 
@@ -47,8 +45,8 @@ SidePanelBase {
         target: ConversationsAdapter
 
         function onConversationReady() {
-            selectTab(SidePanelTabBar.Conversations)
-            clearContactSearchBar()
+            selectTab(SidePanelTabBar.Conversations);
+            clearContactSearchBar();
         }
     }
 
@@ -56,46 +54,46 @@ SidePanelBase {
         target: ConversationsAdapter
 
         function onShowSearchStatus(status) {
-            searchStatusText.text = status
+            searchStatusText.text = status;
         }
 
         function onTextFilterChanged(text) {
             // In the swarm details, "Go to conversation" can
             // change the search bar. Be sure to be synced
-            contactSearchBar.textContent = text
+            contactSearchBar.textContent = text;
         }
     }
 
     function toggleCreateSwarmView() {
         if (!inNewSwarm) {
-            viewCoordinator.present("NewSwarmPage")
-            const newSwarmPage = viewCoordinator.getView("NewSwarmPage")
+            viewCoordinator.present("NewSwarmPage");
+            const newSwarmPage = viewCoordinator.getView("NewSwarmPage");
             newSwarmPage.removeMember.connect((convId, member) => {
-                removeMember(convId, member)
-            })
+                    removeMember(convId, member);
+                });
             newSwarmPage.createSwarmClicked.connect((title, description, avatar) => {
-                var uris = []
-                for (var idx in newSwarmPage.members) {
-                    var uri = newSwarmPage.members[idx].uri
-                    if (uris.indexOf(uri) === -1) {
-                        uris.push(uri)
+                    var uris = [];
+                    for (var idx in newSwarmPage.members) {
+                        var uri = newSwarmPage.members[idx].uri;
+                        if (uris.indexOf(uri) === -1) {
+                            uris.push(uri);
+                        }
                     }
-                }
-                let convuid = ConversationsAdapter.createSwarm(title, description, avatar, uris)
-                viewCoordinator.dismiss("NewSwarmPage")
-                LRCInstance.selectConversation(convuid)
-            })
+                    let convuid = ConversationsAdapter.createSwarm(title, description, avatar, uris);
+                    viewCoordinator.dismiss("NewSwarmPage");
+                    LRCInstance.selectConversation(convuid);
+                });
         } else {
-            viewCoordinator.dismiss("NewSwarmPage")
+            viewCoordinator.dismiss("NewSwarmPage");
         }
     }
 
     function clearContactSearchBar() {
-        contactSearchBar.clearText()
+        contactSearchBar.clearText();
     }
 
     function selectTab(tabIndex) {
-        sidePanelTabBar.selectTab(tabIndex)
+        sidePanelTabBar.selectTab(tabIndex);
     }
 
     property bool inNewSwarm: viewCoordinator.currentViewName === "NewSwarmPage"
@@ -104,65 +102,64 @@ SidePanelBase {
     property var highlightedMembers: []
     onHighlightedMembersChanged: {
         if (inNewSwarm) {
-            const newSwarmPage = viewCoordinator.getView("NewSwarmPage")
-            newSwarmPage.members = highlightedMembers
+            const newSwarmPage = viewCoordinator.getView("NewSwarmPage");
+            newSwarmPage.members = highlightedMembers;
         }
     }
 
     function refreshHighlighted(convId, highlightedStatus) {
-        var newH = root.highlighted
-        var newHm = root.highlightedMembers
-
+        var newH = root.highlighted;
+        var newHm = root.highlightedMembers;
         if (highlightedStatus) {
-            var item = ConversationsAdapter.getConvInfoMap(convId)
-            var added = false
+            var item = ConversationsAdapter.getConvInfoMap(convId);
+            var added = false;
             for (var idx in item.uris) {
-                var uri = item.uris[idx]
-                if (!Array.from(newHm).find(r => r.uri === uri) &&
-                        uri !== CurrentAccount.uri) {
-                    newHm.push({"uri": uri, "convId": convId})
-                    added = true
+                var uri = item.uris[idx];
+                if (!Array.from(newHm).find(r => r.uri === uri) && uri !== CurrentAccount.uri) {
+                    newHm.push({
+                            "uri": uri,
+                            "convId": convId
+                        });
+                    added = true;
                 }
             }
             if (!added)
-                return false
+                return false;
         } else {
-            newH = Array.from(newH).filter(r => r !== convId)
-            newHm = Array.from(newHm).filter(r => r.convId !== convId)
+            newH = Array.from(newH).filter(r => r !== convId);
+            newHm = Array.from(newHm).filter(r => r.convId !== convId);
         }
-
-        newH.push(convId)
-        root.highlighted = newH
-        root.highlightedMembers = newHm
-        ConversationsAdapter.ignoreFiltering(root.highlighted)
-        return true
+        newH.push(convId);
+        root.highlighted = newH;
+        root.highlightedMembers = newHm;
+        ConversationsAdapter.ignoreFiltering(root.highlighted);
+        return true;
     }
 
     function clearHighlighted() {
-        root.highlighted = []
-        root.highlightedMembers = []
+        root.highlighted = [];
+        root.highlightedMembers = [];
     }
 
     function removeMember(convId, member) {
-        var refreshHighlighted = true
-        var newHm = []
+        var refreshHighlighted = true;
+        var newHm = [];
         for (var hm in root.highlightedMembers) {
-            var m = root.highlightedMembers[hm]
+            var m = root.highlightedMembers[hm];
             if (m.convId === convId && m.uri === member) {
                 continue;
             } else if (m.convId === convId) {
-                refreshHighlighted = false
+                refreshHighlighted = false;
             }
-            newHm.push(m)
+            newHm.push(m);
         }
-        root.highlightedMembers = newHm
-
+        root.highlightedMembers = newHm;
         if (refreshHighlighted) {
             // Remove highlighted status if necessary
             for (var d in swarmCurrentConversationList.contentItem.children) {
-                var delegate = swarmCurrentConversationList.contentItem.children[d]
+                var delegate = swarmCurrentConversationList.contentItem.children[d];
                 if (delegate.convId === convId)
-                    delegate.highlighted = false
+                    delegate.highlighted = false;
             }
         }
     }
@@ -176,11 +173,16 @@ SidePanelBase {
             color: JamiTheme.backgroundColor
         }
 
-        header: AccountComboBox {}
+        header: AccountComboBox {
+        }
 
         Item {
             anchors.fill: parent
 
+            onVisibleChanged: {
+                donation.donationVisible = Qt.binding(() => JamiQmlUtils.isDonationBannerVisible());
+            }
+
             RowLayout {
                 id: titleBar
 
@@ -240,7 +242,7 @@ SidePanelBase {
                     sequence: "Ctrl+F"
                     context: Qt.ApplicationShortcut
                     onActivated: {
-                        contactSearchBar.forceActiveFocus()
+                        contactSearchBar.forceActiveFocus();
                     }
                 }
 
@@ -250,20 +252,18 @@ SidePanelBase {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
 
-                    onSearchBarTextChanged: function(text){
+                    onSearchBarTextChanged: function (text) {
                         // not calling positionViewAtBeginning will cause
                         // sort animation visual bugs
-                        conversationListView.positionViewAtBeginning()
-                        ConversationsAdapter.ignoreFiltering(root.highlighted)
-                        ConversationsAdapter.setFilter(text)
+                        conversationListView.positionViewAtBeginning();
+                        ConversationsAdapter.ignoreFiltering(root.highlighted);
+                        ConversationsAdapter.setFilter(text);
                     }
 
                     onReturnPressedWhileSearching: {
-                        var listView = searchResultsListView.count ?
-                                    searchResultsListView :
-                                    conversationListView
+                        var listView = searchResultsListView.count ? searchResultsListView : conversationListView;
                         if (listView.count)
-                            listView.model.select(0)
+                            listView.model.select(0);
                     }
                 }
 
@@ -291,8 +291,7 @@ SidePanelBase {
             SidePanelTabBar {
                 id: sidePanelTabBar
 
-                visible: ConversationsAdapter.pendingRequestCount &&
-                         !contactSearchBar.textContent && smartListLayout.visible
+                visible: ConversationsAdapter.pendingRequestCount && !contactSearchBar.textContent && smartListLayout.visible
                 anchors.top: startBar.bottom
                 anchors.topMargin: visible ? 10 : 0
                 width: page.width
@@ -311,7 +310,6 @@ SidePanelBase {
                 height: visible ? 42 : 0
 
                 color: JamiTheme.backgroundColor
-
                 Text {
                     id: searchStatusText
 
@@ -326,13 +324,22 @@ SidePanelBase {
                 }
             }
 
+            DonationBanner {
+                id: donation
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.leftMargin: 15
+                anchors.rightMargin: 15
+                anchors.top: sidePanelTabBar.bottom
+                anchors.topMargin: 10
+                visible: donation.donationVisible
+            }
+
             ColumnLayout {
                 id: smartListLayout
 
                 width: parent.width
-                anchors.top: searchStatusRect.bottom
-                anchors.topMargin: (sidePanelTabBar.visible ||
-                                    searchStatusRect.visible) ? 0 : 12
+                anchors.top: donation.donationVisible ? donation.bottom : sidePanelTabBar.bottom
+                anchors.topMargin: (sidePanelTabBar.visible || searchStatusRect.visible) ? 0 : 12
                 anchors.bottom: parent.bottom
 
                 spacing: 4
@@ -350,14 +357,14 @@ SidePanelBase {
                     Layout.fillWidth: true
                     Layout.preferredHeight: visible ? contentHeight : 0
                     Layout.maximumHeight: {
-                        var otherContentHeight = conversationListView.contentHeight + 16
+                        var otherContentHeight = conversationListView.contentHeight + 16;
                         if (conversationListView.visible)
                             if (otherContentHeight < parent.height / 2)
-                                return parent.height - otherContentHeight
+                                return parent.height - otherContentHeight;
                             else
-                                return parent.height / 2
+                                return parent.height / 2;
                         else
-                            return parent.height
+                            return parent.height;
                     }
 
                     model: SearchResultsListModel
@@ -385,9 +392,8 @@ SidePanelBase {
                 visible: inNewSwarm
 
                 width: parent.width
-                anchors.top: searchStatusRect.bottom
-                anchors.topMargin: (sidePanelTabBar.visible ||
-                                    searchStatusRect.visible) ? 0 : 12
+                anchors.top: donation.donationVisible ? donation.bottom : sidePanelTabBar.bottom
+                anchors.topMargin: (sidePanelTabBar.visible || searchStatusRect.visible) ? 0 : 12
                 anchors.bottom: parent.bottom
 
                 spacing: 4
@@ -404,8 +410,8 @@ SidePanelBase {
 
                         onVisibleChanged: {
                             if (!swarmCurrentConversationList.visible) {
-                                highlighted = false
-                                root.clearHighlighted()
+                                highlighted = false;
+                                root.clearHighlighted();
                             }
                         }
 
@@ -414,26 +420,26 @@ SidePanelBase {
                             // destroyed from the memory. So, re-add the highlighted
                             // status if necessary
                             if (Array.from(root.highlighted).find(r => r === UID)) {
-                                highlighted = true
+                                highlighted = true;
                             }
                         }
 
                         onHighlightedChanged: function onHighlightedChanged() {
                             if (highlighted && Array.from(root.highlighted).find(r => r === UID)) {
                                 // Due to scrolling destruction/reconstruction
-                                return
+                                return;
                             }
-                            var currentHighlighted = root.highlighted
+                            var currentHighlighted = root.highlighted;
                             if (!root.refreshHighlighted(UID, highlighted)) {
-                                highlighted = false
-                                return
+                                highlighted = false;
+                                return;
                             }
                             if (highlighted) {
-                                root.highlighted.push(UID)
+                                root.highlighted.push(UID);
                             } else {
-                                root.highlighted = Array.from(root.highlighted).filter(r => r !== UID)
+                                root.highlighted = Array.from(root.highlighted).filter(r => r !== UID);
                             }
-                            root.clearContactSearchBar()
+                            root.clearContactSearchBar();
                         }
                     }
                     currentIndex: model.currentFilteredRow
@@ -448,7 +454,9 @@ SidePanelBase {
                         interval: 750
                         running: isSharingPosition || isReceivingPosition
                         repeat: true
-                        onTriggered: {showIconArrow = !showIconArrow}
+                        onTriggered: {
+                            showIconArrow = !showIconArrow;
+                        }
                     }
                 }
             }

src/app/mainview/components/TipBox.qml

@@ -37,7 +37,6 @@ FocusScope {
     property color textColor: JamiTheme.textColor
     property color iconColor: JamiTheme.tintedBlue
 
-
     property string customizeTip: "CustomizeTipBox {}"
 
     property string backupTip: "BackupTipBox {" + "    onIgnore: {" + "        root.ignoreClicked()" + "    }" + "}"
@@ -56,7 +55,6 @@ FocusScope {
     focus: true
     activeFocusOnTab: true
 
-
     Rectangle {
         id: rect
         anchors.fill: parent
@@ -73,6 +71,18 @@ FocusScope {
             width: parent.width
             anchors.topMargin: 10
 
+            Loader {
+                id: loader_donationTip
+                active: type === "donation"
+                focus: true
+                sourceComponent: DonationTipBox {
+                    maxHeight: root.maximumHeight
+                    textColor: root.textColor
+                    iconColor: root.iconColor
+                }
+                width: parent.width
+            }
+
             Loader {
                 id: loader_backupTip
                 active: type === "backup"
@@ -95,7 +105,6 @@ FocusScope {
                 }
                 width: parent.width
                 focus: true
-
             }
             Loader {
                 id: loader_infoTip
@@ -106,7 +115,6 @@ FocusScope {
                     iconColor: root.iconColor
                 }
                 width: parent.width
-
             }
         }
     }
@@ -119,6 +127,7 @@ FocusScope {
 
     TapHandler {
         target: rect
+        enabled: type !== "donation"
         onTapped: {
             return opened ? focus = false : root.forceActiveFocus();
         }
@@ -157,6 +166,8 @@ FocusScope {
             imageContainerWidth: 20
             imageContainerHeight: 20
 
+            radius: 5
+
             visible: opened
             circled: true
 

src/app/mainview/components/TipsRow.qml

@@ -31,6 +31,7 @@ JamiFlickable {
     property color tipsColor: JamiTheme.welcomeBlockColor
     property color tipsTextColor: JamiTheme.textColor
     property color iconColor: JamiTheme.tintedBlue
+    property alias visibleTipBoxCount: tipsRepeater.visibleTipBoxCount
 
     width: JamiTheme.welcomeGridWidth
     height: getHeight()
@@ -91,6 +92,10 @@ JamiFlickable {
                     hideTipBox = true;
                 }
 
+                onHideTipBoxChanged: {
+                    tipsRepeater.updateVisibleTipBoxCount()
+                }
+
                 onOpenedChanged: {
                     if (opened)
                         row.openedTipCount++;
@@ -98,6 +103,27 @@ JamiFlickable {
                         row.openedTipCount--;
                 }
             }
+
+            property int visibleTipBoxCount: 0
+
+            Component.onCompleted: {
+                updateVisibleTipBoxCount()
+            }
+
+            function updateVisibleTipBoxCount() {
+                var count = 0
+                for (var i = 0; i < tipsRepeater.count; i++) {
+                    var item = tipsRepeater.itemAt(i)
+                    if (item.type === "backup" || item.type === "customize"){
+                        if (item.visible)
+                            count ++
+                    }
+                    else if (!item.hideTipBox) {
+                        count++
+                    }
+                }
+                visibleTipBoxCount = count
+            }
         }
     }
 }

src/app/mainview/components/UserProfile.qml

@@ -24,9 +24,6 @@ import "../../commoncomponents"
 BaseModalDialog {
     id: root
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.secondaryDialogDimension)
-
     property string convId
     property string aliasText
     property string registeredNameText
@@ -34,19 +31,11 @@ BaseModalDialog {
 
     property int preferredImgSize: 80
 
-    popupContent: Rectangle {
-        id: userProfileContentRect
-
-        color: JamiTheme.backgroundColor
-        radius: JamiTheme.modalPopupRadius
-        anchors.fill: parent
-
-        GridLayout {
+    popupContent: GridLayout {
             id: userProfileDialogLayout
 
-            anchors.centerIn: parent
-            anchors.fill: parent
             anchors.margins: JamiTheme.preferredMarginSize
+            width: JamiTheme.secondaryDialogDimension
 
             columns: 2
             rows: 6
@@ -77,6 +66,7 @@ BaseModalDialog {
                 visible: aliasText ? (aliasText === idText ? false : true) : false
 
                 selectByMouse: true
+                readOnly: true
 
                 wrapMode: Text.NoWrap
                 text: textMetricsContactAliasText.elidedText
@@ -88,7 +78,7 @@ BaseModalDialog {
                     id: textMetricsContactAliasText
                     font: contactAlias.font
                     text: aliasText
-                    elideWidth: userProfileContentRect.width - 200
+                    elideWidth: root.width - 200
                     elide: Qt.ElideMiddle
                 }
             }
@@ -141,12 +131,13 @@ BaseModalDialog {
                     id: textMetricsContactDisplayNameText
                     font: contactDisplayName.font
                     text: registeredNameText
-                    elideWidth: userProfileContentRect.width - 200
+                    elideWidth: root.width - 200
                     elide: Qt.ElideMiddle
                 }
             }
 
             Text {
+                id: identifierText
                 Layout.alignment: Qt.AlignRight
                 font.pointSize: JamiTheme.textFontSize
                 text: JamiStrings.identifier
@@ -157,8 +148,8 @@ BaseModalDialog {
                 id: contactId
 
                 Layout.alignment: Qt.AlignLeft
-                Layout.preferredWidth: userProfileContentRect.width - 200
-
+                Layout.preferredWidth: root.width - 250
+                Layout.rightMargin: JamiTheme.preferredMarginSize
                 font.pointSize: JamiTheme.textFontSize
                 font.kerning: true
                 color: JamiTheme.textColor
@@ -166,7 +157,7 @@ BaseModalDialog {
                 readOnly: true
                 selectByMouse: true
 
-                wrapMode: TextEdit.WrapAnywhere
+                wrapMode: Text.Wrap
                 text: idText
 
                 horizontalAlignment: Text.AlignLeft
@@ -193,25 +184,6 @@ BaseModalDialog {
 
                 source: convId !== "" ? "image://qrImage/contact_" + convId : "image://qrImage/contact_" + idText
             }
-
-            MaterialButton {
-                id: btnClose
-
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignHCenter
-
-                preferredWidth: JamiTheme.preferredFieldWidth / 2
-                buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                color: JamiTheme.buttonTintedBlack
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-
-                text: JamiStrings.close
-
-                onClicked: close()
-            }
         }
     }
-}
+

src/app/mainview/components/WelcomeInfo.qml

@@ -39,8 +39,6 @@ Item {
 
     property real contentWidth: welcomeInfo.width - 2 * JamiTheme.mainViewMargin
 
-
-
     function getHeight() {
         return bgRect.height;
     }
@@ -70,7 +68,6 @@ Item {
             Loader {
                 id: loader_identifierDescription
                 Layout.alignment: Qt.AlignHCenter
-                Layout.preferredWidth: contentWidth
                 Layout.preferredHeight: item ? item.contentHeight : 0
                 Layout.bottomMargin: loader_bottomIdentifier.item ? JamiTheme.mainViewMargin - 10 : 0
                 sourceComponent: {
@@ -93,7 +90,6 @@ Item {
                 sourceComponent: JamiIdentifier {
                     backgroundColor: welcomeInfo.idColor
                     contentColor: contentIdColor
-
                 }
                 Layout.alignment: Qt.AlignHCenter
                 Layout.preferredHeight: active ? item.getHeight() : 0

src/app/mainview/components/WelcomeLogo.qml

@@ -47,7 +47,7 @@ Item {
         id: cachedImgLogo
         objectName: "cachedImgLogo"
         downloadUrl: logoUrl
-        defaultImage: JamiResources.jami_logo_icon_svg
+        defaultImage: JamiTheme.welcomeLogo
         visible: welcomeLogo.visible
         height: parent.height * logoSize
         width: parent.width * logoSize

src/app/mainview/components/WelcomePage.qml

@@ -221,16 +221,33 @@ ListSelectionView {
                     if (!active) {
                         return 0;
                     } else {
-                        if (root.width > root.thresholdSize) {
-                            return JamiTheme.welcomeGridWidth;
-                        } else {
+                        if (item.visibleTipBoxCount <= 2) {
+                            if (item.visibleTipBoxCount <= 1)
+                                return JamiTheme.tipBoxWidth;
                             return JamiTheme.welcomeShortGridWidth;
+                        } else {
+                            if (root.width > root.thresholdSize) {
+                                return JamiTheme.welcomeGridWidth;
+                            } else {
+                                return JamiTheme.welcomeShortGridWidth;
+                            }
                         }
                     }
                 }
                 focus: true
             }
 
+            Connections {
+                target: CurrentAccount
+                function onIdChanged() {
+                    //Making sure the tips are refreshed when changing user
+                    loader_tipsRow.active = false;
+                    loader_tipsRow.active = Qt.binding(function () {
+                            return viewNode.hasTips && root.height > root.thresholdHeight;
+                        });
+                }
+            }
+
             Item {
                 id: bottomRow
                 Layout.preferredWidth: Math.max(300, root.width)
@@ -244,16 +261,14 @@ ListSelectionView {
                     TextMetrics {
                         id: textSize
                         font.weight: Font.Bold
-                        font.pixelSize: 20
                         font.capitalization: Font.AllUppercase
                         text: aboutJami.text
                     }
 
                     tertiary: true
                     anchors.horizontalCenter: parent.horizontalCenter
-                    preferredWidth: textSize.width
+                    preferredWidth: text.width
                     text: JamiStrings.aboutJami
-                    fontSize: 12
 
                     onClicked: viewCoordinator.presentDialog(appWindow, "mainview/components/AboutPopUp.qml")
                 }

src/app/mainview/components/WelcomePageQrDialog.qml

@@ -18,26 +18,26 @@
 import QtQuick
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
+import QtQuick.Layouts
 import "../../commoncomponents"
 
 BaseModalDialog {
     id: root
 
-    //Content height + margin.
-    property int size: JamiTheme.qrCodeImageSize + 30
-
-    width: size
-    height: size
+    topLayoutVisible: false
 
     backgroundColor: JamiTheme.whiteColor
 
-    popupContentPreferredHeight: JamiTheme.qrCodeImageSize
-    popupContentPreferredWidth: JamiTheme.qrCodeImageSize
     popupContent: Image {
-        id: userQrImage
+            id: userQrImage
+            property int size: JamiTheme.qrCodeImageSize
+            width: size
+            height: size
+            anchors.centerIn: parent
 
-        smooth: false
-        fillMode: Image.PreserveAspectFit
-        source: "image://qrImage/account_" + CurrentAccount.id
+            smooth: false
+            fillMode: Image.PreserveAspectFit
+            source: "image://qrImage/account_" + CurrentAccount.id
     }
 }
+

src/app/messagesadapter.cpp

@@ -299,6 +299,13 @@ MessagesAdapter::openDirectory(const QString& path)
     }
 }
 
+void
+MessagesAdapter::removeFile(const QString& interactionId, const QString& path)
+{
+    auto convUid = lrcInstance_->get_selectedConvUid();
+    lrcInstance_->getCurrentConversationModel()->removeFile(convUid, interactionId, path);
+}
+
 void
 MessagesAdapter::acceptFile(const QString& interactionId)
 {

src/app/messagesadapter.h

@@ -111,6 +111,7 @@ protected:
     Q_INVOKABLE void cancelFile(const QString& arg);
     Q_INVOKABLE void openUrl(const QString& url);
     Q_INVOKABLE void openDirectory(const QString& arg);
+    Q_INVOKABLE void removeFile(const QString& interactionId, const QString& path);
     Q_INVOKABLE void deleteInteraction(const QString& interactionId);
     Q_INVOKABLE void joinCall(const QString& uri,
                               const QString& deviceId,

src/app/networkmanager.cpp

@@ -25,6 +25,28 @@
 #include <QtNetwork>
 #include <QScopedPointer>
 
+namespace {
+NetworkManager::GetError
+translateErrorCode(QNetworkReply::NetworkError error)
+{
+    // From qnetworkreply.h:
+    // network layer errors (1-99): / proxy errors (101-199):
+    // content errors (201-299): ContentAccessDenied = 201,
+    // protocol errors / Server side errors (401-499)
+    static auto inRange = [](int value, int min, int max) -> bool {
+        return (value >= min && value <= max);
+    };
+    if (inRange(error, 1, 199))
+        return NetworkManager::NETWORK_ERROR;
+    if (inRange(error, 201, 201))
+        return NetworkManager::ACCESS_DENIED;
+    if (inRange(error, 202, 299))
+        return NetworkManager::CONTENT_NOT_FOUND;
+    return NetworkManager::NETWORK_ERROR;
+}
+
+} // namespace
+
 NetworkManager::NetworkManager(ConnectivityMonitor* cm, QObject* parent)
     : QObject(parent)
     , manager_(new QNetworkAccessManager(this))
@@ -45,7 +67,7 @@ NetworkManager::NetworkManager(ConnectivityMonitor* cm, QObject* parent)
             });
 #endif
     connect(connectivityMonitor_, &ConnectivityMonitor::connectivityChanged, this, [this] {
-        auto connected = connectivityMonitor_->isOnline();
+        const auto connected = connectivityMonitor_->isOnline();
         if (connected && !lastConnectionState_) {
             manager_->deleteLater();
             manager_ = new QNetworkAccessManager(this);
@@ -59,7 +81,28 @@ void
 NetworkManager::sendGetRequest(const QUrl& url,
                                std::function<void(const QByteArray&)>&& onDoneCallback)
 {
-    auto* const reply = manager_->get(QNetworkRequest(url));
+    const QNetworkRequest request = QNetworkRequest(url);
+    sendGetRequest(request, std::move(onDoneCallback));
+}
+
+void
+NetworkManager::sendGetRequest(const QUrl& url,
+                               const QMap<QString, QByteArray>& header,
+                               std::function<void(const QByteArray&)>&& onDoneCallback)
+{
+    QNetworkRequest request = QNetworkRequest(url);
+    for (auto it = header.begin(); it != header.end(); ++it) {
+        request.setRawHeader(QByteArray(it.key().toStdString().c_str(), it.key().size()),
+                             it.value());
+    }
+    sendGetRequest(request, std::move(onDoneCallback));
+}
+
+void
+NetworkManager::sendGetRequest(const QNetworkRequest& request,
+                               std::function<void(const QByteArray&)>&& onDoneCallback)
+{
+    auto* const reply = manager_->get(request);
     QObject::connect(reply, &QNetworkReply::finished, this, [reply, onDoneCallback, this]() {
         if (reply->error() == QNetworkReply::NoError) {
             onDoneCallback(reply->readAll());
@@ -77,9 +120,8 @@ NetworkManager::downloadFile(const QUrl& url,
                              const QString& filePath,
                              const QString& extension)
 {
-    // If there is already a download in progress, return.
-    if ((downloadReplies_.value(replyId) != NULL || !(replyId == 0))
-        && downloadReplies_[replyId]->isRunning()) {
+    // Don't replace the download if there is already a download in progress for this id.
+    if (downloadReplies_.contains(replyId) && downloadReplies_.value(replyId)->isRunning()) {
         qWarning() << Q_FUNC_INFO << "Download already in progress";
         return replyId;
     }
@@ -100,6 +142,7 @@ NetworkManager::downloadFile(const QUrl& url,
     }
 
     // set the id for the request
+    // NOLINTNEXTLINE(misc-const-correctness)
     std::uniform_int_distribution<int> dist(1, std::numeric_limits<int>::max());
     auto uuid = dist(rng_);
 
@@ -112,7 +155,7 @@ NetworkManager::downloadFile(const QUrl& url,
     const QFileInfo fileInfo(url.path());
     const QString fileName = fileInfo.fileName();
     auto& file = files_[uuid];
-    file = new QFile(filePath + fileName + extension);
+    file = new QFile(filePath + QDir::separator() + fileName + extension);
     if (!file->open(QIODevice::WriteOnly)) {
         Q_EMIT errorOccurred(GetError::ACCESS_DENIED);
         files_.remove(uuid);
@@ -146,7 +189,7 @@ NetworkManager::downloadFile(const QUrl& url,
                 resetDownload(uuid);
                 qWarning() << Q_FUNC_INFO
                            << QMetaEnum::fromType<QNetworkReply::NetworkError>().valueToKey(error);
-                Q_EMIT errorOccurred(GetError::NETWORK_ERROR);
+                Q_EMIT errorOccurred(translateErrorCode(error));
             });
 
     connect(reply, &QNetworkReply::finished, this, [this, uuid, onDoneCallback, reply, file]() {

src/app/networkmanager.h

@@ -23,6 +23,7 @@
 #include <QMap>
 #include <QString>
 #include <QNetworkReply>
+
 #include <random>
 
 class QNetworkAccessManager;
@@ -35,16 +36,27 @@ public:
     explicit NetworkManager(ConnectivityMonitor* cm, QObject* parent = nullptr);
     virtual ~NetworkManager() = default;
 
-    enum GetError { DISCONNECTED, NETWORK_ERROR, ACCESS_DENIED, SSL_ERROR, CANCELED };
+    enum GetError {
+        DISCONNECTED,
+        CONTENT_NOT_FOUND,
+        ACCESS_DENIED,
+        SSL_ERROR,
+        CANCELED,
+        NETWORK_ERROR,
+    };
     Q_ENUM(GetError)
 
     void sendGetRequest(const QUrl& url, std::function<void(const QByteArray&)>&& onDoneCallback);
-
+    void sendGetRequest(const QUrl& url,
+                        const QMap<QString, QByteArray>& header,
+                        std::function<void(const QByteArray&)>&& onDoneCallback);
+    void sendGetRequest(const QNetworkRequest& request,
+                        std::function<void(const QByteArray&)>&& onDoneCallback);
     int downloadFile(const QUrl& url,
                      int replyId,
                      std::function<void(bool, const QString&)>&& onDoneCallback,
                      const QString& filePath,
-                     const QString& extension = "");
+                     const QString& extension = {});
     void resetDownload(int replyId);
     void cancelDownload(int replyId);
 Q_SIGNALS:

src/app/pluginadapter.cpp

@@ -23,24 +23,27 @@
 #include "pluginstorelistmodel.h"
 #include "networkmanager.h"
 #include "lrcinstance.h"
+#include "appsettingsmanager.h"
 #include "utilsadapter.h"
 #include "qmlregister.h"
 
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QtNetwork>
 #include <QJsonObject>
 #include <QDir>
 #include <QString>
 
-PluginAdapter::PluginAdapter(LRCInstance* instance, QObject* parent, QString baseUrl)
+PluginAdapter::PluginAdapter(LRCInstance* instance,
+                             AppSettingsManager* settingsManager,
+                             QObject* parent,
+                             QString baseUrl)
     : QmlAdapterBase(instance, parent)
     , pluginStoreListModel_(new PluginStoreListModel(instance, this))
-    , pluginVersionManager_(new PluginVersionManager(instance, baseUrl, this))
+    , pluginVersionManager_(new PluginVersionManager(instance, this))
     , pluginListModel_(new PluginListModel(instance, this))
     , lrcInstance_(instance)
-    , tempPath_(QDir::tempPath())
-    , baseUrl_(baseUrl)
-
+    , settingsManager_(settingsManager)
 {
     QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, pluginStoreListModel_, "PluginStoreListModel");
     QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, pluginListModel_, "PluginListModel")
@@ -89,8 +92,13 @@ PluginAdapter::getPluginsFromStore()
                                        [this](NetworkManager::GetError error, const QString& msg) {
                                            Q_EMIT storeNotAvailable();
                                        });
+    QMap<QString, QByteArray> header;
+    const auto& language = settingsManager_->getLanguage();
+    header["Accept-Language"] = QByteArray(language.toStdString().c_str(), language.size());
     pluginVersionManager_
-        ->sendGetRequest(QUrl(baseUrl_ + "?arch=" + Utils::getPlatformString()),
+        ->sendGetRequest(QUrl(baseUrl()
+                              + "?arch=" + lrcInstance_->pluginModel().getPlatformInfo()["os"]),
+                         header,
                          [this, errorHandler](const QByteArray& data) {
                              auto result = QJsonDocument::fromJson(data).array();
                              auto pluginsInstalled = lrcInstance_->pluginModel().getPluginsId();
@@ -112,18 +120,23 @@ PluginAdapter::getPluginsFromStore()
 void
 PluginAdapter::getPluginDetails(const QString& pluginId)
 {
-    pluginVersionManager_->sendGetRequest(QUrl(baseUrl_ + "/details/" + pluginId
-                                               + "?arch=" + Utils::getPlatformString()),
-                                          [this](const QByteArray& data) {
-                                              auto result = QJsonDocument::fromJson(data).object();
-                                              // my response is a json object and I want to convert
-                                              // it to a QVariantMap
-                                              auto plugin = result.toVariantMap();
-                                              if (!plugin.contains("id")) {
-                                                  plugin["id"] = plugin["name"];
-                                              }
-                                              pluginStoreListModel_->addPlugin(plugin);
-                                          });
+    QMap<QString, QByteArray> header;
+    const auto& language = settingsManager_->getLanguage();
+    header["Accept-Language"] = QByteArray(language.toStdString().c_str(), language.size());
+    pluginVersionManager_
+        ->sendGetRequest(QUrl(baseUrl() + "/details/" + pluginId
+                              + "?arch=" + lrcInstance_->pluginModel().getPlatformInfo()["os"]),
+                         header,
+                         [this](const QByteArray& data) {
+                             auto result = QJsonDocument::fromJson(data).object();
+                             // my response is a json object and I want to convert
+                             // it to a QVariantMap
+                             auto plugin = result.toVariantMap();
+                             if (!plugin.contains("id")) {
+                                 plugin["id"] = plugin["name"];
+                             }
+                             pluginStoreListModel_->addPlugin(plugin);
+                         });
 }
 
 void
@@ -198,17 +211,19 @@ PluginAdapter::checkVersionStatus(const QString& pluginId)
 QString
 PluginAdapter::baseUrl() const
 {
-    return baseUrl_;
+    return settingsManager_->getValue("PluginStoreEndpoint").toString();
 }
 
 QString
 PluginAdapter::getIconUrl(const QString& pluginId) const
 {
-    return baseUrl_ + "/icons/" + pluginId + "?arch=" + Utils::getPlatformString();
+    return baseUrl() + "/icons/" + pluginId
+           + "?arch=" + lrcInstance_->pluginModel().getPlatformInfo()["os"];
 }
 
 QString
 PluginAdapter::getBackgroundImageUrl(const QString& pluginId) const
 {
-    return baseUrl_ + "/backgrounds/" + pluginId + "?arch=" + Utils::getPlatformString();
+    return baseUrl() + "/backgrounds/" + pluginId
+           + "?arch=" + lrcInstance_->pluginModel().getPlatformInfo()["os"];
 }

src/app/pluginadapter.h

@@ -22,6 +22,7 @@
 #include "pluginlistmodel.h"
 #include "pluginhandlerlistmodel.h"
 #include "pluginlistpreferencemodel.h"
+#include "appsettingsmanager.h"
 #include "pluginversionmanager.h"
 #include "pluginstorelistmodel.h"
 #include "preferenceitemlistmodel.h"
@@ -32,6 +33,7 @@
 
 class PluginVersionManager;
 class PluginStoreListModel;
+class AppSettingsManager;
 
 class PluginAdapter final : public QmlAdapterBase
 {
@@ -41,6 +43,7 @@ class PluginAdapter final : public QmlAdapterBase
 
 public:
     explicit PluginAdapter(LRCInstance* instance,
+                           AppSettingsManager* settingsManager,
                            QObject* parent = nullptr,
                            QString baseUrl = "https://plugins.jami.net");
     ~PluginAdapter() = default;
@@ -76,7 +79,7 @@ private:
     std::unique_ptr<PluginHandlerListModel> pluginHandlerListModel_;
 
     LRCInstance* lrcInstance_;
+    AppSettingsManager* settingsManager_;
     std::mutex mtx_;
-    QString tempPath_;
     QString baseUrl_;
 };

src/app/pluginlistmodel.cpp

@@ -71,7 +71,7 @@ PluginListModel::data(const QModelIndex& index, int role) const
     case Role::PluginIcon:
         return QVariant(details.iconPath);
     case Role::PluginImage:
-        return QVariant(details.imagePath);
+        return QVariant(details.backgroundPath);
     case Role::IsLoaded:
         return QVariant(details.loaded);
     case Role::PluginAuthor:
@@ -80,6 +80,8 @@ PluginListModel::data(const QModelIndex& index, int role) const
         return QVariant(pluginStatus_.value(installedPlugins_.at(index.row())));
     case Role::NewPluginAvailable:
         return QVariant(newVersionAvailable_.value(installedPlugins_.at(index.row())));
+    case Role::Id:
+        return QVariant(details.id);
     }
     return QVariant();
 }
@@ -98,6 +100,7 @@ PluginListModel::roleNames() const
     roles[Status] = "Status";
     roles[PluginDescription] = "PluginDescription";
     roles[NewPluginAvailable] = "NewPluginAvailable";
+    roles[Id] = "Id";
     return roles;
 }
 

src/app/pluginlistmodel.h

@@ -38,7 +38,8 @@ public:
         PluginIcon,
         NewPluginAvailable,
         IsLoaded,
-        Status
+        Status,
+        Id
     };
     Q_ENUM(Role)
 

src/app/pluginstorelistmodel.cpp

@@ -79,7 +79,6 @@ void
 PluginStoreListModel::reset()
 {
     beginResetModel();
-    plugins_.clear();
     endResetModel();
 }
 
@@ -88,8 +87,8 @@ PluginStoreListModel::addPlugin(const QVariantMap& plugin)
 {
     beginInsertRows(QModelIndex(), plugins_.size(), plugins_.size());
     plugins_.append(plugin);
-    endInsertRows();
     sort();
+    endInsertRows();
 }
 
 void
@@ -97,8 +96,8 @@ PluginStoreListModel::setPlugins(const QList<QVariantMap>& plugins)
 {
     beginResetModel();
     plugins_ = filterPlugins(plugins);
-    endResetModel();
     sort();
+    endResetModel();
 }
 
 void
@@ -109,12 +108,12 @@ PluginStoreListModel::removePlugin(const QString& pluginId)
         if (plugin["id"].toString() == pluginId) {
             beginRemoveRows(QModelIndex(), index, index);
             plugins_.removeAt(index);
+            sort();
             endRemoveRows();
             return;
         }
         index++;
     }
-    sort();
 }
 
 void
@@ -129,7 +128,6 @@ PluginStoreListModel::updatePlugin(const QVariantMap& plugin)
         }
         index++;
     }
-    sort();
 }
 
 QColor
@@ -210,7 +208,7 @@ PluginStoreListModel::rowFromPluginId(const QString& pluginId) const
     const auto it = std::find_if(plugins_.begin(),
                                  plugins_.end(),
                                  [&pluginId](const QVariantMap& p) {
-                                     return p["name"].toString() == pluginId;
+                                     return p["id"].toString() == pluginId;
                                  });
     if (it != plugins_.end()) {
         return std::distance(plugins_.begin(), it);
@@ -221,11 +219,9 @@ PluginStoreListModel::rowFromPluginId(const QString& pluginId) const
 void
 PluginStoreListModel::sort()
 {
-    beginResetModel();
     std::sort(plugins_.begin(), plugins_.end(), [](const QVariantMap& a, const QVariantMap& b) {
         return a["timestamp"].toString() < b["timestamp"].toString();
     });
-    endResetModel();
 }
 
 QList<QVariantMap>

src/app/pluginversionmanager.cpp

@@ -33,9 +33,8 @@ public:
     Impl(LRCInstance* instance, PluginVersionManager& parent)
         : QObject(nullptr)
         , parent_(parent)
-        , appSettingsManager_(new AppSettingsManager(this))
+        , settingsManager_(new AppSettingsManager(this))
         , lrcInstance_(instance)
-        , tempPath_(QDir::tempPath())
         , updateTimer_(new QTimer(this))
     {
         connect(updateTimer_, &QTimer::timeout, this, [this] { checkForUpdates(); });
@@ -78,12 +77,12 @@ public:
 
     bool isAutoUpdaterEnabled()
     {
-        return appSettingsManager_->getValue(Settings::Key::PluginAutoUpdate).toBool();
+        return settingsManager_->getValue(Settings::Key::PluginAutoUpdate).toBool();
     }
 
     void setAutoUpdate(bool state)
     {
-        appSettingsManager_->setValue(Settings::Key::PluginAutoUpdate, state);
+        settingsManager_->setValue(Settings::Key::PluginAutoUpdate, state);
     }
 
     void checkVersionStatus(const QString& pluginId)
@@ -103,13 +102,14 @@ public:
             return;
         }
 
-        parent_.sendGetRequest(QUrl(parent_.baseUrl + "/versions/" + plugin.id
-                                    + "?arch=" + Utils::getPlatformString()),
+        parent_.sendGetRequest(QUrl(settingsManager_->getValue("PluginStoreEndpoint").toString()
+                                    + "/versions/" + plugin.id + "?arch="
+                                    + lrcInstance_->pluginModel().getPlatformInfo()["os"]),
                                [this, plugin](const QByteArray& data) {
                                    // `data` represents the version in this case.
                                    if (plugin.version < data) {
                                        if (isAutoUpdaterEnabled()) {
-                                           installRemotePlugin(plugin.name);
+                                           installRemotePlugin(plugin.id);
                                            return;
                                        }
                                    }
@@ -121,7 +121,8 @@ public:
     void installRemotePlugin(const QString& pluginId)
     {
         parent_.downloadFile(
-            QUrl(parent_.baseUrl + "/download/" + Utils::getPlatformString() + "/" + pluginId),
+            QUrl(settingsManager_->getValue("PluginStoreEndpoint").toString() + "/download/"
+                 + lrcInstance_->pluginModel().getPlatformInfo()["os"] + "/" + pluginId),
             pluginId,
             0,
             [this, pluginId](bool success, const QString& error) {
@@ -131,9 +132,9 @@ public:
                     return;
                 }
                 QThreadPool::globalInstance()->start([this, pluginId] {
-                    auto res = lrcInstance_->pluginModel().installPlugin(QDir(tempPath_).filePath(
-                                                                             pluginId + ".jpl"),
-                                                                         true);
+                    auto res = lrcInstance_->pluginModel()
+                                   .installPlugin(QDir(QDir::tempPath()).filePath(pluginId + ".jpl"),
+                                                  true);
                     if (res) {
                         parent_.versionStatusChanged(pluginId, PluginStatus::Role::INSTALLED);
                     } else {
@@ -142,7 +143,7 @@ public:
                 });
                 parent_.versionStatusChanged(pluginId, PluginStatus::Role::INSTALLING);
             },
-            tempPath_ + '/');
+            QDir::tempPath());
         Q_EMIT parent_.versionStatusChanged(pluginId, PluginStatus::Role::DOWNLOADING);
     }
 
@@ -157,15 +158,13 @@ public:
     };
 
     PluginVersionManager& parent_;
-    AppSettingsManager* appSettingsManager_ {nullptr};
+    AppSettingsManager* settingsManager_ {nullptr};
     LRCInstance* lrcInstance_ {nullptr};
-    QString tempPath_;
     QTimer* updateTimer_;
 };
 
-PluginVersionManager::PluginVersionManager(LRCInstance* instance, QString& baseUrl, QObject* parent)
+PluginVersionManager::PluginVersionManager(LRCInstance* instance, QObject* parent)
     : NetworkManager(&instance->connectivityMonitor(), parent)
-    , baseUrl(baseUrl)
     , pimpl_(std::make_unique<Impl>(instance, *this))
 {}
 

src/app/pluginversionmanager.h

@@ -46,9 +46,7 @@ class PluginVersionManager final : public NetworkManager
 {
     Q_OBJECT
 public:
-    explicit PluginVersionManager(LRCInstance* instance,
-                                  QString& baseUrl,
-                                  QObject* parent = nullptr);
+    explicit PluginVersionManager(LRCInstance* instance, QObject* parent = nullptr);
     ~PluginVersionManager();
 
     Q_INVOKABLE bool isAutoUpdaterEnabled();

src/app/qmlregister.cpp

@@ -123,7 +123,7 @@ registerTypes(QQmlEngine* engine,
     auto contactAdapter = new ContactAdapter(lrcInstance, parent);
     auto accountAdapter = new AccountAdapter(settingsManager, systemTray, lrcInstance, parent);
     auto utilsAdapter = new UtilsAdapter(settingsManager, systemTray, lrcInstance, parent);
-    auto pluginAdapter = new PluginAdapter(lrcInstance, parent);
+    auto pluginAdapter = new PluginAdapter(lrcInstance, settingsManager, parent);
     auto currentCall = new CurrentCall(lrcInstance, parent);
     auto currentConversation = new CurrentConversation(lrcInstance, parent);
     auto currentAccount = new CurrentAccount(lrcInstance, settingsManager, parent);
@@ -240,7 +240,7 @@ registerTypes(QQmlEngine* engine,
     QML_REGISTERUNCREATABLE(NS_ENUMS, VideoFormatFpsModel)
 
     engine->addImageProvider(QLatin1String("qrImage"), new QrImageProvider(lrcInstance));
-    engine->addImageProvider(QLatin1String("avatarImage"),
+    engine->addImageProvider(QLatin1String("avatarimage"),
                               new AvatarImageProvider(lrcInstance));
 
     engine->setObjectOwnership(&lrcInstance->avModel(), QQmlEngine::CppOwnership);

src/app/qrimageprovider.h

@@ -33,7 +33,7 @@ public:
                                  instance)
     {}
 
-    enum class QrType { Account, Contact };
+    enum class QrType { Account, Contact, Raw };
 
     /*
      * Id should be string like account_0 (account index),
@@ -64,6 +64,8 @@ public:
             } catch (...) {
             }
             return {QrType::Contact, {}};
+        } else if (list.contains("raw") && list.size() > 1) {
+            return {QrType::Raw, list[1]};
         }
         return {QrType::Account, {}};
     }
@@ -73,26 +75,24 @@ public:
         Q_UNUSED(size);
 
         QString uri;
-        auto indexPair = getIndexFromID(id);
+        auto [type, identifier] = getIndexFromID(id);
 
-        if (indexPair.first == QrType::Contact) {
-            uri = indexPair.second;
-        } else {
-            if (indexPair.second.isEmpty())
+        if (type == QrType::Account) {
+            if (identifier.isEmpty())
                 return QImage();
-            auto accountId = indexPair.second;
             try {
-                auto& accountInfo = lrcInstance_->getAccountInfo(accountId);
+                auto& accountInfo = lrcInstance_->getAccountInfo(identifier);
                 uri = accountInfo.profileInfo.uri;
             } catch (const std::out_of_range&) {
-                qWarning() << "Couldn't get account info for id:" << accountId;
+                qWarning() << "Couldn't get account info for id:" << identifier;
                 return QImage();
             }
-        }
+        } else
+            uri = identifier;
 
         if (!requestedSize.isEmpty())
-            return Utils::setupQRCode(uri, 0).scaled(requestedSize, Qt::KeepAspectRatio);
+            return Utils::getQRCodeImage(uri, 0).scaled(requestedSize, Qt::KeepAspectRatio);
         else
-            return Utils::setupQRCode(uri, 0);
+            return Utils::getQRCodeImage(uri, 0);
     }
 };

src/app/settingsview/SettingsSidePanel.qml

@@ -70,10 +70,10 @@ SidePanelBase {
                         "title": JamiStrings.appearance
                     }, {
                         "id": 7,
-                        "title": JamiStrings.locationSharingLabel
+                        "title": JamiStrings.chatSettingsTitle
                     }, {
                         "id": 8,
-                        "title": JamiStrings.fileTransfer
+                        "title": JamiStrings.locationSharingLabel
                     }, {
                         "id": 9,
                         "title": JamiStrings.callRecording

src/app/settingsview/SettingsView.qml

@@ -42,8 +42,8 @@ ListSelectionView {
         "AdvancedSettingsPage": Qt.resolvedUrl("components/AdvancedSettingsPage.qml"),
         "SystemSettingsPage": Qt.resolvedUrl("components/SystemSettingsPage.qml"),
         "AppearanceSettingsPage": Qt.resolvedUrl("components/AppearanceSettingsPage.qml"),
+        "Chat": Qt.resolvedUrl("components/ChatSettingsPage.qml"),
         "LocationSharingSettingsPage": Qt.resolvedUrl("components/LocationSharingSettingsPage.qml"),
-        "FileTransferSettingsPage": Qt.resolvedUrl("components/FileTransferSettingsPage.qml"),
         "CallRecordingSettingsPage": Qt.resolvedUrl("components/CallRecordingSettingsPage.qml"),
         "TroubleshootSettingsPage": Qt.resolvedUrl("components/TroubleshootSettingsPage.qml"),
         "UpdateSettingsPage": Qt.resolvedUrl("components/UpdateSettingsPage.qml"),
@@ -119,10 +119,10 @@ ListSelectionView {
                 replace(currentItem, viewNode.resources["AppearanceSettingsPage"], StackView.Immediate);
                 break;
             case 7:
-                replace(currentItem, viewNode.resources["LocationSharingSettingsPage"], StackView.Immediate);
+                replace(currentItem, viewNode.resources["Chat"], StackView.Immediate);
                 break;
             case 8:
-                replace(currentItem, viewNode.resources["FileTransferSettingsPage"], StackView.Immediate);
+                replace(currentItem, viewNode.resources["LocationSharingSettingsPage"], StackView.Immediate);
                 break;
             case 9:
                 replace(currentItem, viewNode.resources["CallRecordingSettingsPage"], StackView.Immediate);

src/app/settingsview/components/AppearanceSettingsPage.qml

@@ -42,60 +42,6 @@ SettingsPageBase {
         anchors.left: parent.left
         anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
 
-        ColumnLayout {
-            id: generalSettings
-
-            width: parent.width
-            spacing: JamiTheme.settingsCategorySpacing
-
-            Text {
-                id: enableAccountTitle
-
-                Layout.alignment: Qt.AlignLeft
-                Layout.preferredWidth: parent.width
-
-                text: JamiStrings.generalSettingsTitle
-                color: JamiTheme.textColor
-                horizontalAlignment: Text.AlignLeft
-                verticalAlignment: Text.AlignVCenter
-                wrapMode: Text.WordWrap
-
-                font.pixelSize: JamiTheme.settingsTitlePixelSize
-                font.kerning: true
-            }
-
-            ToggleSwitch {
-                id: enableTypingIndicatorCheckbox
-
-                Layout.fillWidth: true
-
-                checked: UtilsAdapter.getAppValue(Settings.EnableTypingIndicator)
-                labelText: JamiStrings.enableTypingIndicator
-                descText: JamiStrings.enableTypingIndicatorDescription
-                tooltipText: JamiStrings.enableTypingIndicator
-
-                onSwitchToggled: UtilsAdapter.setAppValue(Settings.Key.EnableTypingIndicator, checked)
-            }
-
-            ToggleSwitch {
-                id: displayImagesCheckbox
-                visible: WITH_WEBENGINE
-
-                Layout.fillWidth: true
-
-                checked: UtilsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews)
-
-                labelText: JamiStrings.displayHyperlinkPreviews
-                descText: JamiStrings.displayHyperlinkPreviewsDescription
-
-                tooltipText: JamiStrings.displayHyperlinkPreviews
-
-                onSwitchToggled: {
-                    UtilsAdapter.setAppValue(Settings.Key.DisplayHyperlinkPreviews, checked);
-                }
-            }
-        }
-
         ColumnLayout {
             id: themeSettings
 
@@ -308,11 +254,7 @@ SettingsPageBase {
             preferredWidth: defaultSettingsTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
 
             onClicked: {
-                enableTypingIndicatorCheckbox.checked = UtilsAdapter.getDefault(Settings.Key.EnableTypingIndicator);
-                displayImagesCheckbox.checked = UtilsAdapter.getDefault(Settings.Key.DisplayHyperlinkPreviews);
                 zoomSpinBox.value = Math.round(UtilsAdapter.getDefault(Settings.BaseZoom) * 100.0);
-                UtilsAdapter.setToDefault(Settings.Key.EnableTypingIndicator);
-                UtilsAdapter.setToDefault(Settings.Key.DisplayHyperlinkPreviews);
                 UtilsAdapter.setToDefault(Settings.Key.AppTheme);
                 UtilsAdapter.setToDefault(Settings.Key.BaseZoom);
                 themeSettings.isComplete();

src/app/settingsview/components/ChatSettingsPage.qml

@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+ * Author: Fadi Shehadeh <fadi.shehadeh@savoirfairelinux.com>
+ * Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import net.jami.Enums 1.1
+import net.jami.Constants 1.1
+import net.jami.Helpers 1.1
+import "../../commoncomponents"
+import "../../mainview/components"
+import "../../mainview/js/contactpickercreation.js" as ContactPickerCreation
+
+SettingsPageBase {
+    id: root
+
+    property int itemWidth: 188
+    title: JamiStrings.chatSettingsTitle
+
+    flickableContent: ColumnLayout {
+        id: callSettingsColumnLayout
+
+        anchors.topMargin: 10
+        width: contentFlickableWidth
+        spacing: 2 * JamiTheme.settingsCategorySpacing
+        anchors.left: parent.left
+        anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
+
+        ColumnLayout {
+            id: generalSettings
+
+            width: parent.width
+            spacing: JamiTheme.settingsCategorySpacing
+
+            Text {
+                id: enableAccountTitle
+
+                Layout.alignment: Qt.AlignLeft
+                Layout.preferredWidth: parent.width
+
+                text: "View"
+                color: JamiTheme.textColor
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+                wrapMode: Text.WordWrap
+
+                font.pixelSize: JamiTheme.settingsTitlePixelSize
+                font.kerning: true
+            }
+
+            ToggleSwitch {
+                id: enableTypingIndicatorCheckbox
+
+                Layout.fillWidth: true
+
+                checked: UtilsAdapter.getAppValue(Settings.EnableTypingIndicator)
+                labelText: JamiStrings.enableTypingIndicator
+                descText: JamiStrings.enableTypingIndicatorDescription
+                tooltipText: JamiStrings.enableTypingIndicator
+
+                onSwitchToggled: UtilsAdapter.setAppValue(Settings.Key.EnableTypingIndicator, checked)
+            }
+
+            ToggleSwitch {
+                id: displayImagesCheckbox
+                visible: WITH_WEBENGINE
+
+                Layout.fillWidth: true
+
+                checked: UtilsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews)
+
+                labelText: JamiStrings.displayHyperlinkPreviews
+                descText: JamiStrings.displayHyperlinkPreviewsDescription
+
+                tooltipText: JamiStrings.displayHyperlinkPreviews
+
+                onSwitchToggled: {
+                    UtilsAdapter.setAppValue(Settings.Key.DisplayHyperlinkPreviews, checked);
+                }
+            }
+        }
+
+        ColumnLayout {
+            id: textFormattingSettings
+
+            width: parent.width
+            spacing: JamiTheme.settingsCategorySpacing
+
+            Text {
+                id: textFormattingTitle
+
+                Layout.alignment: Qt.AlignLeft
+                Layout.preferredWidth: parent.width
+
+                text: JamiStrings.textFormatting
+                color: JamiTheme.textColor
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+                wrapMode: Text.WordWrap
+
+                font.pixelSize: JamiTheme.settingsTitlePixelSize
+                font.kerning: true
+            }
+
+            Text {
+                id: textFormattingDescription
+
+                Layout.alignment: Qt.AlignLeft
+                Layout.preferredWidth: parent.width
+
+                text: JamiStrings.textFormattingDescription
+                color: JamiTheme.textColor
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+                wrapMode: Text.WordWrap
+            }
+
+            Flow {
+
+                Layout.preferredWidth: parent.width
+                Layout.preferredHeight: childrenRect.height
+                spacing: 10
+
+                ButtonGroup {
+                    id: optionsB
+                }
+
+                MaterialRadioButton {
+                    id: enterButton
+
+                    width: 120
+                    height: 40
+                    backgroundColor: JamiTheme.chatSettingButtonBackgroundColor
+                    textColor: JamiTheme.chatSettingButtonTextColor
+                    checkedColor: JamiTheme.chatSettingButtonBorderColor
+                    borderColor: JamiTheme.chatSettingButtonBorderColor
+
+                    text: JamiStrings.enter
+                    ButtonGroup.group: optionsB
+
+                    onCheckedChanged: {
+                        if (checked)
+                            UtilsAdapter.setAppValue(Settings.Key.ChatViewEnterIsNewLine, true);
+                    }
+                }
+
+                MaterialRadioButton {
+                    id: shiftEnterButton
+
+                    width: 180
+                    height: 40
+                    backgroundColor: JamiTheme.chatSettingButtonBackgroundColor
+                    textColor: JamiTheme.chatSettingButtonTextColor
+                    checkedColor: JamiTheme.chatSettingButtonBorderColor
+                    borderColor: JamiTheme.chatSettingButtonBorderColor
+
+                    text: JamiStrings.shiftEnter
+                    ButtonGroup.group: optionsB
+
+                    onCheckedChanged: {
+                        if (checked)
+                            UtilsAdapter.setAppValue(Settings.Key.ChatViewEnterIsNewLine, false);
+                    }
+                }
+
+                Component.onCompleted: {
+                    if (UtilsAdapter.getAppValue(Settings.Key.ChatViewEnterIsNewLine))
+                        enterButton.checked = true;
+                    else
+                        shiftEnterButton.checked = true;
+                }
+            }
+        }
+
+        ColumnLayout {
+            id: fileTransferSettings
+
+            width: parent.width
+            spacing: JamiTheme.settingsCategorySpacing
+
+            Text {
+                id: fileTransferTitle
+
+                Layout.alignment: Qt.AlignLeft
+                Layout.preferredWidth: parent.width
+
+                text: JamiStrings.fileTransfer
+                color: JamiTheme.textColor
+                horizontalAlignment: Text.AlignLeft
+                verticalAlignment: Text.AlignVCenter
+                wrapMode: Text.WordWrap
+
+                font.pixelSize: JamiTheme.settingsTitlePixelSize
+                font.kerning: true
+            }
+
+            ToggleSwitch {
+                id: autoAcceptFilesCheckbox
+                Layout.fillWidth: true
+
+                checked: CurrentAccount.autoTransferFromTrusted
+                labelText: JamiStrings.autoAcceptFiles
+                tooltipText: JamiStrings.autoAcceptFiles
+                onSwitchToggled: CurrentAccount.autoTransferFromTrusted = checked
+            }
+
+            SettingSpinBox {
+                id: acceptTransferBelowSpinBox
+                Layout.fillWidth: true
+
+                title: JamiStrings.acceptTransferBelow
+                tooltipText: JamiStrings.acceptTransferTooltip
+                itemWidth: root.itemWidth
+                bottomValue: 0
+
+                valueField: CurrentAccount.autoTransferSizeThreshold
+                onNewValue: CurrentAccount.autoTransferSizeThreshold = valueField
+            }
+        }
+
+        MaterialButton {
+            id: defaultSettings
+
+            Layout.topMargin: 20
+
+            TextMetrics {
+                id: defaultSettingsTextSize
+                font.weight: Font.Bold
+                font.pixelSize: JamiTheme.wizardViewButtonFontPixelSize
+                font.capitalization: Font.AllUppercase
+                text: defaultSettings.text
+            }
+
+            secondary: true
+
+            text: JamiStrings.defaultSettings
+            preferredWidth: defaultSettingsTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
+
+            onClicked: {
+                autoAcceptFilesCheckbox.checked = UtilsAdapter.getDefault(Settings.Key.AutoAcceptFiles);
+                acceptTransferBelowSpinBox.valueField = UtilsAdapter.getDefault(Settings.Key.AcceptTransferBelow);
+                UtilsAdapter.setToDefault(Settings.Key.AutoAcceptFiles);
+                UtilsAdapter.setToDefault(Settings.Key.AcceptTransferBelow);
+                UtilsAdapter.setToDefault(Settings.Key.EnableTypingIndicator);
+                UtilsAdapter.setToDefault(Settings.Key.ChatViewEnterIsNewLine);
+                UtilsAdapter.setToDefault(Settings.Key.DisplayHyperlinkPreviews);
+                enableTypingIndicatorCheckbox.checked = UtilsAdapter.getAppValue(Settings.EnableTypingIndicator);
+                displayImagesCheckbox.checked = UtilsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews);
+                if (UtilsAdapter.getAppValue(Settings.Key.ChatViewEnterIsNewLine))
+                    enterButton.checked = true;
+                else
+                    shiftEnterButton.checked = true;
+            }
+        }
+    }
+}

src/app/settingsview/components/FileTransferSettingsPage.qml

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2023 Savoir-faire Linux Inc.
- * Author: Fadi Shehadeh <fadi.shehadeh@savoirfairelinux.com>
- * Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-import QtQuick
-import QtQuick.Layouts
-import net.jami.Models 1.1
-import net.jami.Adapters 1.1
-import net.jami.Enums 1.1
-import net.jami.Constants 1.1
-import net.jami.Helpers 1.1
-import "../../commoncomponents"
-
-SettingsPageBase {
-    id: root
-
-    property int itemWidth: 164
-    title: JamiStrings.fileTransfer
-
-    flickableContent: ColumnLayout {
-        id: callSettingsColumnLayout
-
-        width: contentFlickableWidth
-        spacing: JamiTheme.settingsCategorySpacing
-        anchors.left: parent.left
-        anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
-
-        ToggleSwitch {
-            id: autoAcceptFilesCheckbox
-            Layout.fillWidth: true
-
-            checked: CurrentAccount.autoTransferFromTrusted
-            labelText: JamiStrings.autoAcceptFiles
-            tooltipText: JamiStrings.autoAcceptFiles
-            onSwitchToggled: CurrentAccount.autoTransferFromTrusted = checked
-        }
-
-        SettingSpinBox {
-            id: acceptTransferBelowSpinBox
-            Layout.fillWidth: true
-
-            title: JamiStrings.acceptTransferBelow
-            tooltipText: JamiStrings.acceptTransferTooltip
-            itemWidth: root.itemWidth
-            bottomValue: 0
-
-            valueField: CurrentAccount.autoTransferSizeThreshold
-            onNewValue: CurrentAccount.autoTransferSizeThreshold = valueField
-        }
-
-        MaterialButton {
-            id: defaultSettings
-
-            TextMetrics {
-                id: defaultSettingsTextSize
-                font.weight: Font.Bold
-                font.pixelSize: JamiTheme.wizardViewButtonFontPixelSize
-                font.capitalization: Font.AllUppercase
-                text: defaultSettings.text
-            }
-
-            secondary: true
-
-            text: JamiStrings.defaultSettings
-            preferredWidth: defaultSettingsTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
-
-            onClicked: {
-                autoAcceptFilesCheckbox.checked = UtilsAdapter.getDefault(Settings.Key.AutoAcceptFiles);
-                acceptTransferBelowSpinBox.valueField = UtilsAdapter.getDefault(Settings.Key.AcceptTransferBelow);
-                UtilsAdapter.setToDefault(Settings.Key.AutoAcceptFiles);
-                UtilsAdapter.setToDefault(Settings.Key.AcceptTransferBelow);
-            }
-        }
-    }
-}

src/app/settingsview/components/LinkDeviceDialog.qml

@@ -23,16 +23,16 @@ import net.jami.Models 1.1
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
 import "../../commoncomponents"
+import "../../mainview/components"
 
 BaseModalDialog {
     id: root
 
     signal accepted
 
-    title: JamiStrings.addDevice
+    title: JamiStrings.linkNewDevice
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
+    property bool darkTheme: UtilsAdapter.useApplicationTheme()
 
     popupContent: StackLayout {
         id: stackedWidget
@@ -50,12 +50,11 @@ BaseModalDialog {
         function setExportPage(status, pin) {
             if (status === NameDirectory.ExportOnRingStatus.SUCCESS) {
                 infoLabel.success = true;
-                infoLabelsRowLayout.visible = true;
-                infoLabel.text = JamiStrings.pinTimerInfos;
+                pinRectangle.visible = true
                 exportedPIN.text = pin;
             } else {
-                infoLabel.success = false;
-                infoLabelsRowLayout.visible = false;
+                pinRectangle.success = false;
+                infoLabel.visible = true;
                 switch (status) {
                 case NameDirectory.ExportOnRingStatus.WRONG_PASSWORD:
                     infoLabel.text = JamiStrings.incorrectPassword;
@@ -69,6 +68,7 @@ BaseModalDialog {
                 }
             }
             stackedWidget.currentIndex = exportingInfoPage.pageIndex;
+            stackedWidget.height = exportingLayout.implicitHeight;
         }
 
         Timer {
@@ -87,15 +87,14 @@ BaseModalDialog {
 
             function onExportOnRingEnded(status, pin) {
                 stackedWidget.setExportPage(status, pin);
+                countdownTimer.start();
             }
         }
 
         onVisibleChanged: {
             if (visible) {
-                infoLabel.text = JamiStrings.pinTimerInfos;
                 if (CurrentAccount.hasArchivePassword) {
                     stackedWidget.currentIndex = enterPasswordPage.pageIndex;
-                    passwordEdit.forceActiveFocus();
                 } else {
                     setGeneratingPage();
                 }
@@ -108,15 +107,23 @@ BaseModalDialog {
 
             readonly property int pageIndex: 0
 
-            ColumnLayout {
-                anchors.fill: parent
+            Component.onCompleted: passwordEdit.forceActiveFocus()
 
-                spacing: 16
+            onHeightChanged: {
+                stackedWidget.height = passwordLayout.implicitHeight
+            }
+
+            ColumnLayout {
+                id: passwordLayout
+                spacing: JamiTheme.preferredMarginSize
+                anchors.centerIn: parent
 
                 Label {
-                    Layout.alignment: Qt.AlignHCenter
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.maximumWidth: root.width - 4 * JamiTheme.preferredMarginSize
+                    wrapMode: Text.Wrap
 
-                    text: JamiStrings.enterAccountPassword
+                    text: JamiStrings.enterPasswordPinCode
                     color: JamiTheme.textColor
                     font.pointSize: JamiTheme.textFontSize
                     font.kerning: true
@@ -124,70 +131,48 @@ BaseModalDialog {
                     verticalAlignment: Text.AlignVCenter
                 }
 
-                PasswordTextEdit {
-                    id: passwordEdit
-
-                    firstEntry: true
-                    placeholderText: JamiStrings.password
-
+                RowLayout {
                     Layout.topMargin: 10
                     Layout.leftMargin: JamiTheme.cornerIconSize
                     Layout.rightMargin: JamiTheme.cornerIconSize
-                    Layout.alignment: Qt.AlignLeft
-                    Layout.fillWidth: true
+                    spacing: JamiTheme.preferredMarginSize
+                    Layout.bottomMargin: JamiTheme.preferredMarginSize
 
-                    KeyNavigation.up: btnConfirm
-                    KeyNavigation.down: KeyNavigation.up
+                    PasswordTextEdit {
+                        id: passwordEdit
 
-                    onDynamicTextChanged: {
-                        btnConfirm.enabled = dynamicText.length > 0;
+                        firstEntry: true
+                        placeholderText: JamiStrings.password
+
+                        Layout.alignment: Qt.AlignLeft
+                        Layout.fillWidth: true
+
+                        KeyNavigation.up: btnConfirm
+                        KeyNavigation.down: KeyNavigation.up
+
+                        onDynamicTextChanged: {
+                            btnConfirm.enabled = dynamicText.length > 0;
+                            btnConfirm.hoverEnabled = dynamicText.length > 0;
+                        }
+                        onAccepted: btnConfirm.clicked()
                     }
-                    onAccepted: btnConfirm.clicked()
-                }
 
-                RowLayout {
-                    Layout.alignment: Qt.AlignCenter
-                    Layout.fillWidth: true
-                    spacing: 16
-
-                    MaterialButton {
+                    JamiPushButton {
                         id: btnConfirm
 
-                        Layout.alignment: Qt.AlignHCenter
+                        Layout.alignment: Qt.AlignCenter
+                        height: 40
+                        width: 40
+                        preferredSize: 60
 
-                        preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                        buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                        color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
-                        hoveredColor: JamiTheme.buttonTintedBlackHovered
-                        pressedColor: JamiTheme.buttonTintedBlackPressed
-                        secondary: true
-                        autoAccelerator: true
+                        hoverEnabled: false
                         enabled: false
 
-                        text: JamiStrings.exportAccount
+                        imageColor: JamiTheme.tintedBlue
+                        source: JamiResources.check_box_24dp_svg
 
                         onClicked: stackedWidget.setGeneratingPage()
-                    }
 
-                    MaterialButton {
-                        id: btnCancel
-
-                        Layout.alignment: Qt.AlignHCenter
-
-                        preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                        buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                        color: JamiTheme.buttonTintedBlack
-                        hoveredColor: JamiTheme.buttonTintedBlackHovered
-                        pressedColor: JamiTheme.buttonTintedBlackPressed
-                        secondary: true
-                        autoAccelerator: true
-                        enabled: true
-
-                        text: JamiStrings.optionCancel
-
-                        onClicked: close()
                     }
                 }
             }
@@ -199,15 +184,21 @@ BaseModalDialog {
 
             readonly property int pageIndex: 1
 
-            ColumnLayout {
-                anchors.fill: parent
+            onHeightChanged: {
+                stackedWidget.height = spinnerLayout.implicitHeight
+            }
 
-                spacing: 16
+
+            ColumnLayout {
+                id: spinnerLayout
+
+                spacing: JamiTheme.preferredMarginSize
+                anchors.centerIn: parent
 
                 Label {
                     Layout.alignment: Qt.AlignCenter
 
-                    text: JamiStrings.linkNewDevice
+                    text: JamiStrings.linkDevice
                     color: JamiTheme.textColor
                     font.pointSize: JamiTheme.headerFontSize
                     font.kerning: true
@@ -237,44 +228,85 @@ BaseModalDialog {
 
             readonly property int pageIndex: 2
 
+            width: childrenRect.width
+            height: childrenRect.height
+
+            onHeightChanged: {
+                stackedWidget.height = exportingLayout.implicitHeight
+            }
+
             ColumnLayout {
-                anchors.fill: parent
+                id: exportingLayout
 
-                spacing: 16
+                spacing: JamiTheme.preferredMarginSize
 
-                Item {
-                    id: infoLabelsRowLayout
+                Label {
+                    id: instructionLabel
+
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth
+                    Layout.alignment: Qt.AlignCenter
+
+                    color: JamiTheme.textColor
+                    padding: 8
+
+                    wrapMode: Text.Wrap
+                    text: JamiStrings.linkingInstructions
+                    font.pointSize: JamiTheme.textFontSize
+                    font.kerning: true
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                }
+
+                Rectangle {
+                    Layout.alignment: Qt.AlignCenter
+
+                    border.width: 3
+                    border.color: JamiTheme.textColor
+                    radius: JamiTheme.primaryRadius
+                    color: darkTheme ? JamiTheme.textColor : JamiTheme.secondaryBackgroundColor
+                    width: 170
+                    height: 170
+
+                    Image {
+                         id: qrImage
+
+                         anchors.fill: parent
+                         anchors.margins: 10
+
+                         mipmap: false
+                         smooth: false
+
+                         source: "image://qrImage/raw_" + exportedPIN.text
+                         sourceSize.width: 150
+                         sourceSize.height: 150
+                    }
+                }
+
+                Rectangle {
+                    id: pinRectangle
+
+                    radius: 15
+                    color: darkTheme ? JamiTheme.tintedBlue : JamiTheme.pinBackgroundColor
+
+                    width: exportedPIN.implicitWidth + 4 * JamiTheme.preferredMarginSize
+                    height: exportedPIN.implicitHeight + 2 * JamiTheme.preferredMarginSize
 
                     Layout.alignment: Qt.AlignCenter
                     Layout.margins: JamiTheme.preferredMarginSize
-                    Layout.preferredWidth: yourPinLabel.contentWidth + exportedPIN.contentWidth + 5
-                    Label {
-                        id: yourPinLabel
-
-                        anchors.left: infoLabelsRowLayout.left
-                        anchors.verticalCenter: infoLabelsRowLayout.verticalCenter
-
-                        text: JamiStrings.yourPinIs
-                        color: JamiTheme.textColor
-                        font.pointSize: JamiTheme.headerFontSize
-                        font.kerning: true
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignVCenter
-                    }
 
                     MaterialLineEdit {
                         id: exportedPIN
 
-                        anchors.left: yourPinLabel.right
-                        anchors.leftMargin: 5
-                        anchors.verticalCenter: infoLabelsRowLayout.verticalCenter
-
                         padding: 0
+                        anchors.centerIn: parent
 
                         text: JamiStrings.pin
                         wrapMode: Text.NoWrap
 
-                        color: JamiTheme.textColor
+                        backgroundColor: darkTheme ? JamiTheme.tintedBlue : JamiTheme.pinBackgroundColor
+
+                        color: darkTheme ? JamiTheme.textColor : JamiTheme.tintedBlue
                         selectByMouse: true
                         readOnly: true
                         font.pointSize: JamiTheme.headerFontSize
@@ -284,16 +316,101 @@ BaseModalDialog {
                     }
                 }
 
+                RowLayout {
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.bottomMargin: JamiTheme.preferredMarginSize
+                    spacing: 0
+
+                    Label {
+                        id: validityLabel
+
+                        Layout.alignment: Qt.AlignRight
+
+                        color: JamiTheme.textColor
+                        text: JamiStrings.pinValidity
+                        font.pointSize: JamiTheme.textFontSize
+                        font.kerning: true
+                    }
+
+                    Label {
+                        id: countdownLabel
+
+                        color: JamiTheme.textColor
+                        Layout.alignment: Qt.AlignLeft
+                        font.pointSize: JamiTheme.textFontSize
+                        font.kerning: true
+
+                        text: "10:00"
+                    }
+
+                    Timer {
+                         id: countdownTimer
+                         interval: 1000
+                         repeat: true
+
+                         property int remainingTime: 600
+
+                         onTriggered: {
+                             remainingTime--
+
+                             var minutes = Math.floor(remainingTime / 60)
+                             var seconds = remainingTime % 60
+                             countdownLabel.text = (minutes < 10 ? "0" : "") + minutes + ":" + (seconds < 10 ? "0" : "") + seconds
+
+                             if (remainingTime <= 0) {
+                                 validityLabel.visible = false
+                                 countdownLabel.text = JamiStrings.pinExpired
+                                 countdownLabel.color = JamiTheme.redColor
+                                 countdownTimer.stop()
+                              }
+                          }
+                     }
+
+                }
+
+                Label {
+                    id: otherDeviceLabel
+
+                    Layout.alignment: Qt.AlignCenter
+
+                    color: JamiTheme.textColor
+                    text: JamiStrings.onAnotherDevice
+                    font.pointSize: JamiTheme.smallFontSize
+                    font.kerning: true
+                    font.bold: true
+                }
+
+                Label {
+                    id: otherInstructionLabel
+
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth
+                    Layout.bottomMargin: JamiTheme.preferredMarginSize
+                    Layout.alignment: Qt.AlignCenter
+                    wrapMode: Text.Wrap
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+
+                    color: JamiTheme.textColor
+                    text: JamiStrings.onAnotherDeviceInstruction
+                    font.pointSize: JamiTheme.smallFontSize
+                    font.kerning: true
+                }
+
+                // Displays error messages
                 Label {
                     id: infoLabel
 
+                    visible: false
+
                     property bool success: false
                     property int borderWidth: success ? 1 : 0
                     property int borderRadius: success ? 15 : 0
                     property string backgroundColor: success ? "whitesmoke" : "transparent"
                     property string borderColor: success ? "lightgray" : "transparent"
 
-                    Layout.maximumWidth: stackedWidget.width - JamiTheme.preferredMarginSize * 2
+                    Layout.maximumWidth: JamiTheme.preferredDialogWidth
+                    Layout.margins: JamiTheme.preferredMarginSize
 
                     Layout.alignment: Qt.AlignCenter
 
@@ -301,7 +418,6 @@ BaseModalDialog {
                     padding: success ? 8 : 0
 
                     wrapMode: Text.Wrap
-                    text: JamiStrings.pinTimerInfos
                     font.pointSize: success ? JamiTheme.textFontSize : JamiTheme.textFontSize + 3
                     font.kerning: true
                     horizontalAlignment: Text.AlignHCenter
@@ -316,30 +432,6 @@ BaseModalDialog {
                         color: JamiTheme.secondaryBackgroundColor
                     }
                 }
-
-                MaterialButton {
-                    id: btnCloseExportDialog
-
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-                    Layout.bottomMargin: JamiTheme.preferredMarginSize
-
-                    preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                    buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                    color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
-                    hoveredColor: JamiTheme.buttonTintedBlackHovered
-                    pressedColor: JamiTheme.buttonTintedBlackPressed
-                    secondary: true
-                    enabled: true
-
-                    text: JamiStrings.close
-
-                    onClicked: {
-                        if (infoLabel.success)
-                            accepted();
-                        close();
-                    }
-                }
             }
         }
     }

src/app/settingsview/components/LinkedDevicesPage.qml

@@ -39,6 +39,47 @@ SettingsPageBase {
         anchors.left: parent.left
         anchors.leftMargin: JamiTheme.preferredSettingsMarginSize
 
+
+
+        Text {
+            id: linkDescription
+
+            Layout.alignment: Qt.AlignLeft
+            Layout.fillWidth: true
+
+            text: JamiStrings.linkDescription
+            color: JamiTheme.textColor
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+            wrapMode: Text.WordWrap
+
+            font.pixelSize: JamiTheme.settingsDescriptionPixelSize
+            font.kerning: true
+            lineHeight: JamiTheme.wizardViewTextLineHeight
+        }
+
+        MaterialButton {
+            id: linkDeviceBtn
+
+            TextMetrics {
+                id: linkDeviceBtnTextSize
+                font.weight: Font.Bold
+                font.pixelSize: JamiTheme.wizardViewButtonFontPixelSize
+                text: linkDeviceBtn.text
+            }
+
+            preferredWidth: linkDeviceBtnTextSize.width + 2 * JamiTheme.buttontextWizzardPadding
+            Layout.bottomMargin: JamiTheme.preferredMarginSize
+
+            primary: true
+            Layout.alignment: Qt.AlignLeft
+
+            toolTipText: JamiStrings.tipLinkNewDevice
+            text: JamiStrings.linkNewDevice
+
+            onClicked: viewCoordinator.presentDialog(appWindow, "settingsview/components/LinkDeviceDialog.qml")
+        }
+
         Text {
             id: linkedDevicesTitle
 

src/app/settingsview/components/ManageAccountPage.qml

@@ -218,7 +218,7 @@ SettingsPageBase {
                 Layout.alignment: Qt.AlignLeft
 
                 toolTipText: JamiStrings.tipLinkNewDevice
-                text: JamiStrings.linkAnotherDevice
+                text: JamiStrings.linkNewDevice
 
                 onClicked: viewCoordinator.presentDialog(appWindow, "settingsview/components/LinkDeviceDialog.qml")
             }

src/app/settingsview/components/NameRegistrationDialog.qml

@@ -31,14 +31,13 @@ BaseModalDialog {
 
     signal accepted
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     title: JamiStrings.setUsername
 
     popupContent: StackLayout {
         id: stackedWidget
 
+        width: children[currentIndex].width
+
         function startRegistration() {
             stackedWidget.currentIndex = nameRegisterSpinnerPage.pageIndex;
             spinnerMovie.visible = true;
@@ -97,8 +96,10 @@ BaseModalDialog {
 
             readonly property int pageIndex: 0
 
+            width: childrenRect.width
+            height: childrenRect.height
+
             ColumnLayout {
-                anchors.fill: parent
 
                 spacing: 16
 
@@ -179,8 +180,10 @@ BaseModalDialog {
 
             readonly property int pageIndex: 1
 
+            width: childrenRect.width
+            height: childrenRect.height
+
             ColumnLayout {
-                anchors.fill: parent
 
                 spacing: 16
 
@@ -217,8 +220,10 @@ BaseModalDialog {
 
             readonly property int pageIndex: 2
 
+            width: childrenRect.width
+            height: childrenRect.height
+
             ColumnLayout {
-                anchors.fill: parent
 
                 spacing: 16
 

src/app/settingsview/components/PluginAvailableDelegate.qml

@@ -35,8 +35,8 @@ ItemDelegate {
     property string pluginAuthor
     property string pluginShortDescription
     property int pluginStatus
-    property string backgroundLocalPath: UtilsAdapter.getCachePath() + '/backgrounds/' + pluginName + '.jpg'
-    property string iconLocalPath: UtilsAdapter.getCachePath() + '/icons/' + pluginName + '.svg'
+    property string backgroundLocalPath: UtilsAdapter.getCachePath() + '/backgrounds/' + pluginId + '.jpg'
+    property string iconLocalPath: UtilsAdapter.getCachePath() + '/icons/' + pluginId + '.svg'
     readonly property real scalingFactor: 1 + hovered * 0.02
     property string installButtonStatus: {
         switch (pluginStatus) {
@@ -172,7 +172,7 @@ ItemDelegate {
                         defaultImage: JamiResources.plugins_default_icon_svg
                         width: 65
                         height: 65
-                        downloadUrl: PluginAdapter.getIconUrl(pluginName)
+                        downloadUrl: PluginAdapter.getIconUrl(pluginId)
                         localPath: root.iconLocalPath
                     }
                 }

src/app/settingsview/components/PluginPreferencesView.qml

@@ -289,9 +289,10 @@ Item {
                                 "buttonTitles": [JamiStrings.optionOk, JamiStrings.optionCancel],
                                 "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlack],
                                 "buttonCallBacks": [function () {
-                                        PluginListModel.setVersionStatus(PluginName, PluginStatus.INSTALLABLE);
+                                        PluginListModel.setVersionStatus(Id, PluginStatus.INSTALLABLE);
                                         PluginModel.uninstallPlugin(PluginId);
                                         PluginListModel.removePlugin(index);
+                                        PluginAdapter.getPluginsFromStore();
                                         // could not call root from here
                                         settings.ListView.view.parent.closed();
                                     }]

src/app/settingsview/components/RevokeDevicePasswordDialog.qml

@@ -28,9 +28,6 @@ BaseModalDialog {
 
     required property string deviceId
 
-    width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
-    height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
-
     title: JamiStrings.removeDevice
 
     popupContent: ColumnLayout {
@@ -42,7 +39,7 @@ BaseModalDialog {
             id: labelDeletion
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: revokeDeviceContentColumnLayout.width - JamiTheme.preferredMarginSize * 2
+            Layout.maximumWidth: root.parent.width - JamiTheme.preferredMarginSize * 4
 
             text: JamiStrings.confirmRemoval
             color: JamiTheme.textColor