GIT_SILENT: Update version and appstream data for 22.02

Instead have the group as a member of the room manager

.gitignore

@@ -6,3 +6,4 @@ neochat.kdev4
 compile_commands.json
 .cache/
 .vscode/
+kate.project.ctags.*

.gitlab-ci.yml

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+  - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-reuse.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml

.kde-ci.yml

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+# SPDX-License-Identifier: BSD-2-Clause
+
+Dependencies:
+- 'on': ['@all']
+  'require':
+    'frameworks/extra-cmake-modules': '@stable'
+    'frameworks/kcoreaddons': '@stable'
+    'frameworks/kirigami': '@stable'
+    'frameworks/ki18n': '@stable'
+    'frameworks/kconfig': '@stable'
+    'frameworks/syntax-highlighting': '@stable'
+    'frameworks/kitemmodels': '@stable'
+    'frameworks/knotifications': '@stable'
+    'libraries/kquickimageeditor': '@stable'
+- 'on': ['Windows', 'Linux', 'FreeBSD']
+  'require':
+    'frameworks/qqc2-desktop-style': '@stable'
+    'frameworks/kio': '@stable'
+    'frameworks/kwindowsystem': '@stable'
+    'frameworks/sonnet': '@stable'
+    'frameworks/kconfigwidgets': '@stable'
+- 'on': ['Linux', 'FreeBSD']
+  'require':
+    'frameworks/kdbusaddons': '@stable'

.reuse/dep5

@@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: NeoChat
 Upstream-Contact: Carl Schwan <carlschwan@kde.org>
 
-Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat-symbolic.svg android/res/drawable/neochat.png
+Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.svg android/res/drawable/neochat.png
 Copyright: 2020 Carson Black <uhhadd@gmail.com>
 License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
@@ -22,7 +22,7 @@ Files: .gitlab/issue_templates/bug.md
 Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: CC0-1.0
 
-Files: res.qrc
+Files: res.qrc res_android.qrc res_desktop.qrc
 Copyright: None
 License: CC0-1.0
 
@@ -35,7 +35,7 @@ Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>
 Copyright: 2020-2021 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
-Files: neochat.notifyrc
+Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 

CMakeLists.txt

@@ -7,9 +7,10 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(NeoChat)
+set(PROJECT_VERSION "22.02")
 
-set(KF5_MIN_VERSION "5.86.0")
-set(QT_MIN_VERSION "5.15.0")
+set(KF5_MIN_VERSION "5.88.0")
+set(QT_MIN_VERSION "5.15.2")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
@@ -35,10 +36,7 @@ if(NEOCHAT_FLATPAK)
     include(cmake/Flatpak.cmake)
 endif()
 
-# Fix a crash due to problems with quotient's event system. Can probably be removed once the reworked event system is in
-cmake_policy(SET CMP0063 OLD)
-
-ecm_setup_version(1.2.80
+ecm_setup_version(${PROJECT_VERSION}
     VARIABLE_PREFIX NEOCHAT
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
@@ -110,18 +108,25 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro REQUIRED)
+find_package(QCoro5 COMPONENTS Coro QUIET)
+if(NOT QCoro5_FOUND)
+    find_package(QCoro REQUIRED)
+endif()
 
 qcoro_enable_coroutines()
 
+if(NOT Quotient_VERSION_MINOR GREATER 6)
+    cmake_policy(SET CMP0063 OLD)
+endif()
+
+if(ANDROID)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
+endif()
+
 install(FILES org.kde.neochat.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.neochat.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES org.kde.neochat.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
-install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16/apps RENAME org.kde.neochat.svg)
-install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@2/apps RENAME org.kde.neochat.svg)
-install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@3/apps RENAME org.kde.neochat.svg)
-install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/symbolic/apps)
-install(FILES neochat.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
 
 add_definitions(-DQT_NO_FOREACH)
 

LICENSES/BSD-3-Clause.txt

@@ -0,0 +1,11 @@
+Copyright (c) <year> <owner>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/LGPL-2.1-only.txt

@@ -0,0 +1,175 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) The modified work must itself be a software library.
+
+     b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
+
+     c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
+
+     d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
+
+     a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
+
+     b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
+
+     c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
+
+     d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
+
+     e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
+
+     a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
+
+     b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Libraries
+
+If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License).
+
+To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
+
+     This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+
+     This library 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 Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in
+the library `Frob' (a library for tweaking knobs) written
+by James Random Hacker.
+
+signature of Ty Coon, 1 April 1990
+Ty Coon, President of Vice
+That's all there is to it!

android/AndroidManifest.xml

@@ -6,8 +6,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.kde.neochat"
-          android:versionName="0.0.1"
-          android:versionCode="1604412458"
+          android:versionName="${versionName}"
+          android:versionCode="${versionCode}"
           android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"

android/build.gradle

@@ -0,0 +1,96 @@
+/*
+    SPDX-FileCopyrightText: 2018-2020 Volker Krause <vkrause@kde.org>
+    SPDX-FileCopyrightText: 2019 Nicolas Fella <nicolas.fella@gmx.de>
+    SPDX-FileCopyrightText: 2020 Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
+    SPDX-License-Identifier: BSD-3-Clause
+*/
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.6.4'
+    }
+}
+
+repositories {
+    google()
+    jcenter()
+}
+
+
+apply plugin: 'com.android.application'
+apply from: '../version.gradle'
+def timestamp = (int)(new Date().getTime()/1000)
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+}
+
+android {
+    /*******************************************************
+     * The following variables:
+     * - androidBuildToolsVersion,
+     * - androidCompileSdkVersion
+     * - qt5AndroidDir - holds the path to qt android files
+     *                   needed to build any Qt application
+     *                   on Android.
+     *
+     * are defined in gradle.properties file. This file is
+     * updated by QtCreator and androiddeployqt tools.
+     * Changing them manually might break the compilation!
+     *******************************************************/
+
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
+    buildToolsVersion androidBuildToolsVersion
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            resources.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    defaultConfig {
+        minSdkVersion qtMinSdkVersion
+        targetSdkVersion qtTargetSdkVersion
+        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
+    }
+
+    packagingOptions {
+        exclude 'lib/*/*RemoteObjects*'
+        exclude 'lib/*/*StateMachine*'
+        exclude 'lib/*/*_imageformats_qico_*'
+        exclude 'lib/*/*_imageformats_qicns_*'
+        exclude 'lib/*/*_imageformats_qtga_*'
+        exclude 'lib/*/*_imageformats_qtiff_*'
+        exclude 'lib/*/*_qmltooling_*'
+    }
+
+    aaptOptions {
+        // different syntax than above
+        // see https://android.googlesource.com/platform/frameworks/base/+/refs/heads/pie-release/tools/aapt2/util/Files.h#90
+        ignoreAssetsPattern '!<dir>ECM:!<dir>aclocal:!<dir>doc:!<dir>gtk-doc:!<dir>iso-codes:!<dir>man:!<dir>mime:!<dir>pkgconfig:!<dir>qlogging-categories5:!<file>iso_15924.mo:!<file>iso_3166-2.mo:!<file>iso_3166-3.mo:!<file>iso_4217.mo:!<file>iso_639-2.mo:!<file>iso_639-3.mo:!<file>iso_639-5.mo:!<file>kcodecs5_qt.qm:!<file>kde5_xml_mimetypes.qm'
+     }
+
+
+}

android/version.gradle.in

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+ext {
+    projectVersionFull = "@NEOCHAT_VERSION@"
+}

imports/NeoChat/Component/ChatBox/ChatBar.qml

@@ -9,8 +9,7 @@ import QtQuick.Templates 2.15 as T
 import Qt.labs.platform 1.1 as Platform
 import QtQuick.Window 2.15
 
-import org.kde.kirigami 2.15 as Kirigami
-
+import org.kde.kirigami 2.18 as Kirigami
 import org.kde.neochat 1.0
 
 ToolBar {
@@ -69,7 +68,7 @@ ToolBar {
                 font: inputField.font
             }
 
-            T.TextArea {
+            TextArea {
                 id: inputField
                 focus: true
                 /* Some QQC2 styles will have their own predefined backgrounds for TextAreas.
@@ -101,16 +100,9 @@ ToolBar {
                 wrapMode: Text.Wrap
                 readOnly: currentRoom.usesEncryption
 
-                palette: Kirigami.Theme.palette
                 Kirigami.Theme.colorSet: Kirigami.Theme.View
                 Kirigami.Theme.inherit: false
-
-                implicitWidth: Math.max(contentWidth + leftPadding + rightPadding,
-                                        implicitBackgroundWidth + leftInset + rightInset,
-                                        placeholder.implicitWidth + leftPadding + rightPadding)
-                implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
-                                         implicitBackgroundHeight + topInset + bottomInset,
-                                         placeholder.implicitHeight + topPadding + bottomPadding)
+                Kirigami.SpellChecking.enabled: true
 
                 color: Kirigami.Theme.textColor
                 selectionColor: Kirigami.Theme.highlightColor
@@ -119,65 +111,6 @@ ToolBar {
 
                 selectByMouse: !Kirigami.Settings.tabletMode
 
-                cursorDelegate: Loader {
-                    visible: inputField.activeFocus && !inputField.readOnly && inputField.selectionStart === inputField.selectionEnd
-                    active: visible
-                    sourceComponent: CursorDelegate { target: inputField }
-                }
-
-                CursorHandle {
-                    id: selectionStartHandle
-                    target: inputField
-                }
-
-                CursorHandle {
-                    id: selectionEndHandle
-                    target: inputField
-                    isSelectionEnd: true
-                }
-
-                TapHandler {
-                    acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-                    // unfortunately, taphandler's pressed event only triggers when the press is lifted
-                    // we need to use the longpress signal since it triggers when the button is first pressed
-                    longPressThreshold: 0
-                    onLongPressed: TextFieldContextMenu.targetClick(point, inputField, spellcheckhighlighter, inputField.positionAt(point.position.x, point.position.y));
-                }
-
-                onPressAndHold: {
-                    if (!Kirigami.Settings.tabletMode) {
-                        return;
-                    }
-                    forceActiveFocus();
-                    cursorPosition = positionAt(event.x, event.y);
-                    selectWord();
-                }
-
-                onFocusChanged: {
-                    if (focus) {
-                        MobileTextActionsToolBar.controlRoot = inputField;
-                    }
-                }
-
-                Label {
-                    id: placeholder
-                    x: inputField.leftPadding
-                    y: inputField.topPadding
-                    width: inputField.width - (inputField.leftPadding + inputField.rightPadding)
-                    height: inputField.height - (inputField.topPadding + inputField.bottomPadding)
-
-                    text: inputField.placeholderText
-                    font: inputField.font
-                    color: Kirigami.Theme.disabledTextColor
-                    horizontalAlignment: inputField.horizontalAlignment
-                    verticalAlignment: inputField.verticalAlignment
-                    visible: !inputField.length && !inputField.preeditText && (!inputField.activeFocus || inputField.horizontalAlignment !== Qt.AlignHCenter)
-                    wrapMode: Text.Wrap
-                }
-
-
                 ChatDocumentHandler {
                     id: documentHandler
                     document: inputField.textDocument
@@ -187,18 +120,6 @@ ToolBar {
                     room: currentRoom ?? null
                 }
 
-                SpellcheckHighlighter {
-                    id: spellcheckhighlighter
-                    document: inputField.textDocument
-                    cursorPosition: inputField.cursorPosition
-                    selectionStart: inputField.selectionStart
-                    selectionEnd: inputField.selectionEnd
-                    onChangeCursorPosition: {
-                        inputField.cursorPosition = start;
-                        inputField.moveCursorSelection(end, TextEdit.SelectCharacters);
-                    }
-                }
-
                 Timer {
                     id: timeoutTimer
                     repeat: false
@@ -239,9 +160,6 @@ ToolBar {
                 }
 
                 Keys.onPressed: {
-                    // trigger if context menu button is pressed
-                    TextFieldContextMenu.targetKeyPressed(event, inputField)
-
                     if (event.key === Qt.Key_PageDown) {
                         switchRoomDown();
                     } else if (event.key === Qt.Key_PageUp) {
@@ -325,10 +243,7 @@ ToolBar {
                     chatBar.complete();
                 }
 
-                onPressed: MobileTextActionsToolBar.shouldBeVisible = true;
-
                 onTextChanged: {
-                    MobileTextActionsToolBar.shouldBeVisible = false;
                     timeoutTimer.restart()
                     repeatTimer.start()
                     currentRoom.cachedInput = text
@@ -353,7 +268,7 @@ ToolBar {
 
                     completionMenu.completionType = completionInfo.type
                     if (completionInfo.type === ChatDocumentHandler.User) {
-                        completionMenu.model = currentRoom.getUsers(completionInfo.keyword);
+                        completionMenu.model = currentRoom.getUsers(completionInfo.keyword, 10);
                     } else if (completionInfo.type === ChatDocumentHandler.Command) {
                         completionMenu.model = CommandModel.filterModel(completionInfo.keyword);
                     } else {

imports/NeoChat/Component/ChatBox/ChatBox.qml

@@ -95,9 +95,16 @@ Item {
         width: parent.width
         height: visible ? implicitHeight : 0
         anchors.bottom: replySeparator.top
-        sourceComponent: EmojiPicker{
-            textArea: chatBar.textField
-            onChosen: addText(emoji)
+        sourceComponent: QQC2.Pane {
+            topPadding: 0
+            bottomPadding: 0
+            rightPadding: 0
+            leftPadding: 0
+            Kirigami.Theme.colorSet: Kirigami.Theme.View
+            contentItem: EmojiPicker {
+                textArea: chatBar.textField
+                onChosen: addText(emoji)
+            }
         }
         Behavior on height {
             NumberAnimation {

imports/NeoChat/Component/ChatBox/CompletionMenu.qml

@@ -86,6 +86,7 @@ Popup {
                 source: modelData.avatarMediaId ? ("image://mxc/" + modelData.avatarMediaId) : ""
                 color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
             }
+            labelItem.textFormat: Text.PlainText
             text: modelData.displayName
             onClicked: completeTriggered();
         }

imports/NeoChat/Component/ChatBox/CursorDelegate.qml

@@ -1,65 +0,0 @@
-/* SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
- * SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
- * SPDX-License-Identifier: LGPL-2.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Templates 2.15
-import org.kde.kirigami 2.14 as Kirigami
-
-Item {
-    id: root
-    property alias target: root.parent
-
-    Rectangle {
-        id: cursorLine
-        property real previousX: 0
-        property real previousY: 0
-        parent: target
-        implicitWidth: target.cursorRectangle.width
-        implicitHeight: target.cursorRectangle.height
-        x: Math.floor(target.cursorRectangle.x)
-        y: Math.floor(target.cursorRectangle.y)
-
-        color: target.color
-        SequentialAnimation {
-            id: blinkAnimation
-            running: root.visible && Qt.styleHints.cursorFlashTime != 0 && target.selectionStart === target.selectionEnd
-            PropertyAction {
-                target: cursorLine
-                property: "opacity"
-                value: 1
-            }
-            PauseAnimation {
-                duration: Qt.styleHints.cursorFlashTime/2
-            }
-            SequentialAnimation {
-                loops: Animation.Infinite
-                OpacityAnimator {
-                    target: cursorLine
-                    from: 1
-                    to: 0
-                    duration: Qt.styleHints.cursorFlashTime/2
-                    easing.type: Easing.OutCubic
-                }
-                OpacityAnimator {
-                    target: cursorLine
-                    from: 0
-                    to: 1
-                    duration: Qt.styleHints.cursorFlashTime/2
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-    }
-
-    Connections {
-        target: root.target
-        function onCursorPositionChanged() {
-            blinkAnimation.restart()
-        }
-    }
-}
-
-

imports/NeoChat/Component/ChatBox/CursorHandle.qml

@@ -1,98 +0,0 @@
-/* SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
- * SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
- * SPDX-License-Identifier: LGPL-2.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Templates 2.15
-import org.kde.kirigami 2.14 as Kirigami
-
-Loader {
-    id: root
-    property Item target
-    property bool isSelectionEnd: false
-    visible: Kirigami.Settings.tabletMode && target.activeFocus && (isSelectionEnd ? target.selectionStart !== target.selectionEnd : true)
-    active: visible
-    sourceComponent: Kirigami.ShadowedRectangle {
-        id: handle
-        property real selectionStartX: Math.floor(Qt.inputMethod.anchorRectangle.x + (Qt.inputMethod.cursorRectangle.width - width)/2)
-        property real selectionStartY: Math.floor(Qt.inputMethod.anchorRectangle.y + Qt.inputMethod.cursorRectangle.height + pointyBitVerticalOffset)
-        property real selectionEndX: Math.floor(Qt.inputMethod.cursorRectangle.x + (Qt.inputMethod.cursorRectangle.width - width)/2)
-        property real selectionEndY: Math.floor(Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height + pointyBitVerticalOffset)
-        property real pointyBitVerticalOffset: Math.abs(pointyBit.y*2)
-        parent: Overlay.overlay
-        x: isSelectionEnd ? selectionEndX : selectionStartX
-        y: isSelectionEnd ? selectionEndY : selectionStartY
-
-        // HACK: make it appear above most popups that show up in the
-        // overlay in case any of them use TextField or TextArea
-        z: 999
-
-        //opacity: target.activeFocus ? 1 : 0
-        implicitHeight: {
-            let h = Kirigami.Units.gridUnit
-            return h - (h % 2 == 0 ? 1 : 0)
-        }
-        implicitWidth: implicitHeight
-        radius: width/2
-
-        color: target.selectionColor
-
-        shadow {
-            color: Qt.rgba(0,0,0,0.2)
-            size: 3
-            yOffset: 1
-        }
-
-        Rectangle {
-            id: pointyBit
-            x: (parent.width - width)/2
-            y: -height/4 + 0.2 // magic number to get it to line up with the edge of the circle
-            implicitHeight: parent.implicitHeight/2
-            implicitWidth: implicitHeight
-            antialiasing: true
-            rotation: 45
-            color: parent.color
-        }
-
-        Kirigami.ShadowedRectangle {
-            id: inner
-            visible: target.selectionStart !== target.selectionEnd && (handle.y < selectionStartY || handle.y < selectionEndY)
-            anchors.fill: parent
-            anchors.margins: Kirigami.Units.smallBorder
-            color: target.selectedTextColor
-            radius: height/2
-            Rectangle {
-                id: innerPointyBit
-                x: (parent.width - width)/2
-                y: -height/4 + 0.8 // magic number to get it to line up with the edge of the circle
-                implicitHeight: pointyBit.implicitHeight
-                implicitWidth: implicitHeight
-                antialiasing: true
-                rotation: 45
-                color: parent.color
-            }
-        }
-
-        MouseArea {
-            enabled: handle.visible
-            anchors.fill: parent
-    //         preventStealing: true
-            onPositionChanged: {
-                let pos = mapToItem(root.target, mouse.x, mouse.y);
-                pos = root.target.positionAt(pos.x, pos.y - handle.height - handle.pointyBitVerticalOffset);
-
-                if (target.selectionStart !== target.selectionEnd) {
-                    if (!isSelectionEnd) {
-                        root.target.select(Math.min(pos, root.target.selectionEnd - 1), root.target.selectionEnd);
-                    } else {
-                        root.target.select(root.target.selectionStart, Math.max(pos, root.target.selectionStart + 1));
-                    }
-                } else {
-                    root.target.cursorPosition = pos;
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/MobileTextActionsToolBar.qml

@@ -1,77 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2018 Marco Martin <mart@kde.org>
-
-    SPDX-License-Identifier: LGPL-2.0-or-later
-*/
-
-pragma Singleton
-
-import QtQuick 2.1
-import QtQuick.Layouts 1.2
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.15
-import org.kde.kirigami 2.5 as Kirigami
-
-Popup {
-    id: root
-
-    property Item controlRoot
-    parent: controlRoot ? controlRoot.Window.contentItem : undefined
-    modal: false
-    focus: false
-    closePolicy: Popup.NoAutoClose
-    property bool shouldBeVisible: false
-
-    x: {
-        if (!controlRoot || !controlRoot.Window.contentItem) {
-            return 0;
-        }
-        return Math.min(Math.max(0, controlRoot.mapToItem(root.parent, controlRoot.positionToRectangle(controlRoot.selectionStart).x, 0).x - root.width/2), controlRoot.Window.contentItem.width - root.width);
-    }
-
-    y: {
-        if (!controlRoot || !controlRoot.Window.contentItem) {
-            return 0;
-        }
-        var desiredY = controlRoot.mapToItem(root.parent, 0, controlRoot.positionToRectangle(controlRoot.selectionStart).y).y  - root.height;
-
-        if (desiredY >= 0) {
-            return Math.min(desiredY, controlRoot.Window.contentItem.height - root.height);
-        } else {
-            return Math.min(Math.max(0, controlRoot.mapToItem(root.parent, 0, controlRoot.positionToRectangle(controlRoot.selectionEnd).y + Math.round(Kirigami.Units.gridUnit*1.5)).y), controlRoot.Window.contentItem.height - root.height);
-        }
-    }
-
-
-    visible: controlRoot ? shouldBeVisible && Qt.platform.os !== "android" && Kirigami.Settings.tabletMode && (controlRoot.selectedText.length > 0 || controlRoot.canPaste) : false
-
-    width: contentItem.implicitWidth + leftPadding + rightPadding
-
-    contentItem: RowLayout {
-        ToolButton {
-            focusPolicy: Qt.NoFocus
-            icon.name: "edit-cut"
-            visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal)
-            onClicked: {
-                controlRoot.cut();
-            }
-        }
-        ToolButton {
-            focusPolicy: Qt.NoFocus
-            icon.name: "edit-copy"
-            visible: controlRoot && controlRoot.selectedText.length > 0 && (!controlRoot.hasOwnProperty("echoMode") || controlRoot.echoMode === TextInput.Normal)
-            onClicked: {
-                controlRoot.copy();
-            }
-        }
-        ToolButton {
-            focusPolicy: Qt.NoFocus
-            icon.name: "edit-paste"
-            visible: controlRoot && controlRoot.canPaste
-            onClicked: {
-                controlRoot.paste();
-            }
-        }
-    }
-}
-

imports/NeoChat/Component/ChatBox/ReplyPane.qml

@@ -87,7 +87,7 @@ Loader {
                         readOnly: true
                         wrapMode: Label.Wrap
                         textFormat: TextEdit.RichText
-                        background: null
+                        background: Item {}
                         HoverHandler {
                             cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
                         }

imports/NeoChat/Component/ChatBox/TextFieldContextMenu.qml

@@ -1,259 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2020 Devin Lin <espidev@gmail.com>
-    SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
-
-    SPDX-License-Identifier: LGPL-2.0-or-later
-*/ 
-
-pragma Singleton
-
-import QtQuick 2.6
-import QtQml 2.2
-import QtQuick.Controls 2.15
-import org.kde.kirigami 2.5 as Kirigami
-
-Menu {
-    id: contextMenu
-
-    property Item target
-    property bool deselectWhenMenuClosed: true
-    property int restoredCursorPosition: 0
-    property int restoredSelectionStart
-    property int restoredSelectionEnd
-    property bool persistentSelectionSetting
-    property var spellcheckhighlighter: null
-    property var suggestions: ([])
-    Component.onCompleted: persistentSelectionSetting = persistentSelectionSetting // break binding
-
-    property var runOnMenuClose 
-
-    parent: Overlay.overlay
-
-    function storeCursorAndSelection() {
-        contextMenu.restoredCursorPosition = target.cursorPosition;
-        contextMenu.restoredSelectionStart = target.selectionStart;
-        contextMenu.restoredSelectionEnd = target.selectionEnd;
-    }
-
-    // target is pressed with mouse
-    function targetClick(handlerPoint, newTarget, spellcheckhighlighter, mousePosition) {
-        if (handlerPoint.pressedButtons === Qt.RightButton) { // only accept just right click
-            if (contextMenu.visible) {
-                deselectWhenMenuClosed = false; // don't deselect text if menu closed by right click on textfield
-                dismiss();
-            } else {
-                contextMenu.target = newTarget;
-                contextMenu.target.persistentSelection = true; // persist selection when menu is opened
-                contextMenu.spellcheckhighlighter = spellcheckhighlighter
-                contextMenu.suggestions = spellcheckhighlighter.suggestions(mousePosition);
-                storeCursorAndSelection();
-                popup(contextMenu.target);
-                // slightly locate context menu away from mouse so no item is selected when menu is opened
-                x += 1
-                y += 1
-            }
-        } else {
-            dismiss();
-        }
-    }
-
-    // context menu keyboard key
-    function targetKeyPressed(event, newTarget) {
-        if (event.modifiers === Qt.NoModifier && event.key === Qt.Key_Menu) {
-            contextMenu.target = newTarget;
-            target.persistentSelection = true; // persist selection when menu is opened
-            storeCursorAndSelection();
-            popup(contextMenu.target);
-        }
-    }
-
-    readonly property bool targetIsPassword: target !== null && (target.echoMode === TextInput.PasswordEchoOnEdit || target.echoMode === TextInput.Password)
-
-    onAboutToShow: {
-        if (Overlay.overlay) {
-            let tempZ = 0
-            for (let i in Overlay.overlay.visibleChildren) {
-                tempZ = Math.max(tempZ, Overlay.overlay.visibleChildren[i].z)
-            }
-            z = tempZ + 1
-        }
-    }
-
-    // deal with whether or not text should be deselected
-    onClosed: {
-        // restore text field's original persistent selection setting
-        target.persistentSelection = persistentSelectionSetting
-        // deselect text field text if menu is closed not because of a right click on the text field
-        if (deselectWhenMenuClosed) {
-            target.deselect();
-        }
-        deselectWhenMenuClosed = true;
-
-        // restore cursor position
-        target.forceActiveFocus();
-        target.cursorPosition = restoredCursorPosition;
-        target.select(restoredSelectionStart, restoredSelectionEnd);
-
-        // run action
-        runOnMenuClose();
-    }
-
-    onOpened: {
-        runOnMenuClose = function() {};
-    }
-
-    Instantiator {
-        active: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
-        model: suggestions
-        delegate: MenuItem {
-            text: modelData
-            onClicked: {
-                deselectWhenMenuClosed = false;
-                runOnMenuClose = function() {
-                    spellcheckhighlighter.replaceWord(modelData);
-                };
-            }
-        }
-        onObjectAdded: contextMenu.insertItem(0, object)
-        onObjectRemoved: contextMenu.removeItem(0)
-    }
-
-    MenuItem {
-        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled && suggestions.length === 0
-        action: Action {
-            text: spellcheckhighlighter ? i18nc("@action:inmenu", "No suggestions for %1", spellcheckhighlighter.wordUnderMouse) : ""
-            enabled: false
-        }
-    }
-
-    MenuSeparator {
-        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
-    }
-
-    MenuItem {
-        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
-        action: Action {
-            text: i18n("Add to dictionary")
-            onTriggered: {
-                deselectWhenMenuClosed = false;
-                runOnMenuClose = function() {
-                    spellcheckhighlighter.addWordToDictionary(spellcheckhighlighter.wordUnderMouse)
-                };
-            }
-        }
-    }
-
-    MenuItem {
-        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
-        action: Action {
-            text: i18n("Ignore")
-            onTriggered: {
-                deselectWhenMenuClosed = false;
-                runOnMenuClose = function() {
-                    spellcheckhighlighter.ignoreWord(spellcheckhighlighter.wordUnderMouse)
-                };
-            }
-        }
-    }
-
-    MenuSeparator {
-        visible: target !== null && !target.readOnly && spellcheckhighlighter !== null && spellcheckhighlighter.wordIsMisspelled
-    }
-
-    MenuItem {
-        visible: target !== null && !target.readOnly
-        action: Action {
-            icon.name: "edit-undo-symbolic"
-            text: i18nc("@action:inmenu", "Undo")
-            shortcut: StandardKey.Undo
-        }
-        enabled: target !== null && target.canUndo
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.undo()};
-        }
-    }
-    MenuItem {
-        visible: target !== null && !target.readOnly
-        action: Action {
-            icon.name: "edit-redo-symbolic"
-            text: i18nc("@action:inmenu", "Redo")
-            shortcut: StandardKey.Redo
-        }
-        enabled: target !== null && target.canRedo
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.redo()};
-        }
-    }
-    MenuSeparator {
-        visible: target !== null && !target.readOnly
-    }
-    MenuItem {
-        visible: target !== null && !target.readOnly && !targetIsPassword
-        action: Action {
-            icon.name: "edit-cut-symbolic"
-            text: i18nc("@action:inmenu", "Cut")
-            shortcut: StandardKey.Cut
-        }
-        enabled: target !== null && target.selectedText
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.cut()}
-        }
-    }
-    MenuItem {
-        action: Action {
-            icon.name: "edit-copy-symbolic"
-            text: i18nc("@action:inmenu", "Copy")
-            shortcut: StandardKey.Copy
-        }
-        enabled: target !== null && target.selectedText
-        visible: !targetIsPassword
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.copy()}
-        }
-    }
-    MenuItem {
-        visible: target !== null && !target.readOnly
-        action: Action {
-            icon.name: "edit-paste-symbolic"
-            text: i18nc("@action:inmenu", "Paste")
-            shortcut: StandardKey.Paste
-        }
-        enabled: target !== null && target.canPaste
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.paste()};
-        }
-    }
-    MenuItem {
-        visible: target !== null && !target.readOnly
-        action: Action {
-            icon.name: "edit-delete-symbolic"
-            text: i18nc("@action:inmenu", "Delete")
-            shortcut: StandardKey.Delete
-        }
-        enabled: target !== null && target.selectedText
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.remove(target.selectionStart, target.selectionEnd)};
-        }
-    }
-    MenuSeparator {
-        visible: !targetIsPassword
-    }
-    MenuItem {
-        action: Action {
-            icon.name: "edit-select-all-symbolic"
-            text: i18nc("@action:inmenu", "Select All")
-            shortcut: StandardKey.SelectAll
-        }
-        visible: !targetIsPassword
-        onTriggered: {
-            deselectWhenMenuClosed = false;
-            runOnMenuClose = function() {target.selectAll()};
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/qmldir

@@ -5,7 +5,3 @@ ReplyPane 1.0 ReplyPane.qml
 AttachmentPane 1.0 AttachmentPane.qml
 CompletionMenu 1.0 CompletionMenu.qml
 EmojiPickerPane 1.0 EmojiPickerPane.qml
-singleton TextFieldContextMenu 1.0 TextFieldContextMenu.qml
-CursorDelegate 1.0 CursorDelegate.qml
-CursorHandle 1.0 CursorHandle.qml
-singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml

imports/NeoChat/Component/Emoji/EmojiPicker.qml

@@ -63,7 +63,7 @@ ColumnLayout {
 
                 Layout.preferredWidth: del.label === "custom" ? implicitWidth + Kirigami.Units.largeSpacing : Kirigami.Units.gridUnit * 2
 
-                font.family: del.label === "custom" ? "" : 'emoji'
+                font.family: del.label === "custom" ? Kirigami.Theme.defaultFont.family : 'emoji'
                 text: del.label === "custom" ? i18n("Custom") : del.label
             }
 

imports/NeoChat/Component/FullScreenImage.qml

@@ -16,7 +16,6 @@ ApplicationWindow {
     property int imageHeight: -1
 
     flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
-    visibility: Qt.WindowFullScreen
 
     title: i18n("Image View - %1", filename)
 

imports/NeoChat/Component/Login/Loading.qml

@@ -13,7 +13,7 @@ import NeoChat.Component 1.0
 Kirigami.PlaceholderMessage {
     property var showContinueButton: false
     property var showBackButton: false
-    property string title: i18n("Loading")
+    property string title: i18n("Loading…")
 
     anchors.centerIn: parent
 

imports/NeoChat/Component/Login/Login.qml

@@ -50,7 +50,7 @@ LoginStep {
     }
 
     action: Kirigami.Action {
-        text: LoginHelper.testing && matrixIdField.acceptableInput ? i18n("Loading") : i18nc("@action:button", "Continue")
+        text: LoginHelper.testing && matrixIdField.acceptableInput ? i18n("Loading…") : i18nc("@action:button", "Continue")
         onTriggered: {
             if (LoginHelper.supportsSso && LoginHelper.supportsPassword) {
                 processed("qrc:/imports/NeoChat/Component/Login/LoginMethod.qml");

imports/NeoChat/Component/QuickSwitcher.qml

@@ -11,6 +11,12 @@ import org.kde.neochat 1.0
 QQC2.Popup {
     id: _popup
 
+    Shortcut {
+        sequence: "Ctrl+K"
+        enabled: !Kirigami.Settings.hasPlatformMenuBar
+        onActivated: _popup.open()
+    }
+
     onVisibleChanged: {
         if (!visible) {
             return

imports/NeoChat/Component/Timeline/AudioDelegate.qml

@@ -15,47 +15,62 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
 
-Control {
-    id: root
+TimelineContainer {
+    id: audioDelegate
 
-    Layout.fillWidth: true
+    width: ListView.view.width
+    onReplyClicked: ListView.view.goToEvent(eventID)
+    hoverComponent: hoverActions
+    innerObject: Control {
+        Layout.fillWidth: true
+        Layout.maximumWidth: audioDelegate.bubbleMaxWidth
 
-    Audio {
-        id: audio
-        source: currentRoom.urlToMxcUrl(content.url)
-        autoLoad: false
-    }
+        Audio {
+            id: audio
+            source: currentRoom.urlToMxcUrl(content.url)
+            autoLoad: false
+        }
 
-    contentItem: ColumnLayout {
-        RowLayout {
-            ToolButton {
-                icon.name: audio.playbackState == Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: openFileContext(model, parent)
+        }
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: openFileContext(model, parent)
+        }
 
-                onClicked: {
-                    if (audio.playbackState == Audio.PlayingState) {
-                        audio.pause()
-                    } else {
-                        audio.play()
+        contentItem: ColumnLayout {
+            RowLayout {
+                ToolButton {
+                    icon.name: audio.playbackState == Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+
+                    onClicked: {
+                        if (audio.playbackState == Audio.PlayingState) {
+                            audio.pause()
+                        } else {
+                            audio.play()
+                        }
                     }
                 }
+                Label {
+                    text: model.display
+                }
             }
-            Label {
-                text: model.display
-            }
-        }
-        RowLayout {
-            visible: audio.hasAudio
-            Layout.leftMargin: Kirigami.Units.largeSpacing
-            Layout.rightMargin: Kirigami.Units.largeSpacing
-            // Server doesn't support seeking, so use ProgressBar instead of Slider :(
-            ProgressBar {
-                from: 0
-                to: audio.duration
-                value: audio.position
-            }
+            RowLayout {
+                visible: audio.hasAudio
+                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.rightMargin: Kirigami.Units.largeSpacing
+                // Server doesn't support seeking, so use ProgressBar instead of Slider :(
+                ProgressBar {
+                    from: 0
+                    to: audio.duration
+                    value: audio.position
+                }
 
-            Label {
-                text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
+                Label {
+                    text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
+                }
             }
         }
     }

imports/NeoChat/Component/Timeline/EncryptedDelegate.qml

@@ -3,16 +3,24 @@
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 
-TextEdit {
-    text: i18n("This message is encrypted and the sender has not shared the key with this device.")
-    color: Kirigami.Theme.disabledTextColor
-    font.pointSize: Kirigami.Theme.defaultFont.pointSize
-    selectByMouse: !Kirigami.Settings.isMobile
-    readOnly: true
-    wrapMode: Text.WordWrap
-    textFormat: Text.RichText
+TimelineContainer {
+    id: encryptedDelegate
+    width: ListView.view.width
+
+    innerObject: TextEdit {
+        text: i18n("This message is encrypted and the sender has not shared the key with this device.")
+        color: Kirigami.Theme.disabledTextColor
+        font.pointSize: Kirigami.Theme.defaultFont.pointSize
+        selectByMouse: !Kirigami.Settings.isMobile
+        readOnly: true
+        wrapMode: Text.WordWrap
+        textFormat: Text.RichText
+        Layout.maximumWidth: encryptedDelegate.bubbleMaxWidth
+        Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
+    }
 }

imports/NeoChat/Component/Timeline/EventDelegate.qml

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import Qt.labs.qmlmodels 1.0
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+DelegateChooser {
+    role: "eventType"
+
+    DelegateChoice {
+        roleValue: "state"
+        delegate: StateDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "emote"
+        delegate: MessageDelegate {
+            isEmote: true
+        }
+    }
+
+    DelegateChoice {
+        roleValue: "message"
+        delegate: MessageDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "notice"
+        delegate: MessageDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "image"
+        delegate: ImageDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "sticker"
+        delegate: ImageDelegate {
+            cardBackground: false
+        }
+    }
+
+    DelegateChoice {
+        roleValue: "audio"
+        delegate: AudioDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "video"
+        delegate: VideoDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "file"
+        delegate: FileDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "encrypted"
+        delegate: EncryptedDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "readMarker"
+        delegate: ReadMarkerDelegate {}
+    }
+
+    DelegateChoice {
+        roleValue: "other"
+        delegate: Item {}
+    }
+}

imports/NeoChat/Component/Timeline/FileDelegate.qml

@@ -14,107 +14,17 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
 
-RowLayout {
-    id: root
-    property bool openOnFinished: false
+TimelineContainer {
+    id: fileDelegate
+    width: ListView.view.width
+
+    onReplyClicked: ListView.view.goToEvent(eventID)
+    hoverComponent: hoverActions
+
     readonly property bool downloaded: progressInfo && progressInfo.completed
 
-    Layout.margins: Kirigami.Units.largeSpacing
-
-    spacing: Kirigami.Units.largeSpacing
-
-    states: [
-        State {
-            name: "downloaded"
-            when: progressInfo.completed
-
-            PropertyChanges {
-                target: downloadButton
-
-                icon.name: "document-open"
-
-                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-
-                onClicked: openSavedFile()
-            }
-        },
-        State {
-            name: "downloading"
-            when: progressInfo.active
-
-            PropertyChanges {
-                target: sizeLabel
-                text: i18nc("file download progress", "%1 / %2", Controller.formatByteSize(progressInfo.progress), Controller.formatByteSize(progressInfo.total))
-            }
-            PropertyChanges {
-                target: downloadButton
-                icon.name: "media-playback-stop"
-
-                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                onClicked: currentRoom.cancelFileTransfer(eventId)
-            }
-        },
-        State {
-            name: "raw"
-            when: true
-
-            PropertyChanges {
-                target: downloadButton
-
-                onClicked: root.saveFileAs()
-            }
-        }
-    ]
-
-    Kirigami.Icon {
-        id: ikon
-        source: model.fileMimetypeIcon
-        fallback: "unknown"
-    }
-    ColumnLayout {
-        Layout.alignment: Qt.AlignVCenter
-        Layout.fillWidth: true
-
-        spacing: 0
-
-        QQC2.Label {
-            text: model.display
-            wrapMode: Text.Wrap
-
-            Layout.fillWidth: true
-        }
-        QQC2.Label {
-            id: sizeLabel
-
-            text: Controller.formatByteSize(content.info ? content.info.size : 0)
-            opacity: 0.7
-
-            Layout.fillWidth: true
-        }
-    }
-
-    QQC2.Button {
-        id: downloadButton
-        icon.name: "download"
-
-        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-        QQC2.ToolTip.visible: hovered
-    }
-
-    Component {
-        id: fileDialog
-
-        FileDialog {
-            fileMode: FileDialog.SaveFile
-            folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
-            onAccepted: {
-                currentRoom.downloadFile(eventId, file)
-            }
-        }
-    }
-
     function saveFileAs() {
-        var dialog = fileDialog.createObject(QQC2.ApplicationWindow.overlay)
+        const dialog = fileDialog.createObject(QQC2.ApplicationWindow.overlay)
         dialog.open()
         dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId)
     }
@@ -123,4 +33,112 @@ RowLayout {
         if (Qt.openUrlExternally(progressInfo.localPath)) return;
         if (Qt.openUrlExternally(progressInfo.localDir)) return;
     }
+
+    innerObject: RowLayout {
+
+        Layout.fillWidth: true
+        Layout.maximumWidth: fileDelegate.bubbleMaxWidth
+        Layout.margins: Kirigami.Units.largeSpacing
+
+        spacing: Kirigami.Units.largeSpacing
+
+        states: [
+            State {
+                name: "downloaded"
+                when: progressInfo.completed
+
+                PropertyChanges {
+                    target: downloadButton
+
+                    icon.name: "document-open"
+
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
+
+                    onClicked: openSavedFile()
+                }
+            },
+            State {
+                name: "downloading"
+                when: progressInfo.active
+
+                PropertyChanges {
+                    target: sizeLabel
+                    text: i18nc("file download progress", "%1 / %2", Controller.formatByteSize(progressInfo.progress), Controller.formatByteSize(progressInfo.total))
+                }
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "media-playback-stop"
+
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
+                    onClicked: currentRoom.cancelFileTransfer(eventId)
+                }
+            },
+            State {
+                name: "raw"
+                when: true
+
+                PropertyChanges {
+                    target: downloadButton
+
+                    onClicked: fileDelegate.saveFileAs()
+                }
+            }
+        ]
+
+        Kirigami.Icon {
+            id: ikon
+            source: model.fileMimetypeIcon
+            fallback: "unknown"
+        }
+        ColumnLayout {
+            Layout.alignment: Qt.AlignVCenter
+            Layout.fillWidth: true
+
+            spacing: 0
+
+            QQC2.Label {
+                text: model.display
+                wrapMode: Text.Wrap
+
+                Layout.fillWidth: true
+            }
+            QQC2.Label {
+                id: sizeLabel
+
+                text: Controller.formatByteSize(content.info ? content.info.size : 0)
+                opacity: 0.7
+
+                Layout.fillWidth: true
+            }
+        }
+
+        QQC2.Button {
+            id: downloadButton
+            icon.name: "download"
+
+            QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
+            QQC2.ToolTip.visible: hovered
+        }
+
+        Component {
+            id: fileDialog
+
+            FileDialog {
+                fileMode: FileDialog.SaveFile
+                folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+                onAccepted: {
+                    currentRoom.downloadFile(eventId, file)
+                }
+            }
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: openFileContext(model, parent)
+        }
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: openFileContext(model, parent)
+        }
+    }
 }

imports/NeoChat/Component/Timeline/ImageDelegate.qml

@@ -12,8 +12,14 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
 
-Image {
-    id: img
+
+TimelineContainer {
+    id: imageDelegate
+
+    width: ListView.view.width
+
+    onReplyClicked: ListView.view.goToEvent(eventID)
+    hoverComponent: hoverActions
 
     property var content: model.content
     readonly property bool isAnimated: contentType === "image/gif"
@@ -25,75 +31,90 @@ Image {
     //    readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
     readonly property var info: content.info
     readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId
-    property bool readonly: false
 
-    source: "image://mxc/" + mediaId
+    innerObject: Image {
+        id: img
 
-    Image {
-        anchors.fill: parent
-        source: content.info["xyz.amorgan.blurhash"] ? ("image://blurhash/" + content.info["xyz.amorgan.blurhash"]) : ""
-        visible: parent.status !== Image.Ready
-    }
 
-    fillMode: Image.PreserveAspectFit
+        Layout.maximumWidth: imageDelegate.bubbleMaxWidth
+        source: "image://mxc/" + mediaId
 
-    ToolTip.text: display
-    ToolTip.visible: hoverHandler.hovered
-
-    HoverHandler {
-        id: hoverHandler
-        enabled: img.readonly
-    }
-
-    Rectangle {
-        anchors.fill: parent
-
-        visible: progressInfo.active && !downloaded
-
-        color: "#BB000000"
-
-        ProgressBar {
-            anchors.centerIn: parent
-
-            width: parent.width * 0.8
-
-            from: 0
-            to: progressInfo.total
-            value: progressInfo.progress
+        Image {
+            anchors.fill: parent
+            source: content.info["xyz.amorgan.blurhash"] ? ("image://blurhash/" + content.info["xyz.amorgan.blurhash"]) : ""
+            visible: parent.status !== Image.Ready
         }
-    }
 
-    function saveFileAs() {
-        var dialog = fileDialog.createObject(ApplicationWindow.overlay)
-        dialog.open()
-        dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId)
-    }
+        fillMode: Image.PreserveAspectFit
 
-    Component {
-        id: fileDialog
+        ToolTip.text: model.display
+        ToolTip.visible: hoverHandler.hovered
 
-        FileDialog {
-            fileMode: FileDialog.SaveFile
-            folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
-            onAccepted: {
-                currentRoom.downloadFile(eventId, file)
+        HoverHandler {
+            id: hoverHandler
+        }
+
+        Rectangle {
+            anchors.fill: parent
+
+            visible: progressInfo.active && !downloaded
+
+            color: "#BB000000"
+
+            ProgressBar {
+                anchors.centerIn: parent
+
+                width: parent.width * 0.8
+
+                from: 0
+                to: progressInfo.total
+                value: progressInfo.progress
             }
         }
-    }
 
-    function downloadAndOpen()
-    {
-        if (downloaded) openSavedFile()
-        else
-        {
-            openOnFinished = true
-            currentRoom.downloadFile(eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
+        Component {
+            id: fileDialog
+
+            FileDialog {
+                fileMode: FileDialog.SaveFile
+                folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+                onAccepted: {
+                    currentRoom.downloadFile(eventId, file)
+                }
+            }
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: openFileContext(model, parent)
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: openFileContext(model, parent)
+            onTapped: {
+                fullScreenImage.createObject(parent, {
+                    filename: eventId,
+                    localPath: currentRoom.urlToDownload(eventId),
+                    blurhash: model.content.info["xyz.amorgan.blurhash"],
+                    imageWidth: content.info.w,
+                    imageHeight: content.info.h
+                }).showFullScreen();
+            }
+        }
+
+        function downloadAndOpen() {
+            if (downloaded) {
+                openSavedFile()
+            } else {
+                openOnFinished = true
+                currentRoom.downloadFile(eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
+            }
+        }
+
+        function openSavedFile() {
+            if (Qt.openUrlExternally(progressInfo.localPath)) return;
+            if (Qt.openUrlExternally(progressInfo.localDir)) return;
         }
     }
-
-    function openSavedFile()
-    {
-        if (Qt.openUrlExternally(progressInfo.localPath)) return;
-        if (Qt.openUrlExternally(progressInfo.localDir)) return;
-    }
 }

imports/NeoChat/Component/Timeline/MessageDelegate.qml

@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import Qt.labs.qmlmodels 1.0
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+TimelineContainer {
+    id: messageDelegate
+
+    width: ListView.view.width
+    property bool isEmote: false
+
+    onReplyClicked: ListView.view.goToEvent(eventID)
+    hoverComponent: hoverActions
+
+    innerObject: RichLabel {
+        isEmote: messageDelegate.isEmote
+        Layout.maximumWidth: messageDelegate.bubbleMaxWidth
+
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: openMessageContext(model, parent.selectedText)
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: openMessageContext(model, parent.selectedText)
+        }
+    }
+}

imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml

@@ -0,0 +1,78 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import Qt.labs.qmlmodels 1.0
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+QQC2.ItemDelegate {
+    padding: Kirigami.Units.largeSpacing
+    topInset: Kirigami.Units.largeSpacing
+    topPadding: Kirigami.Units.largeSpacing * 2
+    width: ListView.view.width - Kirigami.Units.gridUnit
+    x: Kirigami.Units.gridUnit / 2
+    contentItem: QQC2.Label {
+        text: i18nc("Relative time since the room was last read", "Last read: %1", time)
+    }
+
+    background: Kirigami.ShadowedRectangle {
+        color: Kirigami.Theme.backgroundColor
+        opacity: 0.6
+        radius: Kirigami.Units.smallSpacing
+        shadow.size: Kirigami.Units.smallSpacing
+        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
+        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+        border.width: 1
+    }
+
+    Timer {
+        id: makeMeDisapearTimer
+        interval: Kirigami.Units.humanMoment * 2
+        onTriggered: if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
+            currentRoom.markAllMessagesAsRead();
+        }
+    }
+
+    ListView.onPooled: makeMeDisapearTimer.stop()
+
+    ListView.onAdd: {
+        const view = ListView.view;
+        if (view.atYEnd) {
+            makeMeDisapearTimer.start()
+        }
+    }
+
+    // When the read marker is visible and we are at the end of the list,
+    // start the makeMeDisapearTimer
+    Connections {
+        target: ListView.view
+        function onAtYEndChanged() {
+            makeMeDisapearTimer.start();
+        }
+    }
+
+
+    ListView.onRemove: {
+        const view = ListView.view;
+
+        if (view.atYEnd) {
+            // easy case just mark everything as read
+            if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
+                currentRoom.markAllMessagesAsRead();
+            }
+            return;
+        }
+
+        // mark the last visible index
+        const lastVisibleIdx = lastVisibleIndex();
+
+        if (lastVisibleIdx < index) {
+            currentRoom.readMarkerEventId = sortedMessageEventModel.data(sortedMessageEventModel.index(lastVisibleIdx, 0), MessageEventModel.EventIdRole)
+        }
+    }
+}

imports/NeoChat/Component/Timeline/ReplyComponent.qml

@@ -75,11 +75,10 @@ MouseArea {
 
         Component {
             id: textComponent
-            TextDelegate {
+            RichLabel {
                 id: replyText
                 textMessage: reply.display
                 textFormat: Text.RichText
-                hasContextMenu: false
                 width: Math.min(implicitWidth, bubbleMaxWidth - Kirigami.Units.largeSpacing * 3)
                 x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
             }

imports/NeoChat/Component/Timeline/RichLabel.qml

@@ -18,10 +18,6 @@ TextEdit {
     property string textMessage: model.display
     property bool spoilerRevealed: !hasSpoiler.test(textMessage)
 
-    property bool hasContextMenu: true
-
-    signal requestOpenMessageContext()
-
     ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
 
     Layout.fillWidth: Config.compactLayout
@@ -77,16 +73,4 @@ a{
         enabled: !parent.hoveredLink && !spoilerRevealed
         onTapped: spoilerRevealed = true
     }
-
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: openMessageContext(model, parent.selectedText)
-        enabled: hasContextMenu
-    }
-
-    TapHandler {
-        acceptedButtons: Qt.LeftButton
-        onLongPressed: requestOpenMessageContext()
-        enabled: hasContextMenu
-    }
 }

imports/NeoChat/Component/Timeline/StateDelegate.qml

@@ -11,7 +11,9 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 
 RowLayout {
-    id: row
+    x: Kirigami.Units.gridUnit * 1.5 + Kirigami.Units.smallSpacing
+    height: label.contentHeight
+    width: ListView.view.width - Kirigami.Units.largeSpacing - x
 
     Kirigami.Avatar {
         id: icon
@@ -36,6 +38,7 @@ RowLayout {
     }
 
     Label {
+        id: label
         Layout.alignment: Qt.AlignVCenter
         Layout.fillWidth: true
         Layout.preferredHeight: icon.height

imports/NeoChat/Component/Timeline/TimelineContainer.qml

@@ -16,7 +16,6 @@ QQC2.ItemDelegate {
     id: messageDelegate
     default property alias innerObject : column.children
     // readonly property bool failed: marks == EventStatus.SendingFailed
-    property bool isLoaded
 
     property bool isEmote: false
     property bool cardBackground: true
@@ -25,7 +24,6 @@ QQC2.ItemDelegate {
 
     property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && model.author.isLocalUser && !applicationWindow().wideScreen
 
-    signal saveFileAs()
     signal openExternally()
     signal replyClicked(string eventID)
 

imports/NeoChat/Component/Timeline/VideoDelegate.qml

@@ -15,13 +15,19 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
 
-Video {
-    id: vid
+TimelineContainer {
+    id: videoDelegate
+
+    width: ListView.view.width
+
+    onReplyClicked: ListView.view.goToEvent(eventID)
+    hoverComponent: hoverActions
 
     property bool playOnFinished: false
     readonly property bool downloaded: progressInfo && progressInfo.completed
 
     property bool supportStreaming: true
+    readonly property int maxWidth: 1000 // TODO messageListView.width
 
     onDownloadedChanged: {
         if (downloaded) {
@@ -34,102 +40,112 @@ Video {
         }
     }
 
+    innerObject: Video {
+        id: vid
 
-    readonly property int maxWidth: 1000 // TODO messageListView.width
+        Layout.maximumWidth: videoDelegate.bubbleMaxWidth
+        Layout.fillWidth: true
+        Layout.maximumHeight: Kirigami.Units.gridUnit * 15
+        Layout.minimumHeight: Kirigami.Units.gridUnit * 5
 
-    Layout.preferredWidth: content.info.w > maxWidth ? maxWidth : content.info.w
-    Layout.preferredHeight: content.info.w > maxWidth ? (content.info.h / content.info.w * maxWidth) : content.info.h
+        Layout.preferredWidth: (model.content.info.w === undefined || model.content.info.w > videoDelegate.maxWidth) ? videoDelegate.maxWidth : content.info.w
+        Layout.preferredHeight: model.content.info.w === undefined ? (videoDelegate.maxWidth * 3 / 4) : (model.content.info.w > videoDelegate.maxWidth ? (model.content.info.h / model.content.info.w * videoDelegate.maxWidth) : model.content.info.h)
 
-    loops: MediaPlayer.Infinite
+        loops: MediaPlayer.Infinite
 
-    fillMode: VideoOutput.PreserveAspectFit
+        fillMode: VideoOutput.PreserveAspectFit
 
-    Component.onCompleted: {
-        if (downloaded) {
-            source = progressInfo.localPath
-        } else {
-            source = currentRoom.urlToMxcUrl(content.url)
+        Component.onCompleted: {
+            if (downloaded) {
+                source = progressInfo.localPath
+            } else {
+                source = currentRoom.urlToMxcUrl(content.url)
+            }
         }
-    }
 
-    onDurationChanged: {
-        if (!duration) {
-            supportStreaming = false;
+        onDurationChanged: {
+            if (!duration) {
+                vid.supportStreaming = false;
+            }
         }
-    }
 
-    onErrorChanged: {
-        if (error != MediaPlayer.NoError) {
-            supportStreaming = false;
+        onErrorChanged: {
+            if (error != MediaPlayer.NoError) {
+                vid.supportStreaming = false;
+            }
         }
-    }
 
-    Image {
-        readonly property bool isThumbnail: content.info.thumbnail_info && content.thumbnailMediaId
-        readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
+        Image {
+            anchors.fill: parent
 
-        anchors.fill: parent
+            visible: vid.playbackState == MediaPlayer.StoppedState || vid.error != MediaPlayer.NoError
 
-        visible: isThumbnail  && (vid.playbackState == MediaPlayer.StoppedState || vid.error != MediaPlayer.NoError)
+            source: model.content.thumbnailMediaId ? "image://mxc/" + model.content.thumbnailMediaId : ""
 
-        source: "image://mxc/" + (isThumbnail ? content.thumbnailMediaId : "")
-
-        sourceSize.width: info.w
-        sourceSize.height: info.h
-
-        fillMode: Image.PreserveAspectFit
-    }
-
-    Label {
-        anchors.centerIn: parent
-
-        visible: vid.playbackState == MediaPlayer.StoppedState || vid.error != MediaPlayer.NoError
-        color: "white"
-        text: i18n("Video")
-        font.pixelSize: 16
-
-        padding: 8
-
-        background: Rectangle {
-            radius: Kirigami.Units.smallSpacing
-            color: "black"
-            opacity: 0.3
+            fillMode: Image.PreserveAspectFit
         }
-    }
 
-    Rectangle {
-        anchors.fill: parent
-
-        visible: progressInfo.active && !downloaded
-
-        color: "#BB000000"
-
-        ProgressBar {
+        Label {
             anchors.centerIn: parent
 
-            width: parent.width * 0.8
+            visible: vid.playbackState == MediaPlayer.StoppedState || vid.error != MediaPlayer.NoError
+            color: "white"
+            text: i18n("Video")
+            font.pixelSize: 16
 
-            from: 0
-            to: progressInfo.total
-            value: progressInfo.progress
-        }
-    }
+            padding: 8
 
-    TapHandler {
-        acceptedButtons: Qt.LeftButton
-        onTapped: if (supportStreaming || progressInfo.completed) {
-            if (vid.playbackState == MediaPlayer.PlayingState) {
-                vid.pause()
-            } else {
-                vid.play()
+            background: Rectangle {
+                radius: Kirigami.Units.smallSpacing
+                color: "black"
+                opacity: 0.3
             }
-        } else {
-            downloadAndPlay()
+        }
+
+        Rectangle {
+            anchors.fill: parent
+
+            visible: progressInfo.active && !videoDelegate.downloaded
+
+            color: "#BB000000"
+
+            ProgressBar {
+                anchors.centerIn: parent
+
+                width: parent.width * 0.8
+
+                from: 0
+                to: progressInfo.total
+                value: progressInfo.progress
+            }
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onTapped: if (vid.supportStreaming || progressInfo.completed) {
+                if (vid.playbackState == MediaPlayer.PlayingState) {
+                    vid.pause()
+                } else {
+                    vid.play()
+                }
+            } else {
+                videoDelegate.downloadAndPlay()
+            }
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: openFileContext(model, parent)
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: openFileContext(model, parent)
         }
     }
 
     function downloadAndPlay() {
-        if (downloaded) {
+        if (vid.downloaded) {
             playSavedFile()
         } else {
             playOnFinished = true

imports/NeoChat/Component/Timeline/qmldir

@@ -1,6 +1,6 @@
 module NeoChat.Component.Timeline
+RichLabel 1.0 RichLabel.qml
 TimelineContainer 1.0 TimelineContainer.qml
-TextDelegate 1.0 TextDelegate.qml
 StateDelegate 1.0 StateDelegate.qml
 SectionDelegate 1.0 SectionDelegate.qml
 ImageDelegate 1.0 ImageDelegate.qml
@@ -8,4 +8,7 @@ FileDelegate 1.0 FileDelegate.qml
 VideoDelegate 1.0 VideoDelegate.qml
 ReactionDelegate 1.0 ReactionDelegate.qml
 AudioDelegate 1.0 AudioDelegate.qml
-EncryptedDelegate 1.0 EncryptedDelegate.qml
+EncryptedDelegate 1.0 EncryptedDelegate.qml
+EventDelegate 1.0 EventDelegate.qml
+MessageDelegate 1.0 MessageDelegate.qml
+ReadMarkerDelegate 1.0 ReadMarkerDelegate.qml

imports/NeoChat/Component/TypingPane.qml

@@ -90,6 +90,7 @@ Loader {
                 id: typingLabel
                 elide: Text.ElideRight
                 text: root.labelText
+                textFormat: Text.PlainText
             }
         }
 

imports/NeoChat/Menu/GlobalMenu.qml

@@ -24,11 +24,13 @@ Labs.MenuBar {
         //     text: i18nc("menu", "About NeoChat")
         // }
         Labs.MenuItem {
-            enabled: pageStack.layers.currentItem.title !== i18n("Settings")
-            text: i18nc("menu", "Preferences…")
+            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat...")
+            text: i18nc("menu", "Configure NeoChat...")
 
             shortcut: StandardKey.Preferences
-            onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml")
+            onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml", {}, {
+                title: i18n("Configure")
+            })
         }
         Labs.MenuItem {
             text: i18nc("menu", "Quit NeoChat")

imports/NeoChat/Menu/RoomListContextMenu.qml

@@ -4,6 +4,7 @@
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.19 as Kirigami
 
@@ -13,45 +14,147 @@ import NeoChat.Page 1.0
 /**
  * Context menu when clicking on a room in the room list
  */
-Menu {
+Loader {
     id: root
     property var room
+    signal closed()
 
-    MenuItem {
-        id: newWindow
-        text: i18n("Open in new window")
-        onTriggered: RoomManager.openWindow(room);
-        visible: !Kirigami.Settings.isMobile
+    Component {
+        id: regularMenu
+        Menu {
+            MenuItem {
+                id: newWindow
+                text: i18n("Open in new window")
+                onTriggered: RoomManager.openWindow(room);
+                visible: !Kirigami.Settings.isMobile
+            }
+
+            MenuSeparator {
+                visible: newWindow.visible
+            }
+
+            MenuItem {
+                text: room.isFavourite ? i18n("Remove from Favourites") : i18n("Add to Favourites")
+                onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+            }
+
+            MenuItem {
+                text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize")
+                onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0)
+            }
+
+            MenuItem {
+                text: i18n("Mark as Read")
+                onTriggered: room.markAllMessagesAsRead()
+            }
+
+            MenuItem {
+                text: i18nc("@action:inmenu", "Copy address to clipboard")
+                onTriggered: if (room.canonicalAlias.length === 0) {
+                    Clipboard.saveText(room.id)
+                } else {
+                    Clipboard.saveText(room.canonicalAlias)
+                }
+            }
+
+            MenuSeparator {}
+
+            MenuItem {
+                text: i18n("Leave Room")
+                onTriggered: RoomManager.leaveRoom(room)
+            }
+
+            onClosed: {
+                root.closed()
+                destroy()
+            }
+        }
     }
 
-    MenuSeparator {
-        visible: newWindow.visible
+    Component {
+        id: mobileMenu
+
+        Kirigami.OverlayDrawer {
+            id: drawer
+            height: popupContent.implicitHeight
+            edge: Qt.BottomEdge
+            padding: 0
+            leftPadding: 0
+            rightPadding: 0
+            bottomPadding: 0
+            topPadding: 0
+
+            parent: applicationWindow().overlay
+
+            ColumnLayout {
+                id: popupContent
+                width: parent.width
+                spacing: 0
+                RowLayout {
+                    id: headerLayout
+                    Layout.fillWidth: true
+                    Layout.margins: Kirigami.Units.largeSpacing
+                    spacing: Kirigami.Units.largeSpacing
+                    Kirigami.Avatar {
+                        id: avatar
+                        source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
+                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+                        Layout.alignment: Qt.AlignTop
+                    }
+                    Kirigami.Heading {
+                        level: 5
+                        Layout.fillWidth: true
+                        text: room.displayName
+                        wrapMode: Text.WordWrap
+                    }
+                    ToolButton {
+                        checked: room.isFavourite
+                        checkable: true
+                        icon.name: 'favorite'
+                        Accessible.name: room.isFavourite ? i18n("Remove from Favourites") : i18n("Add to Favourites")
+                        onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+                    }
+
+                    ToolButton {
+                        icon.name: 'settings-configure'
+                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
+                    }
+                }
+
+                Kirigami.BasicListItem {
+                    text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize")
+                    onClicked: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0)
+                    implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                }
+
+                Kirigami.BasicListItem {
+                    text: i18n("Mark as Read")
+                    onClicked: room.markAllMessagesAsRead()
+                    implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                }
+                Kirigami.BasicListItem {
+                    text: i18n("Leave Room")
+                    onClicked: RoomManager.leaveRoom(room)
+                    implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                }
+            }
+            onClosed: root.closed()
+        }
     }
 
-    MenuItem {
-        text: room.isFavourite ? i18n("Remove from Favourites") : i18n("Add to Favourites")
+    asynchronous: true
+    sourceComponent: Kirigami.Settings.isMobile ? mobileMenu : regularMenu
 
-        onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+    function open() {
+        active = true;
     }
 
-    MenuItem {
-        text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize")
-
-        onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0)
+    onStatusChanged: if (status == Loader.Ready) {
+        if (Kirigami.Settings.isMobile) {
+            item.open();
+        } else {
+            item.popup();
+        }
     }
-
-    MenuItem {
-        text: i18n("Mark as Read")
-
-        onTriggered: room.markAllMessagesAsRead()
-    }
-
-    MenuSeparator {}
-
-    MenuItem {
-        text: i18n("Leave Room")
-        onTriggered: RoomManager.leaveRoom(room)
-    }
-
-    onClosed: destroy()
 }

imports/NeoChat/Menu/ShareAction.qml

@@ -0,0 +1,71 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.15 as Controls
+import org.kde.kirigami 2.14 as Kirigami
+
+/**
+ * Action that allows an user to share data with other apps and service
+ * installed on their computer. The goal of this high level API is to
+ * adapte itself for each platform and adopt the native component.
+ *
+ * TODO add Android support
+ */
+Kirigami.Action {
+    id: shareAction
+    iconName: "emblem-shared-symbolic"
+    text: i18n("Share")
+    tooltip: i18n("Share the selected media")
+
+    property var doBeforeSharing: () => {}
+    visible: false
+
+    /**
+     * This property holds the input data for purpose.
+     *
+     * @code{.qml}
+     * Purpose.ShareAction {
+     *     inputData: {
+     *         'urls': ['file://home/notroot/Pictures/mypicture.png'],
+     *         'mimeType': ['image/png']
+     *     }
+     * }
+     * @endcode
+     */
+    property var inputData: ({})
+
+    property Instantiator _instantiator: Instantiator {
+        Component.onCompleted: {
+            const purposeModel = Qt.createQmlObject('import org.kde.purpose 1.0 as Purpose;
+Purpose.PurposeAlternativesModel {
+    pluginType: "Export"
+}', shareAction._instantiator);
+            purposeModel.inputData = Qt.binding(function() {
+                return shareAction.inputData;
+            });
+            _instantiator.model = purposeModel;
+            shareAction.visible = true;
+        }
+
+        delegate: Kirigami.Action {
+            property int index
+            text: model.display
+            icon.name: model.iconName
+            onTriggered: {
+                doBeforeSharing();
+                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/ShareDialog.qml', {
+                    title: shareAction.tooltip,
+                    index: index,
+                    model: shareAction._instantiator.model
+                })
+            }
+        }
+        onObjectAdded: {
+            object.index = index;
+            shareAction.children.push(object)
+        }
+        onObjectRemoved: shareAction.children = Array.from(shareAction.children).filter(obj => obj.pluginId !== object.pluginId)
+    }
+}

imports/NeoChat/Menu/ShareActionAndroid.qml

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+import org.kde.kirigami 2.14 as Kirigami
+
+Kirigami.Action {
+    property var inputData: ({})
+    property var doBeforeSharing: () => {}
+    visible: false
+}

imports/NeoChat/Menu/ShareDialog.qml

@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2017 Atul Sharma <atulsharma406@gmail.com>
+ * SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.15 as Controls
+import org.kde.purpose 1.0 as Purpose
+import org.kde.notification 1.0
+import org.kde.kirigami 2.14 as Kirigami
+
+Kirigami.Page {
+    id: window
+
+    leftPadding: 0
+    rightPadding: 0
+    topPadding: 0
+    bottomPadding: 0
+
+    property alias index: jobView.index
+    property alias model: jobView.model
+
+    Controls.Action {
+        shortcut: 'Escape'
+        onTriggered: window.closeDialog()
+    }
+
+    Notification {
+        id: sharingFailed
+        eventId: "sharingFailed"
+        text: i18n("Sharing failed")
+        urgency: Notification.NormalUrgency
+    }
+
+    Notification {
+        id: sharingSuccess
+        eventId: "sharingSuccess"
+        flags: Notification.Persistent
+    }
+
+    Component.onCompleted: jobView.start()
+
+    contentItem: Purpose.JobView {
+        id: jobView
+        onStateChanged: {
+            if (state === Purpose.PurposeJobController.Finished) {
+                if (jobView.job.output.url !== "") {
+                    // Show share url
+                    // TODO no needed anymore in purpose > 5.90
+                    sharingSuccess.text = i18n("Shared url for image is <a href='%1'>%1</a>", jobView.output.url);
+                    sharingSuccess.sendEvent();
+                    Clipboard.saveText(jobView.output.url);
+                }
+                window.closeDialog()
+            } else if (state === Purpose.PurposeJobController.Error) {
+                // Show failure notification
+                sharingFailed.sendEvent();
+
+                window.closeDialog()
+            } else if (state === Purpose.PurposeJobController.Cancelled) {
+                // Do nothing
+                window.closeDialog()
+            }
+        }
+    }
+}

imports/NeoChat/Menu/TextContextMenu.qml

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-
-/**
- * Context menu when clicking on a room in the room list
- */
-Menu {
-    id: root
-    property var selectedText
-
-    Repeater {
-        model: WebShortcutModel {
-            selectedText: root.selectedText
-        }
-        delegate: MenuItem {
-            text: model.display
-            icon.name: model.decoration
-        }
-    }
-
-    MenuSeparator {}
-
-    onClosed: destroy()
-}

imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml

@@ -16,6 +16,7 @@ MessageDelegateContextMenu {
 
     required property var file
     required property var progressInfo
+    required property string mimeType
 
     property list<Kirigami.Action> actions: [
         Kirigami.Action {
@@ -65,7 +66,33 @@ MessageDelegateContextMenu {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                messageSourceSheet.createObject(root, {'sourceText': root.source}).open();
+                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                    sourceText: root.source
+                }, {
+                    title: i18n("Message Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
+            }
+        }
+    ]
+
+    property list<Kirigami.Action> nestedActions: [
+        ShareAction {
+            id: shareAction
+            inputData: {
+                'urls': [],
+                'mimeType': [mimeType]
+            }
+            property string filename: StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId);
+
+            doBeforeSharing: () => {
+                currentRoom.downloadFile(eventId, filename)
+            }
+            Component.onCompleted: {
+                shareAction.inputData = {
+                    urls: [filename],
+                    mimeType: [mimeType]
+                };
             }
         }
     ]

imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -21,6 +21,8 @@ Loader {
     required property string source
     property string selectedText: ""
 
+    property list<Kirigami.Action> nestedActions
+
     property list<Kirigami.Action> actions: [
         Kirigami.Action {
             text: i18n("Edit")
@@ -49,7 +51,12 @@ Loader {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                messageSourceSheet.createObject(page, {'sourceText': loadRoot.source}).open();
+                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                    sourceText: loadRoot.source
+                }, {
+                    title: i18n("Message Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
             }
         }
     ]
@@ -58,9 +65,36 @@ Loader {
         id: regularMenu
 
         QQC2.Menu {
+            id: menu
+            Instantiator {
+                model: loadRoot.nestedActions
+                delegate: QQC2.Menu {
+                    id: menuItem
+                    visible: modelData.visible
+                    title: modelData.text
+
+                    Instantiator {
+                        model: modelData.children
+                        delegate: QQC2.MenuItem {
+                            text: modelData.text
+                            icon.name: modelData.icon.name
+                            onTriggered: modelData.trigger()
+                        }
+                        onObjectAdded: {
+                            menuItem.insertItem(0, object)
+                        }
+                    }
+                }
+                onObjectAdded: {
+                    object.visible = false;
+                    menu.addMenu(object)
+                }
+            }
+
             Repeater {
                 model: loadRoot.actions
                 QQC2.MenuItem {
+                    id: menuItem
                     visible: modelData.visible
                     action: modelData
                     onClicked: loadRoot.item.close();
@@ -69,13 +103,15 @@ Loader {
             QQC2.Menu {
                 id: webshortcutmenu
                 title: i18n("Search for '%1'", webshortcutmodel.trunkatedSearchText)
-                property bool isVisible: selectedText && selectedText.length > 0 && webshortcutmodel.enabled
-                Component.onCompleted: webshortcutmenu.parent.visible = isVisible
+                property bool isVisible: webshortcutmodel.enabled
+                Component.onCompleted: {
+                    webshortcutmenu.parent.visible = isVisible
+                }
                 onIsVisibleChanged: webshortcutmenu.parent.visible = isVisible
                 Instantiator {
                     model: WebShortcutModel {
                         id: webshortcutmodel
-                        selectedText: loadRoot.selectedText
+                        selectedText: loadRoot.selectedText ? loadRoot.selectedText : loadRoot.message
                         onOpenUrl: RoomManager.visitNonMatrix(url)
                     }
                     delegate: QQC2.MenuItem {
@@ -99,7 +135,7 @@ Loader {
 
         Kirigami.OverlayDrawer {
             id: drawer
-            height: popupContent.implicitHeight
+            height: stackView.implicitHeight
             edge: Qt.BottomEdge
             padding: 0
             leftPadding: 0
@@ -109,85 +145,146 @@ Loader {
 
             parent: applicationWindow().overlay
 
-            ColumnLayout {
-                id: popupContent
+            QQC2.StackView {
+                id: stackView
                 width: parent.width
-                spacing: 0
-                RowLayout {
-                    id: headerLayout
-                    Layout.fillWidth: true
-                    Layout.margins: Kirigami.Units.largeSpacing
-                    spacing: Kirigami.Units.largeSpacing
-                    Kirigami.Avatar {
-                        id: avatar
-                        source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
-                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3
-                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3
-                        Layout.alignment: Qt.AlignTop
-                    }
+                implicitHeight: currentItem.implicitHeight
+
+                Component {
+                    id: nestedActionsComponent
                     ColumnLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Heading {
-                            level: 3
-                            Layout.fillWidth: true
-                            text: currentRoom.htmlSafeMemberName(author.id)
-                            wrapMode: Text.WordWrap
+                        id: actionLayout
+                        property string title: ""
+                        property list<Kirigami.Action> actions
+                        width: parent.width
+                        spacing: 0
+                        RowLayout {
+                            QQC2.ToolButton {
+                                icon.name: 'draw-arrow-back'
+                                onClicked: stackView.pop()
+                            }
+                            Kirigami.Heading {
+                                level: 3
+                                Layout.fillWidth: true
+                                text: actionLayout.title
+                                wrapMode: Text.WordWrap
+                            }
                         }
-                        QQC2.Label {
-                            text: message
-                            Layout.fillWidth: true
-                            wrapMode: Text.WordWrap
+                        Repeater {
+                            id: listViewAction
+                            model: actionLayout.actions
 
-                            onLinkActivated: RoomManager.openResource(link);
+                            Kirigami.BasicListItem {
+                                icon: modelData.icon.name
+                                iconColor: modelData.icon.color ?? undefined
+                                enabled: modelData.enabled
+                                visible: modelData.visible
+                                text: modelData.text
+                                onClicked: {
+                                    modelData.triggered()
+                                    loadRoot.item.close();
+                                }
+                                implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                            }
                         }
                     }
                 }
-                Kirigami.Separator {
-                    Layout.fillWidth: true
-                }
-                RowLayout {
+                initialItem: ColumnLayout {
+                    id: popupContent
+                    width: parent.width
                     spacing: 0
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
-                    Repeater {
-                        model: ["👍", "👎️", "😄", "🎉", "🚀", "👀"]
-                        delegate: QQC2.ItemDelegate {
+                    RowLayout {
+                        id: headerLayout
+                        Layout.fillWidth: true
+                        Layout.margins: Kirigami.Units.largeSpacing
+                        spacing: Kirigami.Units.largeSpacing
+                        Kirigami.Avatar {
+                            id: avatar
+                            source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
+                            Layout.preferredWidth: Kirigami.Units.gridUnit * 3
+                            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+                            Layout.alignment: Qt.AlignTop
+                        }
+                        ColumnLayout {
                             Layout.fillWidth: true
-                            Layout.fillHeight: true
-
-                            contentItem: Kirigami.Heading {
-                                horizontalAlignment: Text.AlignHCenter
-                                verticalAlignment: Text.AlignVCenter
-
-                                font.family: "emoji"
-                                text: modelData
+                            Kirigami.Heading {
+                                level: 3
+                                Layout.fillWidth: true
+                                text: currentRoom.htmlSafeMemberName(author.id)
+                                wrapMode: Text.WordWrap
                             }
+                            QQC2.Label {
+                                text: message
+                                Layout.fillWidth: true
+                                wrapMode: Text.WordWrap
 
+                                onLinkActivated: RoomManager.openResource(link);
+                            }
+                        }
+                    }
+                    Kirigami.Separator {
+                        Layout.fillWidth: true
+                    }
+                    RowLayout {
+                        spacing: 0
+                        Layout.fillWidth: true
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                        Repeater {
+                            model: ["👍", "👎️", "😄", "🎉", "🚀", "👀"]
+                            delegate: QQC2.ItemDelegate {
+                                Layout.fillWidth: true
+                                Layout.fillHeight: true
+
+                                contentItem: Kirigami.Heading {
+                                    horizontalAlignment: Text.AlignHCenter
+                                    verticalAlignment: Text.AlignVCenter
+
+                                    font.family: "emoji"
+                                    text: modelData
+                                }
+
+                                onClicked: {
+                                    currentRoom.toggleReaction(eventId, modelData);
+                                    loadRoot.item.close();
+                                }
+                            }
+                        }
+                    }
+                    Kirigami.Separator {
+                        Layout.fillWidth: true
+                    }
+                    Repeater {
+                        id: listViewAction
+                        model: loadRoot.actions
+
+                        Kirigami.BasicListItem {
+                            icon: modelData.icon.name
+                            iconColor: modelData.icon.color ?? undefined
+                            enabled: modelData.enabled
+                            visible: modelData.visible
+                            text: modelData.text
                             onClicked: {
-                                currentRoom.toggleReaction(eventId, modelData);
+                                modelData.triggered()
                                 loadRoot.item.close();
                             }
+                            implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
                         }
                     }
-                }
-                Kirigami.Separator {
-                    Layout.fillWidth: true
-                }
-                Repeater {
-                    id: listViewAction
-                    model: loadRoot.actions
 
-                    Kirigami.BasicListItem {
-                        icon: modelData.icon.name
-                        iconColor: modelData.icon.color ?? undefined
-                        enabled: modelData.enabled
-                        visible: modelData.visible
-                        text: modelData.text
-                        onClicked: {
-                            modelData.triggered()
-                            loadRoot.item.close();
+                    Repeater {
+                        model: loadRoot.nestedActions
+
+                        Kirigami.BasicListItem {
+                            action: modelData
+                            visible: modelData.visible
+                            implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                            onClicked: {
+                                stackView.push(nestedActionsComponent, {
+                                    title: modelData.text,
+                                    actions: modelData.children
+                                });
+                            }
                         }
-                        implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
                     }
                 }
             }

imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml

@@ -7,23 +7,38 @@ import QtQuick.Controls 2.15
 
 import org.kde.syntaxhighlighting 1.0
 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.neochat 1.0
 
-Kirigami.OverlaySheet {
-
+Kirigami.Page {
     property string sourceText
 
+    topPadding: 0
+    leftPadding: 0
+    rightPadding: 0
+    bottomPadding: 0
+
     title: i18n("Message Source")
 
-    TextArea {
-        id: sourceTextArea
-        text: sourceText
-        readOnly: true
-        wrapMode: Text.WordWrap
+    ScrollView {
+        anchors.fill: parent
+        contentWidth: availableWidth
+        TextArea {
+            id: sourceTextArea
+            text: sourceText
+            readOnly: true
+            textFormat: TextEdit.PlainText
+            wrapMode: Text.WordWrap
+            background: Rectangle {
+                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.inherit: false
+                color: Kirigami.Theme.backgroundColor
+            }
 
-        SyntaxHighlighter {
-            textEdit: sourceTextArea
-            repository: Repository
-            definition: "JSON"
+            SyntaxHighlighter {
+                textEdit: sourceTextArea
+                definition: "JSON"
+                repository: Repository
+            }
         }
     }
 }

imports/NeoChat/Menu/qmldir

@@ -2,3 +2,5 @@ module NeoChat.Menu
 RoomListContextMenu 1.0 RoomListContextMenu.qml
 GlobalMenu 1.0 GlobalMenu.qml
 EditMenu 1.0 EditMenu.qml
+ShareAction 1.0 ShareAction.qml
+ShareDialog 1.0 ShareDialog.qml

imports/NeoChat/Page/LoadingPage.qml

@@ -6,12 +6,12 @@ import QtQuick.Controls 2.12 as QQC2
 import org.kde.kirigami 2.12 as Kirigami
 
 Kirigami.Page {
-    title: i18n("Loading")
+    title: i18n("Loading…")
 
     Kirigami.PlaceholderMessage {
         id: loadingIndicator
         anchors.centerIn: parent
-        text: i18n("Loading")
+        text: i18n("Loading…")
         QQC2.BusyIndicator {
             running: loadingIndicator.visible
             Layout.alignment: Qt.AlignHCenter

imports/NeoChat/Page/RoomListPage.qml

@@ -237,12 +237,22 @@ Kirigami.ScrollablePage {
                 bold: unreadCount > 0
                 label: name ?? ""
                 subtitle: {
-                    let txt = (lastEvent.length === 0 ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm, " ")
+                    const txt = (lastEvent.length === 0 ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm, " ")
                     if (txt.length) {
                         return txt
                     }
                     return " "
                 }
+                onPressAndHold: {
+                    const menu = roomListContextMenu.createObject(page, {"room": currentRoom})
+                    configButton.visible = true
+                    configButton.down = true
+                    menu.closed.connect(function() {
+                        configButton.down = undefined
+                        configButton.visible = Qt.binding(function() { return roomListItem.hovered || Kirigami.Settings.isMobile })
+                    })
+                    menu.open()
+                }
 
                 leading: Kirigami.Avatar {
                     source: avatar ? "image://mxc/" + avatar : ""
@@ -269,7 +279,7 @@ Kirigami.ScrollablePage {
                     }
                     QQC2.Button {
                         id: configButton
-                        visible: roomListItem.hovered || Kirigami.Settings.isMobile
+                        visible: roomListItem.hovered
                         Accessible.name: i18n("Configure room")
 
                         action: Kirigami.Action {
@@ -283,7 +293,7 @@ Kirigami.ScrollablePage {
                                     configButton.down = undefined
                                     configButton.visible = Qt.binding(function() { return roomListItem.hovered || Kirigami.Settings.isMobile })
                                 })
-                                menu.popup()
+                                menu.open()
                             }
                         }
                     }
@@ -303,16 +313,15 @@ Kirigami.ScrollablePage {
             spacing: 0
             Repeater {
                 id: accountList
-                model: AccountListModel {
-                    id: accountListModel
-                }
+                model: AccountRegistry
                 delegate: Kirigami.BasicListItem {
                     checkable: true
-                    checked: Controller.activeConnection && Controller.activeConnection.localUser.id === model.user.id
+                    checked: Controller.activeConnection && Controller.activeConnection.localUserId === model.connection.localUserId
                     onClicked: Controller.activeConnection = model.connection
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    text: model.user.id
+                    text: model.connection.localUserId
+                    subtitle: model.connection.localUser.accountLabel
                 }
             }
         }

imports/NeoChat/Page/RoomPage.qml

@@ -26,8 +26,14 @@ Kirigami.ScrollablePage {
     /// Used to determine if scrolling to the bottom should mark the message as unread
     property bool hasScrolledUpBefore: false;
 
+    /// Disable cancel shortcut. Used by the seperate window since it provide its own
+    /// cancel implementation.
+    property bool disableCancelShortcut: false
+
     title: currentRoom.htmlSafeDisplayName
 
+    KeyNavigation.left: pageStack.get(0)
+
     Connections {
         target: RoomManager
         function onCurrentRoomChanged() {
@@ -53,6 +59,12 @@ Kirigami.ScrollablePage {
         connection: Controller.activeConnection
     }
 
+    Shortcut {
+        sequence: StandardKey.Cancel
+        onActivated: applicationWindow().pageStack.get(0).forceActiveFocus()
+        enabled: !page.disableCancelShortcut
+    }
+
     Connections {
         target: Controller.activeConnection
         function onJoinedRoom(room, invited) {
@@ -110,7 +122,7 @@ Kirigami.ScrollablePage {
         id: loadingIndicator
         anchors.centerIn: parent
         visible: page.currentRoom === null || (messageListView.count === 0 && !page.currentRoom.allHistoryLoaded && !page.currentRoom.isInvite)
-        text: i18n("Loading")
+        text: i18n("Loading…")
         QQC2.BusyIndicator {
             running: loadingIndicator.visible
             Layout.alignment: Qt.AlignHCenter
@@ -235,7 +247,6 @@ Kirigami.ScrollablePage {
         readonly property bool isLoaded: page.width * page.height > 10
 
         spacing: Config.compactLayout ? 1 : Kirigami.Units.smallSpacing
-        reuseItems: true
 
         verticalLayoutDirection: ListView.BottomToTop
         highlightMoveDuration: 500
@@ -340,294 +351,7 @@ Kirigami.ScrollablePage {
             sourceModel: messageEventModel
         }
 
-        delegate: DelegateChooser {
-            id: timelineDelegateChooser
-            role: "eventType"
-
-            property bool delegateLoaded: true
-            ListView.onPooled: delegateLoaded = false
-            ListView.onReused: delegateLoaded = true
-
-            DelegateChoice {
-                roleValue: "state"
-                delegate: QQC2.Control {
-                    leftPadding: Kirigami.Units.gridUnit * 1.5 + Kirigami.Units.smallSpacing
-                    topPadding: 0
-                    bottomPadding: 0
-                    contentItem: StateDelegate { }
-                    implicitWidth: messageListView.width - Kirigami.Units.largeSpacing
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "emote"
-                delegate: TimelineContainer {
-                    id: emoteContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    isEmote: true
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-
-                    innerObject: TextDelegate {
-                        isEmote: true
-                        Layout.maximumWidth: emoteContainer.bubbleMaxWidth
-                        onRequestOpenMessageContext: openMessageContext(model, parent.selectedText)
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "message"
-                delegate: TimelineContainer {
-                    id: messageContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-
-                    innerObject: TextDelegate {
-                        Layout.maximumWidth: messageContainer.bubbleMaxWidth
-                        onRequestOpenMessageContext: openMessageContext(model, parent.selectedText)
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "notice"
-                delegate: TimelineContainer {
-                    id: noticeContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    onReplyClicked: goToEvent(eventID)
-
-                    innerObject: TextDelegate {
-                        Layout.fillWidth: !Config.compactLayout
-                        hasContextMenu: false
-                        Layout.maximumWidth: noticeContainer.bubbleMaxWidth
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "image"
-                delegate: TimelineContainer {
-                    id: imageContainer
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    width: messageListView.width
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-
-                    innerObject: ImageDelegate {
-                        Layout.preferredWidth: Kirigami.Units.gridUnit * 15
-                        Layout.maximumWidth: imageContainer.bubbleMaxWidth
-                        Layout.preferredHeight: info.h / info.w * width
-                        Layout.maximumHeight: Kirigami.Units.gridUnit * 20
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(model, parent)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(model, parent)
-                            onTapped: {
-                                fullScreenImage.createObject(parent, {
-                                    filename: eventId,
-                                    localPath: currentRoom.urlToDownload(eventId),
-                                    blurhash: model.content.info["xyz.amorgan.blurhash"],
-                                    imageWidth: content.info.w,
-                                    imageHeight: content.info.h
-                                }).showFullScreen();
-                            }
-                        }
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "sticker"
-                delegate: TimelineContainer {
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    width: messageListView.width
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-                    cardBackground: false
-
-                    innerObject: ImageDelegate {
-                        readonly: true
-                        Layout.maximumWidth: Kirigami.Units.gridUnit * 10
-                        Layout.minimumWidth: Kirigami.Units.gridUnit * 10
-                        Layout.preferredHeight: info.h / info.w * width
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "audio"
-                delegate: TimelineContainer {
-                    id: audioContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-
-                    innerObject: AudioDelegate {
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: audioContainer.bubbleMaxWidth
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(model, parent)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(model, parent)
-                        }
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "video"
-                delegate: TimelineContainer {
-                    id: videoContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    onReplyClicked: goToEvent(eventID)
-                    hoverComponent: hoverActions
-
-                    innerObject: VideoDelegate {
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: videoContainer.bubbleMaxWidth
-                        Layout.preferredHeight: content.info.h / content.info.w * width
-                        Layout.maximumHeight: Kirigami.Units.gridUnit * 15
-                        Layout.minimumHeight: Kirigami.Units.gridUnit * 5
-
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(model, parent)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(model, parent)
-                        }
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "file"
-                delegate: TimelineContainer {
-                    id: fileContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-                    onReplyClicked: goToEvent(eventID)
-
-                    innerObject: FileDelegate {
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: fileContainer.bubbleMaxWidth
-                        TapHandler {
-                            acceptedButtons: Qt.RightButton
-                            onTapped: openFileContext(model, parent)
-                        }
-                        TapHandler {
-                            acceptedButtons: Qt.LeftButton
-                            onLongPressed: openFileContext(model, parent)
-                        }
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "encrypted"
-                delegate: TimelineContainer {
-                    id: encryptedContainer
-                    width: messageListView.width
-                    isLoaded: timelineDelegateChooser.delegateLoaded
-
-                    innerObject: EncryptedDelegate {
-                        Layout.fillWidth: Config.compactLayout
-                        Layout.maximumWidth: encryptedContainer.bubbleMaxWidth
-                        Layout.rightMargin: Kirigami.Units.largeSpacing
-                        Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "readMarker"
-                delegate: QQC2.ItemDelegate {
-                    padding: Kirigami.Units.largeSpacing
-                    topInset: Kirigami.Units.largeSpacing
-                    topPadding: Kirigami.Units.largeSpacing * 2
-                    width: ListView.view.width - Kirigami.Units.gridUnit
-                    x: Kirigami.Units.gridUnit / 2
-                    contentItem: QQC2.Label {
-                        text: i18nc("Relative time since the room was last read", "Last read: %1", time)
-                    }
-
-                    background: Kirigami.ShadowedRectangle {
-                        color: Kirigami.Theme.backgroundColor
-                        opacity: 0.6
-                        radius: Kirigami.Units.smallSpacing
-                        shadow.size: Kirigami.Units.smallSpacing
-                        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-                        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                        border.width: 1
-                    }
-
-                    Timer {
-                        id: makeMeDisapearTimer
-                        interval: Kirigami.Units.humanMoment * 2
-                        onTriggered: if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
-                            currentRoom.markAllMessagesAsRead();
-                        }
-                    }
-
-                    ListView.onPooled: makeMeDisapearTimer.stop()
-
-                    ListView.onAdd: {
-                        const view = ListView.view;
-                        if (view.atYEnd) {
-                            makeMeDisapearTimer.start()
-                        }
-                    }
-
-                    // When the read marker is visible and we are at the end of the list,
-                    // start the makeMeDisapearTimer
-                    Connections {
-                        target: ListView.view
-                        function onAtYEndChanged() {
-                            makeMeDisapearTimer.start();
-                        }
-                    }
-
-
-                    ListView.onRemove: {
-                        const view = ListView.view;
-
-                        if (view.atYEnd) {
-                            // easy case just mark everything as read
-                            if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
-                                currentRoom.markAllMessagesAsRead();
-                            }
-                            return;
-                        }
-
-                        // mark the last visible index 
-                        const lastVisibleIdx = lastVisibleIndex();
-
-                        if (lastVisibleIdx < index) {
-                            currentRoom.readMarkerEventId = sortedMessageEventModel.data(sortedMessageEventModel.index(lastVisibleIdx, 0), MessageEventModel.EventIdRole)
-                        }
-                    }
-                }
-            }
-
-            DelegateChoice {
-                roleValue: "other"
-                delegate: Item {}
-            }
-        }
+        delegate: EventDelegate {}
 
         QQC2.RoundButton {
             anchors.right: parent.right
@@ -642,7 +366,7 @@ Kirigami.ScrollablePage {
             visible: currentRoom && currentRoom.hasUnreadMessages && currentRoom.readMarkerLoaded
             action: Kirigami.Action {
                 onTriggered: {
-                    goToEvent(currentRoom.readMarkerEventId)
+                    messageListView.goToEvent(currentRoom.readMarkerEventId)
                 }
                 icon.name: "go-up"
             }
@@ -711,12 +435,6 @@ Kirigami.ScrollablePage {
             MessageDelegateContextMenu {}
         }
 
-        Component {
-            id: messageSourceSheet
-
-            MessageSourceSheet {}
-        }
-
         Component {
             id: fileDelegateContextMenu
 
@@ -756,6 +474,9 @@ Kirigami.ScrollablePage {
         }
         headerPositioning: ListView.OverlayHeader
 
+        function goToEvent(eventID) {
+            messageListView.positionViewAtIndex(eventToIndex(eventID), ListView.Contain)
+        }
     }
 
 
@@ -837,10 +558,6 @@ Kirigami.ScrollablePage {
         messageListView.positionViewAtIndex(0, ListView.End)
     }
 
-    function goToEvent(eventID) {
-        messageListView.positionViewAtIndex(eventToIndex(eventID), ListView.Contain)
-    }
-
     function eventToIndex(eventID) {
         const index = messageEventModel.eventIDToIndex(eventID)
         if (index === -1)
@@ -876,8 +593,9 @@ Kirigami.ScrollablePage {
             author: event.author,
             message: event.message,
             eventId: event.eventId,
-            source: event.toolTip,
+            source: event.source,
             file: file,
+            mimeType: event.mimeType,
             progressInfo: event.progressInfo,
         });
         contextMenu.open();
@@ -891,7 +609,7 @@ Kirigami.ScrollablePage {
             message: event.message,
             eventId: event.eventId,
             formattedBody: event.formattedBody,
-            source: event.toolTip,
+            source: event.source,
             eventType: event.eventType
         });
         contextMenu.open();

imports/NeoChat/Page/RoomWindow.qml

@@ -12,8 +12,14 @@ Kirigami.ApplicationWindow {
     required property var currentRoom
     minimumWidth: Kirigami.Units.gridUnit * 10
     minimumHeight: Kirigami.Units.gridUnit * 15
+
+    Shortcut {
+        sequence: StandardKey.Cancel
+        onActivated: window.close()
+    }
     pageStack.initialPage: RoomPage {
         visible: true
         currentRoom: window.currentRoom
+        disableCancelShortcut: true
     }
 }

imports/NeoChat/Panel/RoomDrawer.qml

@@ -150,9 +150,15 @@ Kirigami.OverlayDrawer {
                             font.bold: true
                             wrapMode: Label.Wrap
                             text: room ? room.displayName : i18n("No name")
+                            textFormat: Text.PlainText
                         }
-                        Label {
+                        TextEdit {
                             Layout.fillWidth: true
+                            textFormat: TextEdit.PlainText
+                            wrapMode: Text.WordWrap
+                            selectByMouse: true
+                            color: Kirigami.Theme.textColor
+                            readOnly: true
                             text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
                         }
                     }

imports/NeoChat/RoomSettings/Categories.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts 1.15
 
 Kirigami.CategorizedSettings {
     id: root
-    required property var room
+    property var room
     objectName: "settingsPage"
     actions: [
         Kirigami.SettingAction {

imports/NeoChat/Settings/AccountsPage.qml

@@ -11,14 +11,9 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 import NeoChat.Dialog 1.0
 
-Kirigami.Page {
+Kirigami.ScrollablePage {
     title: i18n("Accounts")
 
-    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-
     actions.main: Kirigami.Action {
         text: i18n("Add an account")
         icon.name: "list-add-user"
@@ -26,82 +21,59 @@ Kirigami.Page {
         visible: !pageSettingStack.wideMode
     }
 
-    Connections {
-        target: pageSettingStack
-        function onWideModeChanged() {
-            scroll.background.visible = pageSettingStack.wideMode
-        }
-    }
+    ListView {
+        model: AccountRegistry
+        delegate: Kirigami.SwipeListItem {
+            leftPadding: 0
+            rightPadding: 0
+            Kirigami.BasicListItem {
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
 
-    Controls.ScrollView {
-        id: scroll
-        Component.onCompleted: background.visible = pageSettingStack.wideMode
+                text: model.connection.localUser.displayName
+                labelItem.textFormat: Text.PlainText
+                subtitle: model.connection.localUserId
+                icon: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : "im-user"
 
-        anchors.fill: parent
-
-        Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
-        ListView {
-            clip: true
-            model: AccountListModel { }
-            delegate: Kirigami.SwipeListItem {
-                leftPadding: 0
-                rightPadding: 0
-                Kirigami.BasicListItem {
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-
-                    text: model.user.displayName
-                    labelItem.textFormat: Text.PlainText
-                    subtitle: model.user.id
-                    icon: model.user.avatarMediaId ? ("image://mxc/" + model.user.avatarMediaId) : "im-user"
-
-                    onClicked: {
-                        Controller.activeConnection = model.connection
-                        pageStack.layers.pop()
-                    }
+                onClicked: {
+                    Controller.activeConnection = model.connection
+                    pageStack.layers.pop()
                 }
-                actions: [
-                    Kirigami.Action {
-                        text: i18n("Edit this account")
-                        iconName: "document-edit"
-                        onTriggered: {
-                            userEditSheet.connection = model.connection
-                            userEditSheet.open()
-                        }
-                    },
-                    Kirigami.Action {
-                        text: i18n("Logout")
-                        iconName: "im-kick-user"
-                        onTriggered: {
-                            Controller.logout(model.connection, true)
-                            if(Controller.accountCount === 1)
-                                pageStack.layers.pop()
-                        }
-                    }
-                ]
             }
-        }
-    }
-
-    footer: Column {
-        height: visible ? implicitHeight : 0
-        Kirigami.ActionToolBar {
-            alignment: Qt.AlignRight
-            visible: pageSettingStack.wideMode
-            rightPadding: Kirigami.Units.smallSpacing
-            width: parent.width
-            flat: false
             actions: [
                 Kirigami.Action {
-                    text: i18n("Add an account")
-                    icon.name: "list-add-user"
-                    onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+                    text: i18n("Edit this account")
+                    iconName: "document-edit"
+                    onTriggered: {
+                        userEditSheet.connection = model.connection
+                        userEditSheet.open()
+                    }
+                },
+                Kirigami.Action {
+                    text: i18n("Logout")
+                    iconName: "im-kick-user"
+                    onTriggered: {
+                        Controller.logout(model.connection, true)
+                        if(Controller.accountCount === 1)
+                            pageStack.layers.pop()
+                    }
                 }
             ]
         }
-        Item {
+    }
+
+    footer: Controls.ToolBar {
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        Kirigami.ActionToolBar {
+            alignment: Qt.AlignRight
+            rightPadding: Kirigami.Units.smallSpacing
             width: parent.width
-            height: Kirigami.Units.smallSpacing
+            flat: false
+            actions: Kirigami.Action {
+                text: i18n("Add an account")
+                icon.name: "list-add-user"
+                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+            }
         }
     }
     Connections {
@@ -179,20 +151,28 @@ Kirigami.Page {
                 text: userEditSheet.connection ? userEditSheet.connection.localUser.displayName : ""
                 Kirigami.FormData.label: i18n("Name:")
             }
+            Controls.TextField {
+                id: accountLabel
+                text: userEditSheet.connection ? userEditSheet.connection.localUser.accountLabel : ""
+                Kirigami.FormData.label: i18n("Label:")
+            }
             Controls.TextField {
                 id: currentPassword
                 Kirigami.FormData.label: i18n("Current Password:")
+                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
                 echoMode: TextInput.Password
             }
             Controls.TextField {
                 id: newPassword
                 Kirigami.FormData.label: i18n("New Password:")
+                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
                 echoMode: TextInput.Password
 
             }
             Controls.TextField {
                 id: confirmPassword
                 Kirigami.FormData.label: i18n("Confirm new Password:")
+                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
                 echoMode: TextInput.Password
             }
 
@@ -204,6 +184,8 @@ Kirigami.Page {
                             showPassiveNotification("The Avatar could not be set")
                         if(userEditSheet.connection.localUser.displayName !== name.text)
                             userEditSheet.connection.localUser.rename(name.text)
+                        if(userEditSheet.connection.localUser.accountLabel !== accountLabel.text)
+                            userEditSheet.connection.localUser.setAccountLabel(accountLabel.text)
                         if(currentPassword.text !== "" && newPassword.text !== "" && confirmPassword.text !== "") {
                             if(newPassword.text === confirmPassword.text) {
                                 Controller.changePassword(userEditSheet.connection, currentPassword.text, newPassword.text)

imports/NeoChat/Settings/DevicesPage.qml

@@ -9,71 +9,53 @@ import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
 
-Kirigami.Page {
+Kirigami.ScrollablePage {
     title: i18n("Devices")
 
-    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-
-    Connections {
-        target: pageSettingStack
-        function onWideModeChanged() {
-            scroll.background.visible = pageSettingStack.wideMode
+    ListView {
+        model: DevicesModel {
+            id: devices
         }
-    }
 
-    Controls.ScrollView {
-        id: scroll
-        Component.onCompleted: background.visible = pageSettingStack.wideMode
-        anchors.fill: parent
-        ListView {
-            clip: true
-            model: DevicesModel {
-                id: devices
+        Kirigami.PlaceholderMessage {
+            visible: parent.model.count === 0 // We can assume 0 means loading since there is at least one device
+            anchors.centerIn: parent
+            text: i18n("Loading…")
+            Controls.BusyIndicator {
+                running: parent.visible
             }
+        }
 
-            Kirigami.PlaceholderMessage {
-                visible: parent.model.count === 0 // We can assume 0 means loading since there is at least one device
-                anchors.centerIn: parent
-                text: i18n("Loading")
-                Controls.BusyIndicator {
-                    running: parent.visible
-                }
+        delegate: Kirigami.SwipeListItem {
+            leftPadding: 0
+            rightPadding: 0
+            Kirigami.BasicListItem {
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+
+                text: model.displayName
+                subtitle: model.id
+                icon: "network-connect"
             }
-
-            delegate: Kirigami.SwipeListItem {
-                leftPadding: 0
-                rightPadding: 0
-                Kirigami.BasicListItem {
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-
-                    text: model.displayName
-                    subtitle: model.id
-                    icon: "network-connect"
-                }
-                actions: [
-                    Kirigami.Action {
-                        text: i18n("Edit device name")
-                        iconName: "document-edit"
-                        onTriggered: {
-                            renameSheet.index = model.index
-                            renameSheet.name = model.displayName
-                            renameSheet.open()
-                        }
-                    },
-                    Kirigami.Action {
-                        text: i18n("Logout device")
-                        iconName: "edit-delete-remove"
-                        onTriggered: {
-                            passwordSheet.index = index
-                            passwordSheet.open()
-                        }
+            actions: [
+                Kirigami.Action {
+                    text: i18n("Edit device name")
+                    iconName: "document-edit"
+                    onTriggered: {
+                        renameSheet.index = model.index
+                        renameSheet.name = model.displayName
+                        renameSheet.open()
                     }
-                ]
-            }
+                },
+                Kirigami.Action {
+                    text: i18n("Logout device")
+                    iconName: "edit-delete-remove"
+                    onTriggered: {
+                        passwordSheet.index = index
+                        passwordSheet.open()
+                    }
+                }
+            ]
         }
     }
 

imports/NeoChat/Settings/Emoticons.qml

@@ -13,92 +13,100 @@ import NeoChat.Settings 1.0
 import NeoChat.Component 1.0 as Components
 import NeoChat.Dialog 1.0
 
-Kirigami.Page {
+Kirigami.ScrollablePage {
     title: i18nc('@title:window', 'Custom Emojis')
 
-    leftPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    topPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    bottomPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
-    rightPadding: pageSettingStack.wideMode ? Kirigami.Units.smallSpacing : 0
+    ListView {
+        model: CustomEmojiModel {
+            id: emojiModel
 
-    ColumnLayout {
-        id: column
-        anchors.fill: parent
-
-        Connections {
-            target: pageSettingStack
-            function onWideModeChanged() {
-                scroll.background.visible = pageSettingStack.wideMode
-            }
+            connection: Controller.activeConnection
         }
 
-        QQC2.ScrollView {
-            id: scroll
-            Component.onCompleted: background.visible = pageSettingStack.wideMode
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-
-            ListView {
-                clip: true
-                model: CustomEmojiModel {
-                    id: emojiModel
-
-                    connection: Controller.activeConnection
-                }
-
-                Kirigami.PlaceholderMessage {
-                    anchors.centerIn: parent
-                    text: i18n("No custom inline stickers found")
-                    visible: parent.model.count === 0
-                }
-
-                delegate: Kirigami.BasicListItem {
-                    id: del
-
-                    required property string name
-                    required property url imageURL
-
-                    text: name
-                    reserveSpaceForSubtitle: true
-
-                    leading: Image {
-                        width: height
-                        sourceSize.width: width
-                        sourceSize.height: height
-                        source: imageURL
-
-                        Rectangle {
-                            anchors.fill: parent
-                            visible: parent.status === Image.Loading
-                            radius: height/2
-                            gradient: Components.ShimmerGradient { }
-                        }
-                    }
-
-                    trailing: QQC2.ToolButton {
-                        width: height
-                        icon.name: "delete"
-                        onClicked: emojiModel.removeEmoji(del.name)
-                    }
-                }
-            }
+        Kirigami.PlaceholderMessage {
+            anchors.centerIn: parent
+            text: i18n("No custom inline stickers found")
+            visible: parent.model.count === 0
         }
 
-        Loader {
-            active: pageSettingStack.wideMode
-            sourceComponent: addEmojiComponent
-            Layout.fillWidth: true
+        delegate: Kirigami.BasicListItem {
+            id: del
+
+            required property string name
+            required property url imageURL
+
+            text: name
+            reserveSpaceForSubtitle: true
+
+            leading: Image {
+                width: height
+                sourceSize.width: width
+                sourceSize.height: height
+                source: imageURL
+
+                Rectangle {
+                    anchors.fill: parent
+                    visible: parent.status === Image.Loading
+                    radius: height/2
+                    gradient: Components.ShimmerGradient { }
+                }
+            }
+
+            trailing: QQC2.ToolButton {
+                width: height
+                icon.name: "delete"
+                onClicked: emojiModel.removeEmoji(del.name)
+            }
         }
     }
 
     footer: QQC2.ToolBar {
-        id: toolbar
-        width: parent.width
-        visible: !pageSettingStack.wideMode
-        height: visible ? implicitHeight : 0
-        contentItem: Loader {
-            active: !pageSettingStack.wideMode
-            sourceComponent: addEmojiComponent
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        Kirigami.ActionToolBar {
+            id: emojiCreator
+            alignment: Qt.AlignRight
+            rightPadding: Kirigami.Units.smallSpacing
+            width: parent.width
+            flat: false
+            property string name
+            actions: [
+                Kirigami.Action {
+                    displayComponent: QQC2.TextField {
+                        id: emojiField
+                        placeholderText: i18n("new_emoji_name_here")
+
+                        validator: RegularExpressionValidator {
+                            regularExpression: /[a-zA-Z_0-9]*/
+                        }
+                        onTextChanged: emojiCreator.name = text
+                    }
+                },
+                Kirigami.Action {
+                    text: i18n("Add Emoji...")
+
+                    enabled: emojiCreator.name.length > 0
+                    property var fileDialog: null
+                    icon.name: 'list-add'
+
+                    onTriggered: {
+                        if (this.fileDialog !== null) {
+                            return;
+                        }
+
+                        this.fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay)
+
+                        this.fileDialog.chosen.connect((url) => {
+                            emojiModel.addEmoji(emojiField.text, url)
+                            this.fileDialog = null
+                        })
+                        this.fileDialog.onRejected.connect(() => {
+                            rej()
+                            this.fileDialog = null
+                        })
+                        this.fileDialog.open()
+                    }
+                }
+            ]
         }
     }
 
@@ -109,48 +117,4 @@ Kirigami.Page {
             folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
         }
     }
-
-    property Component addEmojiComponent: RowLayout {
-        Item {
-            Layout.fillWidth: Qt.application.layoutDirection == Qt.LeftToRight
-        }
-
-        QQC2.TextField {
-            id: emojiField
-            placeholderText: i18n("new_emoji_name_here")
-
-            validator: RegularExpressionValidator {
-                regularExpression: /[a-zA-Z_0-9]*/
-            }
-        }
-
-        QQC2.Button {
-            text: i18n("Add Emoji...")
-
-            enabled: emojiField.text != ""
-            property var fileDialog: null
-
-            onClicked: {
-                if (this.fileDialog != null) {
-                    return;
-                }
-
-                this.fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay)
-
-                this.fileDialog.chosen.connect((url) => {
-                    emojiModel.addEmoji(emojiField.text, url)
-                    this.fileDialog = null
-                })
-                this.fileDialog.onRejected.connect(() => {
-                    rej()
-                    this.fileDialog = null
-                })
-                this.fileDialog.open()
-            }
-        }
-
-        Item {
-            Layout.fillWidth: Qt.application.layoutDirection == Qt.RightToLeft
-        }
-    }
 }

imports/NeoChat/Settings/GeneralSettingsPage.qml

@@ -25,6 +25,16 @@ Kirigami.ScrollablePage {
                     Config.save()
                 }
             }
+            QQC2.CheckBox {
+                text: i18n("Minimize to system tray on startup")
+                checked: Config.minimizeToSystemTrayOnStartup
+                visible: Controller.supportSystemTray && !Kirigami.Settings.isMobile
+                enabled: Config.systemTray && !Config.isMinimizeToSystemTrayOnStartupImmutable
+                onToggled: {
+                    Config.minimizeToSystemTrayOnStartup = checked
+                    Config.save()
+                }
+            }
             QQC2.CheckBox {
                 // TODO: When there are enough notification and timeline event
                 // settings, make 2 separate groups with FormData labels.
@@ -46,6 +56,24 @@ Kirigami.ScrollablePage {
                     Config.save()
                 }
             }
+            QQC2.CheckBox {
+                text: i18n("Show name change events")
+                checked: Config.showRename
+                enabled: !Config.isShowRenameImmutable
+                onToggled: {
+                    Config.showRename = checked
+                    Config.save()
+                }
+            }
+            QQC2.CheckBox {
+                text: i18n("Show avatar update events")
+                checked: Config.showAvatarUpdate
+                enabled: !Config.isShowAvatarUpdateImmutable
+                onToggled: {
+                    Config.showAvatarUpdate = checked
+                    Config.save()
+                }
+            }
             QQC2.RadioButton {
                 Kirigami.FormData.label: i18n("Rooms and private chats:")
                 text: i18n("Separated")

imports/NeoChat/Settings/SettingsPage.qml

@@ -29,6 +29,11 @@ Kirigami.CategorizedSettings {
             icon.name: "preferences-desktop-emoticons"
             page: Qt.resolvedUrl("Emoticons.qml")
         },
+        Kirigami.SettingAction {
+            text: i18n("Spell Checking")
+            iconName: "tools-check-spelling"
+            page: Qt.resolvedUrl("SonnetConfigPage.qml")
+        },
         Kirigami.SettingAction {
             text: i18n("Devices")
             iconName: "network-connect"

imports/NeoChat/Settings/SonnetConfigPage.qml

@@ -0,0 +1,336 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+import QtQml 2.15
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+import org.kde.kirigami 2.15 as Kirigami
+import org.kde.sonnet 1.0 as Sonnet
+
+Kirigami.Page {
+    id: page
+
+    /**
+     * This property holds whether the setting on that page are automatically
+     * applied or whether the user can apply then manually. By default, false.
+     */
+    property bool instantApply: false
+
+    /**
+     * This property holds whether the ListViews inside the page should get
+     * extra padding and a background. By default, use the Kirigami.ApplicationWindow
+     * wideMode value.
+     */
+    property bool wideMode: QQC2.ApplicationWindow.window.wideMode ?? QQC2.ApplicationWindow.window.width > Kirigami.Units.gridUnit * 40
+
+    /**
+     * Signal emmited when the user decide to discard it's change and close the
+     * setting page.
+     *
+     * For example when using the ConfigPage inside Kirigami PageRow:
+     *
+     * \code
+     * Sonnet.ConfigPage {
+     *      onClose: applicationWindow().pageStack.pop();
+     * }
+     * \endcode
+     */
+    signal close()
+
+    function onBackRequested(event) {
+        if (settings.modified) {
+            applyDialog.open();
+            event.accepted = true;
+        }
+        if (dialog) {
+            dialog.close();
+        }
+    }
+    title: i18nc('@window:title', 'Spellchecking')
+
+    QQC2.Dialog {
+        id: applyDialog
+        title: qsTr("Apply Settings")
+        contentItem: QQC2.Label {
+            text: qsTr("The settings of the current module have changed.<br /> Do you want to apply the changes or discard them?")
+        }
+        standardButtons: QQC2.Dialog.Ok | QQC2.Dialog.Cancel | QQC2.Dialog.Discard
+
+        onAccepted: {
+            settings.save();
+            applyDialog.close();
+            page.close();
+        }
+        onDiscarded: {
+            applyDialog.close();
+            page.close();
+        }
+        onRejected: applyDialog.close();
+    }
+
+    onWideModeChanged: scroll.background.visible = wideMode;
+
+    leftPadding: wideMode ? Kirigami.Units.gridUnit : 0
+    topPadding: wideMode ? Kirigami.Units.gridUnit : 0
+    bottomPadding: wideMode ? Kirigami.Units.gridUnit : 0
+    rightPadding: wideMode ? Kirigami.Units.gridUnit : 0
+
+    property var dialog: null
+
+    Sonnet.Settings {
+        id: settings
+    }
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        Kirigami.FormLayout {
+            Layout.fillWidth: true
+            Layout.leftMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+            Layout.rightMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+
+            QQC2.ComboBox {
+                Kirigami.FormData.label: i18n("Selected default language:")
+                model: settings.dictionaryModel
+                textRole: "display"
+                valueRole: "languageCode"
+                Component.onCompleted: currentIndex = indexOfValue(settings.defaultLanguage);
+                onActivated: {
+                    settings.defaultLanguage = currentValue;
+                }
+            }
+
+            QQC2.Button {
+                text: i18n("Open Personal Dictionary")
+                onClicked: if (!dialog) {
+                    if (Kirigami.Settings.isMobile) {
+                        dialog = mobileSheet.createObject(page, {settings: settings});
+                        dialog.open();
+                    } else {
+                        dialog = desktopSheet.createObject(page, {settings: settings})
+                        dialog.show();
+                    }
+                } else {
+                    if (Kirigami.Settings.isMobile) {
+                        dialog.open();
+                    } else {
+                        dialog.show();
+                    }
+                }
+            }
+
+            QQC2.CheckBox {
+                Kirigami.FormData.label: i18n("Options:")
+                checked: settings.checkerEnabledByDefault
+                text: i18n("Enable automatic spell checking")
+                onCheckedChanged: {
+                    settings.checkerEnabledByDefault = checked;
+                    if (instantApply) {
+                        settings.save();
+                    }
+                }
+            }
+
+            QQC2.CheckBox {
+                checked: settings.skipUppercase
+                text: i18n("Ignore uppercase words")
+                onCheckedChanged: {
+                    settings.skipUppercase = checked;
+                    if (instantApply) {
+                        settings.save();
+                    }
+                }
+            }
+
+            QQC2.CheckBox {
+                checked: settings.skipRunTogether
+                text: i18n("Ignore hyphenated words")
+                onCheckedChanged: {
+                    settings.skipRunTogether = checked;
+                    if (instantApply) {
+                        settings.save();
+                    }
+                }
+            }
+
+            QQC2.CheckBox {
+                id: autodetectLanguageCheckbox
+                checked: settings.autodetectLanguage
+                text: i18n("Detect language automatically")
+                onCheckedChanged: {
+                    settings.autodetectLanguage = checked;
+                    if (instantApply) {
+                        settings.save();
+                    }
+                }
+            }
+        }
+
+        Kirigami.Heading {
+            level: 2
+            text: i18n("Spell checking languages")
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.leftMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+            Layout.rightMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+        }
+        QQC2.Label {
+            text: i18n("%1 will provide spell checking and suggestions for the languages listed here when autodetection is enabled.", Qt.application.displayName)
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+            Layout.leftMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+            Layout.rightMargin: wideMode ? 0 : Kirigami.Units.largeSpacing
+        }
+
+        QQC2.ScrollView {
+            id: scroll
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            enabled: autodetectLanguageCheckbox.checked
+            Component.onCompleted: background.visible = wideMode
+            ListView {
+                clip: true
+                model: settings.dictionaryModel
+                delegate: Kirigami.CheckableListItem {
+                    label: model.display
+                    action: Kirigami.Action {
+                        onTriggered: model.checked = checked
+                    }
+                    checked: model.checked
+                    trailing: Kirigami.Icon {
+                        source: "favorite"
+                        visible: model.isDefault
+                        HoverHandler {
+                            id: hover
+                        }
+                        QQC2.ToolTip {
+                            visible: hover.hovered
+                            text: qsTr("Default Language")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    component SheetHeader : RowLayout {
+        QQC2.TextField {
+            id: dictionaryField
+            Layout.fillWidth: true
+            placeholderText: i18n("Add a new word to your personal dictionary…")
+        }
+        QQC2.Button {
+            text: i18nc("@action:button", "Add word")
+            icon.name: "list-add"
+            enabled: dictionaryField.text.length > 0
+            onClicked: {
+                add(dictionaryField.text);
+                dictionaryField.clear();
+                if (instantApply) {
+                    settings.save();
+                }
+            }
+            Layout.rightMargin: Kirigami.Units.largeSpacing
+        }
+    }
+
+    Component {
+        id: desktopSheet
+        QQC2.ApplicationWindow {
+            id: window
+            required property Sonnet.Settings settings
+            title: i18n("Spell checking dictionary")
+            width: Kirigami.Units.gridUnit * 20
+            height: Kirigami.Units.gridUnit * 20
+            flags: Qt.Dialog | Qt.WindowCloseButtonHint
+            header: Kirigami.AbstractApplicationHeader {
+                leftPadding: Kirigami.Units.smallSpacing
+                rightPadding: Kirigami.Units.smallSpacing
+                contentItem: SheetHeader {
+                    anchors.fill: parent
+                }
+            }
+            QQC2.ScrollView {
+                anchors.fill: parent
+                ListView {
+                    model: settings.currentIgnoreList
+                    delegate: Kirigami.BasicListItem {
+                        label: model.modelData
+                        trailing: QQC2.ToolButton {
+                            icon.name: "delete"
+                            onClicked: {
+                                remove(modelData)
+                                if (instantApply) {
+                                    settings.save();
+                                }
+                            }
+                            QQC2.ToolTip {
+                                text: i18n("Delete word")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: mobileSheet
+        Kirigami.OverlaySheet {
+            required property Sonnet.Settings settings
+            id: dictionarySheet
+
+            header: SheetHeader {}
+
+            ListView {
+                implicitWidth: Kirigami.Units.gridUnit * 15
+                model: settings.currentIgnoreList
+                delegate: Kirigami.BasicListItem {
+                    label: model.modelData
+                    trailing: QQC2.ToolButton {
+                        icon.name: "delete"
+                        onClicked: {
+                            remove(modelData)
+                            if (instantApply) {
+                                settings.save();
+                            }
+                        }
+                        QQC2.ToolTip {
+                            text: i18n("Delete word")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    footer: QQC2.ToolBar {
+        visible: !instantApply
+        height: visible ? implicitHeight : 0
+        contentItem: RowLayout {
+            Item {
+                Layout.fillWidth: true
+            }
+
+            QQC2.Button  {
+                text: i18n("Apply")
+                enabled: settings.modified
+                onClicked: settings.save();
+            }
+        }
+    }
+
+    function add(word) {
+        const dictionary = settings.currentIgnoreList;
+        dictionary.push(word);
+        settings.currentIgnoreList = dictionary;
+    }
+
+    function remove(word) {
+        settings.currentIgnoreList = settings.currentIgnoreList.filter(function (value, _, _) {
+            return value !== word;
+        });
+    }
+}

imports/NeoChat/Settings/qmldir

@@ -1,3 +1,4 @@
 module NeoChat.Settings
 ThemeRadioButton 1.0 ThemeRadioButton.qml
 SettingsPage 1.0 SettingsPage.qml
+SonnetConfigPage 1.0 SonnetConfigPage.qml

org.kde.neochat-symbolic.svg

@@ -1,13 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#232629;
-      }
-     </style>
-
-	<path class="ColorScheme-Text" style="fill:currentColor; fill-opacity:1; stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="M1 1H15V12H5.68102L2 15.0675V12H1V1ZM2 11H3V12.9325L5.31897 11H14V2H2V11Z"/>
-	<rect class="ColorScheme-Text" style="fill:currentColor; fill-opacity:1; stroke:none" x="3" y="4" width="9" height="1"/>
-	<rect class="ColorScheme-Text" style="fill:currentColor; fill-opacity:1; stroke:none" x="3" y="6" width="7" height="1"/>
-	<rect class="ColorScheme-Text" style="fill:currentColor; fill-opacity:1; stroke:none" x="3" y="8" width="5" height="1"/>
-	<path class="ColorScheme-Text" style="fill:currentColor; fill-opacity:1; stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="M12 12.2929L10.8536 11.1465L10.1465 11.8536L13 14.7071V11.5H12V12.2929Z"/>
-</svg>

org.kde.neochat.appdata.xml

@@ -10,6 +10,7 @@
     <binary>neochat</binary>
   </provides>
   <name>NeoChat</name>
+  <name xml:lang="ar">نيوتشات</name>
   <name xml:lang="az">NeoChat</name>
   <name xml:lang="ca">NeoChat</name>
   <name xml:lang="ca-valencia">NeoChat</name>
@@ -39,6 +40,7 @@
   <name xml:lang="x-test">xxNeoChatxx</name>
   <name xml:lang="zh-CN">NeoChat</name>
   <summary>A client for matrix, the decentralized communication protocol</summary>
+  <summary xml:lang="ar">عميل لماتركس، ميفاق الاتصال اللامركزي</summary>
   <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
   <summary xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
   <summary xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
@@ -68,6 +70,7 @@
   <summary xml:lang="zh-CN">分布式通讯协议 Matrix 的客户端</summary>
   <description>
     <p>NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
+    <p xml:lang="ar">نيوتشات هو عميل ماتركس Matrix. يتيح لك إرسال رسائل نصية ومقاطع فيديو وملفات صوتية إلى عائلتك وزملائك وأصدقائك باستخدام بروتوكول ماتركس</p>
     <p xml:lang="az">NeoChat Mtrix müştərisidir. O, Matrix protokolundan istifadə edərək, ailənizə, dostlarınıza, iş yoldaşlarınıza mətn, səsli və görüntülü ismarıclar göndərməyə imkan verir.</p>
     <p xml:lang="ca">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
     <p xml:lang="ca-valencia">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
@@ -92,6 +95,7 @@
     <p xml:lang="x-test">xxNeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.xx</p>
     <p xml:lang="zh-CN">NeoChat 是一个 Matrix 客户端。 它允许您使用 Matrix 协议向您的家人、同事和朋友发送文本消息、视频和音频文件。</p>
     <p>Matrix is a decentralized communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
+    <p xml:lang="ar">ماتريكس هو بروتوكول اتصال لامركزي ، يعيد المستخدم إلى السيطرة. يطبق نيوتشات حاليًا جزءًا كبيرًا من الميفاق باستثناء الدردشات المشفرة ودردشة الفيديو.</p>
     <p xml:lang="az">Matrix, istifadəçini nəzarətdə saxlayan, mərkəzləşməmişi rabitə protokoludur. NeoChat, söhbətin və video əlaqəsinin şifrələnməsindən başqa bir çox protokolları həyata keçirə bilir.</p>
     <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
@@ -100,7 +104,7 @@
     <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
     <p xml:lang="eu">Matrix komunikazio-protokolo deszentralizatu bat da, erabiltzaileari kontrola itzultzen diona. Gaur egun, NeoChat-ek protokoloaren zati handi bat inplementatzen du, berriketa zifratuak eta bideo berriketak izan ezik.</p>
     <p xml:lang="fi">Matrix on hajautettu viestintäyhteyskäytäntö, joka antaa hallinnan takaisin käyttäjille. NeoChat tarjoaa nykyisellään valtaosan yhteyskäytännöstä salattuja keskustelu- ja videokeskusteluja lukuun ottamatta.</p>
-    <p xml:lang="fr">Matrix est un protocole de communication décentralisé, donnant le contrôle à l'utilisateur. Actuellement, NeoChat met en œuvre une grande partie du protocole, à l'exception des discussions cryptées et du chat vidéo.</p>
+    <p xml:lang="fr">Matrix est un protocole de communication décentralisé, donnant le contrôle à l'utilisateur. Actuellement, NeoChat met en œuvre une grande partie du protocole, à l'exception des discussions chiffrées et du chat vidéo.</p>
     <p xml:lang="hu">A Matrix egy decentralizált kommunikációs protokoll, amely a felhasználók kezébe adja az irányítást.</p>
     <p xml:lang="ia">Matrix es un protocollo de communication decentrate, ponente le usator in le controlo. Currentemente NeoChat implementa un grande parte del protocollo con le exception de conversationes cryptate e conversationes video.</p>
     <p xml:lang="it">Matrix è un protocollo di comunicazione decentralizzato, che restituisce all'utente il controllo. Attualmente NeoChat implementa gran parte del protocollo ad eccezione delle chat cifrate e delle chat video.</p>
@@ -116,9 +120,10 @@
     <p xml:lang="x-test">xxMatrix is a decentralized communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.xx</p>
     <p xml:lang="zh-CN">Matrix 是一个分布式通讯协议，使用户重新得到控制权。 目前，NeoChat 实现了协议的大部分，除了加密聊天和视频聊天。</p>
     <p>NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
+    <p xml:lang="ar">يعمل نيوتشات على كل من الأجهزة المحمولة وسطح المكتب مع توفير تجربة مستخدم متسقة.</p>
     <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
     <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
-    <p xml:lang="ca-valencia">El NeoChat funciona en el mòbils i a l'escriptori, proporcionant un experiència d'usuari coherent.</p>
+    <p xml:lang="ca-valencia">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
     <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
     <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
     <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
@@ -146,6 +151,7 @@
     <category>Network</category>
   </categories>
   <developer_name>The KDE Community</developer_name>
+  <developer_name xml:lang="ar">مجتمع كدي</developer_name>
   <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
   <developer_name xml:lang="ca">La comunitat KDE</developer_name>
   <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
@@ -188,6 +194,43 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="22.02" date="2022-02-09">
+      <description>
+        <p>NeoChat 22.02 focus on stability and adds a few quality of life improvements</p>
+	<ul>
+	  <li>Add support for minimizing to system tray on startup</li>
+	  <li>Improved internet connectivity check</li>
+	  <li>Add support for sharing images and files with other apps (Nextcloud, Imgur, ...)</li>
+	  <li>Implement adding labels for account. This allow for an easier organization when using multiple accounts.</li>
+	  <li>Redesign of our config dialogs to follow the new Plasma System Settings style</li>
+          <li>Fix various others issues and small feature requests. Decreasing the total amount of open issues by 20%.</li>
+        </ul>
+      </description>
+      <url>https://www.plasma-mobile.org/2022/02/09/plasma-mobile-gear-22-02/#neochat</url>
+    </release>
+    <release version="21.12" date="2021-12-07">
+      <description>
+        <p>NeoChat 21.12 brings lots of new features and fixes</p>
+        <ul>
+          <li>Solved various problems related to login, logout and account switching</li>
+          <li>Fixed a few problems in the timeline layout</li>
+          <li>Added Spell checking while writing a message</li>
+          <li>Improved Settings pages</li>
+          <li>Many improvements to the android and general mobile support</li>
+          <li>Show blurhashes while images load</li>
+          <li>Support showing custom emojis</li>
+          <li>Added a global menu</li>
+          <li>Added support for spoilers</li>
+          <li>Added a quick switcher to switch between rooms</li>
+          <li>Added support for an optional fancy blur background effect</li>
+          <li>Resizable left and right drawers</li>
+          <li>Added Syntax highlighting in raw json messages</li>
+          <li>Better wayland support</li>
+          <li>Improved file reception and download</li>
+        </ul>
+      </description>
+      <url>https://www.plasma-mobile.org/2021/12/07/plasma-mobile-gear-21-12/</url>
+    </release>
     <release version="1.2.0" date="2021-06-01">
       <description>
         <p>NeoChat 1.2 brings a major redesign of the user interface. The chat page is now using bubbles for the messages and the input component was completely rewritten with a nicer look as well.</p>

org.kde.neochat.desktop

@@ -2,6 +2,7 @@
 # SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 [Desktop Entry]
 Name=NeoChat
+Name[ar]=نيوتشات
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
@@ -32,6 +33,7 @@ Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 GenericName=Matrix Client
+GenericName[ar]=عميل ماتركس
 GenericName[az]=Matrix Müştərisi
 GenericName[ca]=Client de Matrix
 GenericName[ca@valencia]=Client de Matrix
@@ -62,6 +64,7 @@ GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 Comment=Client for the Matrix protocol
+Comment[ar]=عميل لميفاق ماتركس
 Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
@@ -96,3 +99,4 @@ Terminal=false
 Icon=org.kde.neochat
 Type=Application
 Categories=Network;InstantMessaging;
+SingleMainWindow=true

org.kde.neochat.tray.svg

@@ -0,0 +1 @@
+<svg width="22" height="22" fill="none" version="1.1" id="svg13" xmlns="http://www.w3.org/2000/svg"><style type="text/css" id="current-color-scheme">.ColorScheme-Text{color:#232629}</style><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="M2 4h18v11H6.681L3 18.067V15H2zm1 10h1v1.933L6.319 14H19V5H3z" id="path3"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect5" d="M4 7h9v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect7" d="M4 9h7v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect9" d="M4 11h5v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="m16 15.293-1.147-1.146-.707.707 2.853 2.853V14.5h-1z" id="path11"/></svg>

qml/main.qml

@@ -20,20 +20,17 @@ Kirigami.ApplicationWindow {
     property int columnWidth: Kirigami.Units.gridUnit * 13
 
     minimumWidth: Kirigami.Units.gridUnit * 15
-    minimumHeight: Kirigami.Units.gridUnit * 20
+    minimumHeight: Kirigami.Units.gridUnit * 15
 
+    visible: false // Will be overridden in Component.onCompleted
     wideScreen: width > columnWidth * 5
 
-    onClosing: Controller.saveWindowGeometry(root)
-
     pageStack.initialPage: LoadingPage {}
     pageStack.globalToolBar.canContainHandles: true
 
     property bool roomListLoaded: false
 
-    property RoomPage roomPage: RoomPage {
-        KeyNavigation.left: pageStack.get(0)
-    }
+    property RoomPage roomPage
 
     Connections {
         target: root.quitAction
@@ -43,7 +40,7 @@ Kirigami.ApplicationWindow {
     }
 
     Loader {
-        active: !Kirigami.Settings.isMobile
+        active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
         source: Qt.resolvedUrl("qrc:/imports/NeoChat/Menu/GlobalMenu.qml")
     }
 
@@ -57,21 +54,21 @@ Kirigami.ApplicationWindow {
         onTriggered: Controller.saveWindowGeometry(root)
     }
 
-    onWidthChanged: saveWindowGeometryTimer.restart()
-    onHeightChanged: saveWindowGeometryTimer.restart()
-    onXChanged: saveWindowGeometryTimer.restart()
-    onYChanged: saveWindowGeometryTimer.restart()
+    Connections {
+        id: saveWindowGeometryConnections
+        enabled: false // Disable on startup to avoid writing wrong values if the window is hidden
+        target: root
 
-    Shortcut {
-        sequence: "Ctrl+K"
-        onActivated: {
-            quickView.item.open()
-        }
+        function onClosing() { Controller.saveWindowGeometry(root); }
+        function onWidthChanged() { saveWindowGeometryTimer.restart(); }
+        function onHeightChanged() { saveWindowGeometryTimer.restart(); }
+        function onXChanged() { saveWindowGeometryTimer.restart(); }
+        function onYChanged() { saveWindowGeometryTimer.restart(); }
     }
 
+
     Loader {
         id: quickView
-
         active: !Kirigami.Settings.isMobile
         sourceComponent: QuickSwitcher { }
     }
@@ -80,7 +77,7 @@ Kirigami.ApplicationWindow {
         target: RoomManager
 
         function onPushRoom(room, event) {
-            pageStack.push(root.roomPage);
+            root.roomPage = pageStack.push("qrc:/imports/NeoChat/Page/RoomPage.qml");
             root.roomPage.forceActiveFocus();
             if (event.length > 0) {
                 roomPage.goToEvent(event);
@@ -156,7 +153,7 @@ Kirigami.ApplicationWindow {
         onEnabledChanged: drawerOpen = enabled && !modal
         onModalChanged: drawerOpen = !modal
         enabled: RoomManager.hasOpenRoom && pageStack.layers.depth < 2 && pageStack.depth < 3
-        handleVisible: enabled && pageStack.layers.depth < 2 && pageStack.depth < 3
+        handleVisible: enabled && pageStack.layers.depth < 2 && pageStack.depth < 3 && (root.wideScreen || pageStack.currentIndex > 0)
     }
 
     readonly property int defaultPageWidth: Kirigami.Units.gridUnit * 17
@@ -174,6 +171,8 @@ Kirigami.ApplicationWindow {
     }
 
     pageStack.defaultColumnWidth: pageWidth
+    pageStack.globalToolBar.style: Kirigami.ApplicationHeaderStyle.ToolBar
+    pageStack.globalToolBar.showNavigationButtons: pageStack.currentIndex > 0 ? Kirigami.ApplicationHeaderStyle.ShowBackButton : 0
     pageStack.columnView.columnResizeMode: shouldUseSidebars ? Kirigami.ColumnView.FixedColumns : Kirigami.ColumnView.SingleColumn
 
     MouseArea {
@@ -252,10 +251,12 @@ Kirigami.ApplicationWindow {
                 enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
             },
             Kirigami.Action {
-                text: i18n("Settings")
+                text: i18n("Configure NeoChat...")
                 icon.name: "settings-configure"
-                onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml")
-                enabled: pageStack.layers.currentItem.title !== i18n("Settings")
+                onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml", {}, {
+                    title: i18n("Configure")
+                })
+                enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat...")
                 shortcut: StandardKey.Preferences
             },
             Kirigami.Action {
@@ -273,7 +274,15 @@ Kirigami.ApplicationWindow {
         ]
     }
 
-    Component.onCompleted: Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
+    Component.onCompleted: {
+        Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
+        if (Config.minimizeToSystemTrayOnStartup && !Kirigami.Settings.isMobile && Controller.supportSystemTray && Config.systemTray) {
+            restoreWindowGeometryConnections.enabled = true; // To restore window size and position
+        } else {
+            visible = true;
+            saveWindowGeometryConnections.enabled = true;
+        }
+    }
     Connections {
         target: Config
         function onBlurChanged() {
@@ -309,6 +318,18 @@ Kirigami.ApplicationWindow {
         }
     }
 
+    Connections {
+        target: AccountRegistry
+        function onRowsRemoved() {
+            if (AccountRegistry.rowCount() === 0) {
+                RoomManager.reset();
+                pageStack.clear();
+                roomListLoaded = false;
+                pageStack.push("qrc:/imports/NeoChat/Page/WelcomePage.qml");
+            }
+        }
+    }
+
     Connections {
         target: Controller
 
@@ -324,22 +345,18 @@ Kirigami.ApplicationWindow {
             }
         }
 
-        function onConnectionDropped() {
-            if (Controller.accountCount === 0) {
-                RoomManager.reset();
-                pageStack.clear();
-                roomListLoaded = false;
-                pageStack.replace("qrc:/imports/NeoChat/Page/WelcomePage.qml");
-            }
-        }
-
         function onGlobalErrorOccured(error, detail) {
-            showPassiveNotification(i18nc("%1: %2", error, detail));
+            showPassiveNotification(i18n("%1: %2", error, detail));
         }
 
-        function onShowWindow() {
+        function onShowWindow(token = null) {
             root.showWindow()
-            root.raise()
+            if (token && KWindowSystem) {
+                KWindowSystem.setCurrentXdgActivationToken(basicNotification.xdgActivationToken)
+                KWindowSystem.activateWindow(root)
+            } else {
+                root.raise()
+            }
         }
 
         function onUserConsentRequired(url) {
@@ -348,6 +365,21 @@ Kirigami.ApplicationWindow {
         }
     }
 
+    Connections {
+        id: restoreWindowGeometryConnections
+        enabled: false
+        target: root
+
+        function onVisibleChanged() {
+            if (!visible) {
+                return;
+            }
+            Controller.restoreWindowGeometry(root);
+            restoreWindowGeometryConnections.enabled = false; // Only restore window geometry for the first time
+            saveWindowGeometryConnections.enabled = true;
+        }
+    }
+
     Connections {
         target: Controller.activeConnection
         function onDirectChatAvailable(directChat) {

res.qrc

@@ -1,5 +1,7 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="icons/org.kde.neochat.svg">org.kde.neochat.svg</file>
+        <file alias="icons/org.kde.neochat.tray.svg">org.kde.neochat.tray.svg</file>
         <file>qml/main.qml</file>
         <file>imports/NeoChat/Page/qmldir</file>
         <file>imports/NeoChat/Page/LoadingPage.qml</file>
@@ -26,17 +28,13 @@
         <file>imports/NeoChat/Component/ChatBox/AttachmentPane.qml</file>
         <file>imports/NeoChat/Component/ChatBox/ReplyPane.qml</file>
         <file>imports/NeoChat/Component/ChatBox/CompletionMenu.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/CursorHandle.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/CursorDelegate.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/MobileTextActionsToolBar.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/TextFieldContextMenu.qml</file>
         <file>imports/NeoChat/Component/ChatBox/qmldir</file>
         <file>imports/NeoChat/Component/Emoji/EmojiPicker.qml</file>
         <file>imports/NeoChat/Component/Emoji/qmldir</file>
         <file>imports/NeoChat/Component/Timeline/qmldir</file>
         <file>imports/NeoChat/Component/Timeline/ReplyComponent.qml</file>
         <file>imports/NeoChat/Component/Timeline/StateDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/TextDelegate.qml</file>
+        <file>imports/NeoChat/Component/Timeline/RichLabel.qml</file>
         <file>imports/NeoChat/Component/Timeline/TimelineContainer.qml</file>
         <file>imports/NeoChat/Component/Timeline/SectionDelegate.qml</file>
         <file>imports/NeoChat/Component/Timeline/VideoDelegate.qml</file>
@@ -45,6 +43,9 @@
         <file>imports/NeoChat/Component/Timeline/FileDelegate.qml</file>
         <file>imports/NeoChat/Component/Timeline/ImageDelegate.qml</file>
         <file>imports/NeoChat/Component/Timeline/EncryptedDelegate.qml</file>
+        <file>imports/NeoChat/Component/Timeline/EventDelegate.qml</file>
+        <file>imports/NeoChat/Component/Timeline/MessageDelegate.qml</file>
+        <file>imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml</file>
         <file>imports/NeoChat/Component/Login/qmldir</file>
         <file>imports/NeoChat/Component/Login/LoginStep.qml</file>
         <file>imports/NeoChat/Component/Login/Login.qml</file>
@@ -81,6 +82,7 @@
         <file>imports/NeoChat/Settings/AccountsPage.qml</file>
         <file>imports/NeoChat/Settings/DevicesPage.qml</file>
         <file>imports/NeoChat/Settings/About.qml</file>
+        <file>imports/NeoChat/Settings/SonnetConfigPage.qml</file>
         <file>imports/NeoChat/Settings/qmldir</file>
     </qresource>
 </RCC>

res_android.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="imports/NeoChat/Menu/ShareAction.qml">imports/NeoChat/Menu/ShareActionAndroid.qml</file>
+    </qresource>
+</RCC>

res_desktop.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>imports/NeoChat/Menu/ShareAction.qml</file>
+        <file>imports/NeoChat/Menu/ShareDialog.qml</file>
+    </qresource>
+</RCC>

src/CMakeLists.txt

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 add_executable(neochat
-    accountlistmodel.cpp
     controller.cpp
     actionshandler.cpp
     emojimodel.cpp
@@ -42,6 +41,8 @@ add_executable(neochat
 
 if(Quotient_VERSION_MINOR GREATER 6)
     target_compile_definitions(neochat PRIVATE QUOTIENT_07)
+else()
+    target_sources(neochat PRIVATE neochataccountregistry.cpp)
 endif()
 
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
@@ -60,8 +61,19 @@ if(NOT ANDROID)
     target_compile_definitions(neochat PRIVATE -DHAVE_WINDOWSYSTEM)
 endif()
 
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
+    target_sources(neochat PRIVATE ../res_desktop.qrc)
+else()
+    target_sources(neochat PRIVATE ../res_android.qrc)
+endif()
+
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::QCoro)
+target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
+if(TARGET QCoro5::Coro)
+    target_link_libraries(neochat PRIVATE QCoro5::Coro)
+else()
+    target_link_libraries(neochat PRIVATE QCoro::QCoro)
+endif()
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -69,6 +81,7 @@ if(NEOCHAT_FLATPAK)
 endif()
 
 if(ANDROID)
+    target_sources(neochat PRIVATE notifyrc.qrc)
     target_link_libraries(neochat PRIVATE Qt5::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
         "arrow-down"
@@ -112,6 +125,7 @@ if(ANDROID)
     )
 else()
     target_link_libraries(neochat PRIVATE Qt5::Widgets KF5::KIOWidgets)
+    install(FILES neochat.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 endif()
 
 if(TARGET KF5::DBusAddons)

src/accountlistmodel.cpp

@@ -1,60 +0,0 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include "accountlistmodel.h"
-
-#include "room.h"
-
-AccountListModel::AccountListModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-    connect(&Controller::instance(), &Controller::connectionAdded, this, [=]() {
-        beginResetModel();
-        endResetModel();
-    });
-    connect(&Controller::instance(), &Controller::connectionDropped, this, [=]() {
-        beginResetModel();
-        endResetModel();
-    });
-}
-
-QVariant AccountListModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid()) {
-        return {};
-    }
-
-    if (index.row() >= Controller::instance().connections().count()) {
-        return {};
-    }
-
-    auto connection = Controller::instance().connections().at(index.row());
-
-    if (role == UserRole) {
-        return QVariant::fromValue(connection->user());
-    }
-    if (role == ConnectionRole) {
-        return QVariant::fromValue(connection);
-    }
-
-    return {};
-}
-
-int AccountListModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid()) {
-        return 0;
-    }
-
-    return Controller::instance().connections().count();
-}
-
-QHash<int, QByteArray> AccountListModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-
-    roles[UserRole] = "user";
-    roles[ConnectionRole] = "connection";
-
-    return roles;
-}

src/accountlistmodel.h

@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: 2018 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-#include "controller.h"
-
-#include <QAbstractListModel>
-#include <QObject>
-
-class AccountListModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum EventRoles {
-        UserRole = Qt::UserRole + 1,
-        ConnectionRole,
-    };
-
-    AccountListModel(QObject *parent = nullptr);
-
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = UserRole) const override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/controller.cpp

@@ -34,6 +34,12 @@
 
 #include <signal.h>
 
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif
+
 #include "csapi/account-data.h"
 #include "csapi/content-repo.h"
 #include "csapi/joining.h"
@@ -45,6 +51,8 @@
 #include "neochatuser.h"
 #include "roommanager.h"
 #include "settings.h"
+#include "utils.h"
+
 #include <KStandardShortcut>
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
@@ -57,7 +65,6 @@ using namespace Quotient;
 
 Controller::Controller(QObject *parent)
     : QObject(parent)
-    , m_mgr(new QNetworkConfigurationManager(this))
 {
     Connection::setRoomType<NeoChatRoom>();
     Connection::setUserType<NeoChatUser>();
@@ -69,7 +76,7 @@ Controller::Controller(QObject *parent)
         connect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
         QGuiApplication::setQuitOnLastWindowClosed(false);
     }
-    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, [=]() {
+    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, [this, trayIcon]() {
         if (NeoChatConfig::self()->systemTray()) {
             trayIcon->show();
             connect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
@@ -81,7 +88,7 @@ Controller::Controller(QObject *parent)
     });
 #endif
 
-    QTimer::singleShot(0, this, [=] {
+    QTimer::singleShot(0, this, [this] {
         invokeLogin();
     });
 
@@ -112,13 +119,11 @@ Controller::Controller(QObject *parent)
         sigaction(sig, &sa, nullptr);
     }
 #endif
-
-    connect(m_mgr, &QNetworkConfigurationManager::onlineStateChanged, this, &Controller::isOnlineChanged);
 }
 
 Controller::~Controller()
 {
-    for (auto c : qAsConst(m_connections)) {
+    for (auto c : AccountRegistry::instance().accounts()) {
         c->saveState();
     }
 }
@@ -149,7 +154,7 @@ void Controller::loginWithAccessToken(const QString &serverAddr, const QString &
         conn->setHomeserver(serverUrl);
     }
 
-    connect(conn, &Connection::connected, this, [=] {
+    connect(conn, &Connection::connected, this, [this, conn, deviceName] {
         AccountSettings account(conn->userId());
         account.setKeepLoggedIn(true);
         account.setHomeserver(conn->homeserver());
@@ -162,7 +167,7 @@ void Controller::loginWithAccessToken(const QString &serverAddr, const QString &
         addConnection(conn);
         setActiveConnection(conn);
     });
-    connect(conn, &Connection::networkError, this, [=](QString error, const QString &, int, int) {
+    connect(conn, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
         Q_EMIT errorOccured(i18n("Network Error: %1", error));
     });
     conn->assumeIdentity(user, token, deviceName);
@@ -186,32 +191,28 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
     job.start();
     loop.exec();
 
-    conn->stopSync();
-    Q_EMIT conn->stateChanged();
-    Q_EMIT conn->loggedOut();
-    if (conn == activeConnection() && !m_connections.isEmpty()) {
-        setActiveConnection(m_connections[0]);
+    if (conn == activeConnection() && AccountRegistry::instance().count() > 1) {
+        setActiveConnection(AccountRegistry::instance().accounts()[0]);
     } else {
         setActiveConnection(nullptr);
     }
     if (!serverSideLogout) {
         return;
     }
-    auto logoutJob = conn->callApi<LogoutJob>();
-    connect(logoutJob, &LogoutJob::failure, this, [=] {
-        Q_EMIT errorOccured(i18n("Server-side Logout Failed: %1", logoutJob->errorString()));
-    });
+    conn->logout();
 }
 
 void Controller::addConnection(Connection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
 
-    m_connections += c;
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().add(c);
+#endif
 
     c->setLazyLoading(true);
 
-    connect(c, &Connection::syncDone, this, [=] {
+    connect(c, &Connection::syncDone, this, [this, c] {
         setBusy(false);
 
         Q_EMIT syncDone();
@@ -219,11 +220,11 @@ void Controller::addConnection(Connection *c)
         c->sync(30000);
         c->saveState();
     });
-    connect(c, &Connection::loggedOut, this, [=] {
+    connect(c, &Connection::loggedOut, this, [this, c] {
         dropConnection(c);
     });
 
-    connect(c, &Connection::requestFailed, this, [=](BaseJob *job) {
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
         if (job->error() == BaseJob::UserConsentRequiredError) {
             Q_EMIT userConsentRequired(job->errorUrl());
         }
@@ -240,11 +241,16 @@ void Controller::addConnection(Connection *c)
 void Controller::dropConnection(Connection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
-    m_connections.removeOne(c);
+
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().drop(c);
+#endif
 
     Q_EMIT connectionDropped(c);
     Q_EMIT accountCountChanged();
+#ifndef QUOTIENT_07
     c->deleteLater();
+#endif
 }
 
 void Controller::invokeLogin()
@@ -258,31 +264,48 @@ void Controller::invokeLogin()
             id = accountId;
         }
         if (!account.homeserver().isEmpty()) {
-            auto accessToken = loadAccessTokenFromKeyChain(account);
-
-            auto connection = new Connection(account.homeserver());
-            connect(connection, &Connection::connected, this, [=] {
-                connection->loadState();
-                addConnection(connection);
-                if (connection->userId() == id) {
-                    setActiveConnection(connection);
-                    connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
-                }
-            });
-            connect(connection, &Connection::loginError, this, [=](const QString &error, const QString &) {
-                if (error == "Unrecognised access token") {
-                    Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
-                    logout(connection, false);
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, id, this, accessTokenLoadingJob](QKeychain::Job *) {
+                AccountSettings account{accountId};
+                QString accessToken;
+                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
+                    accessToken = accessTokenLoadingJob->binaryData();
                 } else {
-                    Q_EMIT errorOccured(i18n("Login Failed", error));
-                    logout(connection, true);
+                    // No access token from the keychain, try token file
+                    // TODO FIXME this code is racy since the file might have
+                    // already been removed. But since the other code do a blocking
+                    // dbus call, the probability are not high that it will happen.
+                    // loadAccessTokenFromFile is also mostly legacy nowadays
+                    accessToken = loadAccessTokenFromFile(account);
+                    if (accessToken.isEmpty()) {
+                        return;
+                    }
                 }
-                Q_EMIT initiated();
+
+                auto connection = new Connection(account.homeserver());
+                connect(connection, &Connection::connected, this, [this, connection, id] {
+                    connection->loadState();
+                    addConnection(connection);
+                    if (connection->userId() == id) {
+                        setActiveConnection(connection);
+                        connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
+                    }
+                });
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token") {
+                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
+                        logout(connection, false);
+                    } else {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        logout(connection, true);
+                    }
+                    Q_EMIT initiated();
+                });
+                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                });
+                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
             });
-            connect(connection, &Connection::networkError, this, [=](const QString &error, const QString &, int, int) {
-                Q_EMIT errorOccured(i18n("Network Error: %1", error));
-            });
-            connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
         }
     }
     if (accounts.isEmpty()) {
@@ -305,41 +328,57 @@ QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account)
     return {};
 }
 
-QByteArray Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
 {
-    qDebug() << "Read the access token from the keychain for " << account.userId();
-    QKeychain::ReadPasswordJob job(qAppName());
-    job.setAutoDelete(false);
-    job.setKey(account.userId());
-    QEventLoop loop;
-    QKeychain::ReadPasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
+    qDebug() << "Reading access token from the keychain for" << account.userId();
+    auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
+    job->setKey(account.userId());
 
-    if (job.error() == QKeychain::Error::NoError) {
-        return job.binaryData();
-    }
-
-    qWarning() << "Could not read the access token from the keychain: " << qPrintable(job.errorString());
-    // no access token from the keychain, try token file
-    auto accessToken = loadAccessTokenFromFile(account);
-    if (job.error() == QKeychain::Error::EntryNotFound) {
-        if (!accessToken.isEmpty()) {
-            qDebug() << "Migrating the access token from file to the keychain for " << account.userId();
-            bool removed = false;
-            bool saved = saveAccessTokenToKeyChain(account, accessToken);
-            if (saved) {
-                QFile accountTokenFile{accessTokenFileName(account)};
-                removed = accountTokenFile.remove();
-            }
-            if (!(saved && removed)) {
-                qDebug() << "Migrating the access token from the file to the keychain "
-                            "failed";
+    // Handling of errors
+    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
+        if (job->error() == QKeychain::Error::NoError) {
+            return;
+        }
+        if (job->error() == QKeychain::Error::EntryNotFound) {
+            // no access token from the keychain, try token file
+            auto accessToken = loadAccessTokenFromFile(account);
+            if (!accessToken.isEmpty()) {
+                qDebug() << "Migrating the access token from file to the keychain for " << account.userId();
+                bool removed = false;
+                bool saved = saveAccessTokenToKeyChain(account, accessToken);
+                if (saved) {
+                    QFile accountTokenFile{accessTokenFileName(account)};
+                    removed = accountTokenFile.remove();
+                }
+                if (!(saved && removed)) {
+                    qDebug() << "Migrating the access token from the file to the keychain "
+                                "failed";
+                }
+                return;
             }
         }
-    }
 
-    return accessToken;
+        switch (job->error()) {
+        case QKeychain::EntryNotFound:
+            Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
+            break;
+        case QKeychain::AccessDeniedByUser:
+        case QKeychain::AccessDenied:
+            Q_EMIT globalErrorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
+            break;
+        case QKeychain::NoBackendAvailable:
+            Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            break;
+        case QKeychain::OtherError:
+            Q_EMIT globalErrorOccured(i18n("Unable to read access token"), job->errorString());
+            break;
+        default:
+            break;
+        }
+    });
+    job->start();
+
+    return job;
 }
 
 bool Controller::saveAccessTokenToFile(const AccountSettings &account, const QByteArray &accessToken)
@@ -377,16 +416,6 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
     return true;
 }
 
-void Controller::playAudio(const QUrl &localFile)
-{
-    auto player = new QMediaPlayer;
-    player->setMedia(localFile);
-    player->play();
-    connect(player, &QMediaPlayer::stateChanged, [=] {
-        player->deleteLater();
-    });
-}
-
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
@@ -491,14 +520,9 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
     setRequestData(_data);
 }
 
-QVector<Connection *> Controller::connections() const
-{
-    return m_connections;
-}
-
 int Controller::accountCount() const
 {
-    return m_connections.count();
+    return AccountRegistry::instance().count();
 }
 
 bool Controller::quitOnLastWindowClosed()
@@ -541,9 +565,26 @@ void Controller::setActiveConnection(Connection *connection)
     if (connection == m_connection) {
         return;
     }
+    if (m_connection != nullptr) {
+        disconnect(connection, &Connection::syncError, this, nullptr);
+    }
     m_connection = connection;
     if (connection != nullptr) {
         NeoChatConfig::self()->setActiveConnection(connection->userId());
+        connect(connection, &Connection::networkError, this, [this](QString message, QString details, int retriesTaken, int nextRetryInMilliseconds) {
+            if (!m_isOnline) {
+                return;
+            }
+            m_isOnline = false;
+            Q_EMIT isOnlineChanged(false);
+        });
+        connect(connection, &Connection::syncDone, this, [this] {
+            if (m_isOnline) {
+                return;
+            }
+            m_isOnline = true;
+            Q_EMIT isOnlineChanged(true);
+        });
     } else {
         NeoChatConfig::self()->setActiveConnection(QString());
     }
@@ -551,6 +592,14 @@ void Controller::setActiveConnection(Connection *connection)
     Q_EMIT activeConnectionChanged();
 }
 
+void Controller::restoreWindowGeometry(QQuickWindow *window)
+{
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup windowGroup(&dataResource, "Window");
+    KWindowConfig::restoreWindowSize(window, windowGroup);
+    KWindowConfig::restoreWindowPosition(window, windowGroup);
+}
+
 void Controller::saveWindowGeometry(QQuickWindow *window)
 {
     KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
@@ -575,14 +624,14 @@ NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Om
 void Controller::createRoom(const QString &name, const QString &topic)
 {
     auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
-    Quotient::CreateRoomJob::connect(createRoomJob, &CreateRoomJob::failure, [=] {
+    Quotient::CreateRoomJob::connect(createRoomJob, &CreateRoomJob::failure, [this, createRoomJob] {
         Q_EMIT errorOccured(i18n("Room creation failed: \"%1\"", createRoomJob->errorString()));
     });
 }
 
 bool Controller::isOnline() const
 {
-    return m_mgr->isOnline();
+    return m_isOnline;
 }
 
 // TODO: Remove in favor of RoomManager::joinRoom

src/controller.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QMediaPlayer>
 #include <QObject>
 #include <QQuickItem>
 
@@ -11,7 +10,6 @@
 #include <KFormat>
 
 class QKeySequences;
-class QNetworkConfigurationManager;
 
 #include "connection.h"
 #include "csapi/list_public_rooms.h"
@@ -23,6 +21,11 @@ class NeoChatRoom;
 class NeoChatUser;
 class QQuickWindow;
 
+namespace QKeychain
+{
+class ReadPasswordJob;
+}
+
 using namespace Quotient;
 
 class Controller : public QObject
@@ -40,8 +43,6 @@ class Controller : public QObject
 public:
     static Controller &instance();
 
-    [[nodiscard]] QVector<Connection *> connections() const;
-
     void setActiveConnection(Connection *connection);
     [[nodiscard]] Connection *activeConnection() const;
 
@@ -97,15 +98,15 @@ private:
     explicit Controller(QObject *parent = nullptr);
     ~Controller() override;
 
-    QVector<Connection *> m_connections;
     QPointer<Connection> m_connection;
     bool m_busy = false;
 
     static QByteArray loadAccessTokenFromFile(const AccountSettings &account);
-    QByteArray loadAccessTokenFromKeyChain(const AccountSettings &account);
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const AccountSettings &account);
 
     void loadSettings();
     void saveSettings() const;
+    bool m_isOnline = true;
 
     KAboutData m_aboutData;
     bool hasWindowSystem() const;
@@ -138,13 +139,10 @@ Q_SIGNALS:
 
 public Q_SLOTS:
     void logout(Quotient::Connection *conn, bool serverSideLogout);
-    static void playAudio(const QUrl &localFile);
     void changeAvatar(Quotient::Connection *conn, const QUrl &localFile);
     static void markAllMessagesAsRead(Quotient::Connection *conn);
+    void restoreWindowGeometry(QQuickWindow *);
     void saveWindowGeometry(QQuickWindow *);
-
-private:
-    QNetworkConfigurationManager *m_mgr;
 };
 
 // TODO libQuotient 0.7: Drop

src/customemojimodel.cpp

@@ -88,7 +88,7 @@ void CustomEmojiModel::setConnection(Connection *it)
 QString CustomEmojiModel::preprocessText(const QString &it)
 {
     auto cp = it;
-    for (const auto &emoji : qAsConst(d->emojies)) {
+    for (const auto &emoji : std::as_const(d->emojies)) {
         cp.replace(
             emoji.regexp,
             QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
@@ -99,7 +99,7 @@ QString CustomEmojiModel::preprocessText(const QString &it)
 QVariantList CustomEmojiModel::filterModel(const QString &filter)
 {
     QVariantList results;
-    for (const auto &emoji : qAsConst(d->emojies)) {
+    for (const auto &emoji : std::as_const(d->emojies)) {
         if (results.length() >= 10)
             break;
         if (!emoji.name.contains(filter, Qt::CaseInsensitive))

src/devicesmodel.cpp

@@ -88,7 +88,7 @@ void DevicesModel::setName(int index, const QString &name)
     beginResetModel();
     m_devices[index].displayName = name;
     endResetModel();
-    connect(job, &BaseJob::failure, this, [=]() {
+    connect(job, &BaseJob::failure, this, [this, index, oldName]() {
         beginResetModel();
         m_devices[index].displayName = oldName;
         endResetModel();

src/login.cpp

@@ -27,7 +27,7 @@ void Login::init()
     m_supportsPassword = false;
     m_ssoUrl = QUrl();
 
-    connect(this, &Login::matrixIdChanged, this, [=]() {
+    connect(this, &Login::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
 
         if (m_matrixId == "@") {
@@ -40,7 +40,7 @@ void Login::init()
             m_connection = new Connection();
         }
         m_connection->resolveServer(m_matrixId);
-        connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [=]() {
+        connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
             setHomeserverReachable(true);
             m_testing = false;
             Q_EMIT testingChanged();
@@ -49,7 +49,7 @@ void Login::init()
             Q_EMIT loginFlowsChanged();
         });
     });
-    connect(m_connection, &Connection::connected, this, [=] {
+    connect(m_connection, &Connection::connected, this, [this] {
         Q_EMIT connected();
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
@@ -67,22 +67,22 @@ void Login::init()
         Controller::instance().setActiveConnection(m_connection);
         m_connection = nullptr;
     });
-    connect(m_connection, &Connection::networkError, this, [=](QString error, const QString &, int, int) {
+    connect(m_connection, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
         Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
-    connect(m_connection, &Connection::loginError, this, [=](QString error, const QString &) {
+    connect(m_connection, &Connection::loginError, this, [this](QString error, const QString &) {
         Q_EMIT errorOccured(i18n("Login Failed: %1", error));
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
 
-    connect(m_connection, &Connection::resolveError, this, [=](QString error) {
+    connect(m_connection, &Connection::resolveError, this, [](QString error) {
         Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connectSingleShot(m_connection, &Connection::syncDone, this, [=]() {
+    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
         Q_EMIT Controller::instance().initiated();
     });
 }
@@ -160,7 +160,7 @@ QUrl Login::ssoUrl() const
 void Login::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
-    connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [=]() {
+    connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
         SsoSession *session = m_connection->prepareForSso(m_deviceName);
         m_ssoUrl = session->ssoUrl();
     });

src/main.cpp

@@ -22,6 +22,9 @@
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
+#endif
+#ifdef HAVE_WINDOWSYSTEM
+#include <kwindowsystem_version.h>
 #include <KWindowSystem>
 #endif
 #include <KLocalizedContext>
@@ -30,7 +33,12 @@
 
 #include "neochat-version.h"
 
-#include "accountlistmodel.h"
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif
+
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
 #include "chatboxhelper.h"
@@ -68,15 +76,18 @@
 
 using namespace Quotient;
 
-#ifdef HAVE_KDBUSADDONS
+#ifdef HAVE_WINDOWSYSTEM
 static void raiseWindow(QWindow *window)
 {
+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 91, 0)
+    KWindowSystem::updateStartupId(window);
+#else
     if (KWindowSystem::isPlatformWayland()) {
         KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN"));
-        KWindowSystem::activateWindow(window->winId());
-    } else {
-        window->raise();
     }
+#endif
+    KWindowSystem::activateWindow(window->winId());
+    window->raise();
 }
 #endif
 
@@ -125,6 +136,7 @@ int main(int argc, char *argv[])
     about.addAuthor(i18n("Carl Schwan"), QString(), QStringLiteral("carl@carlschwan.eu"));
     about.addAuthor(i18n("Tobias Fella"), QString(), QStringLiteral("fella@posteo.de"));
     about.setOrganizationDomain("kde.org");
+    about.setBugAddress("https://invent.kde.org/network/neochat/issues");
 
     about.addComponent(QStringLiteral("libQuotient"),
                        i18n("A Qt5 library to write cross-platform clients for Matrix"),
@@ -135,20 +147,6 @@ int main(int argc, char *argv[])
     KAboutData::setApplicationData(about);
     QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));
 
-#ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique);
-    service.connect(&service, &KDBusService::activateRequested, &RoomManager::instance(), [](const QStringList &arguments, const QString &workingDirectory) {
-        Q_UNUSED(workingDirectory);
-        if (arguments.isEmpty()) {
-            return;
-        }
-        auto args = arguments;
-        args.removeFirst();
-        for (const auto &arg : args) {
-            RoomManager::instance().openResource(arg);
-        }
-    });
-#endif
 
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
@@ -180,7 +178,7 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "ChatBoxHelper", &chatBoxHelper);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", new EmojiModel(&app));
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CommandModel", new CommandModel(&app));
-    qmlRegisterType<AccountListModel>("org.kde.neochat", 1, 0, "AccountListModel");
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::AccountRegistry::instance());
     qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
     qmlRegisterType<ChatDocumentHandler>("org.kde.neochat", 1, 0, "ChatDocumentHandler");
     qmlRegisterType<SpellcheckHighlighter>("org.kde.neochat", 1, 0, "SpellcheckHighlighter");
@@ -209,6 +207,12 @@ int main(int argc, char *argv[])
     qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
     qRegisterMetaType<QMimeType>("QMimeType");
 
+#ifdef HAVE_WINDOWSYSTEM
+    qmlRegisterSingletonType<KWindowSystem>("org.kde.kwindowsystem.private", 1, 0, "KWindowSystem", [](QQmlEngine *, QJSEngine *) -> QObject * {
+        return KWindowSystem::self();
+    });
+#endif
+
     qRegisterMetaTypeStreamOperators<Emoji>();
 
     QQmlApplicationEngine engine;
@@ -240,28 +244,44 @@ int main(int argc, char *argv[])
     }
 
 #ifdef HAVE_KDBUSADDONS
-    QObject::connect(&service, &KDBusService::activateRequested, &engine, [&engine](const QStringList & /*arguments*/, const QString & /*workingDirectory*/) {
-        const auto rootObjects = engine.rootObjects();
-        for (auto obj : rootObjects) {
-            auto view = qobject_cast<QQuickWindow *>(obj);
-            if (view) {
-                view->show();
-                raiseWindow(view);
-                return;
-            }
-        }
-    });
+    KDBusService service(KDBusService::Unique);
+    service.connect(&service,
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);
+
+                        // Raise windows
+                        const auto rootObjects = engine.rootObjects();
+                        for (auto obj : rootObjects) {
+                            auto view = qobject_cast<QQuickWindow *>(obj);
+                            if (view) {
+                                view->show();
+                                raiseWindow(view);
+                                return;
+                            }
+                        }
+
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }
+                        auto args = arguments;
+                        args.removeFirst();
+                        for (const auto &arg : args) {
+                            RoomManager::instance().openResource(arg);
+                        }
+                    });
+#endif
     const auto rootObjects = engine.rootObjects();
     for (auto obj : rootObjects) {
         auto view = qobject_cast<QQuickWindow *>(obj);
         if (view) {
-            KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-            KConfigGroup windowGroup(&dataResource, "Window");
-            KWindowConfig::restoreWindowSize(view, windowGroup);
-            KWindowConfig::restoreWindowPosition(view, windowGroup);
+            if (view->isVisible()) {
+                Controller::instance().restoreWindowGeometry(view);
+            }
             break;
         }
     }
-#endif
     return app.exec();
 }

src/messageeventmodel.cpp

@@ -46,6 +46,8 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ShowSectionRole] = "showSection";
     roles[ReactionRole] = "reaction";
     roles[IsEditedRole] = "isEdited";
+    roles[SourceRole] = "source";
+    roles[MimeTypeRole] = "mimeType";
     roles[FormattedBodyRole] = "formattedBody";
     return roles;
 }
@@ -58,12 +60,12 @@ MessageEventModel::MessageEventModel(QObject *parent)
     qmlRegisterAnonymousType<FileTransferInfo>("org.kde.neochat", 1);
     qRegisterMetaType<FileTransferInfo>();
 
-    QTimer::singleShot(0, this, [=]() {
+    QTimer::singleShot(0, this, [this]() {
         if (!m_currentRoom) {
             return;
         }
         m_currentRoom->getPreviousContent(50);
-        connect(this, &QAbstractListModel::rowsInserted, this, [=]() {
+        connect(this, &QAbstractListModel::rowsInserted, this, [this]() {
             if (m_currentRoom->readMarkerEventId().isEmpty()) {
                 return;
             }
@@ -98,7 +100,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         lastReadEventId = room->readMarkerEventId();
 
         using namespace Quotient;
-        connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [=](RoomEventsRange events) {
+        connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
             if (NeoChatConfig::self()->showFancyEffects()) {
                 for (auto &event : events) {
                     RoomMessageEvent *message = dynamic_cast<RoomMessageEvent *>(event.get());
@@ -134,13 +136,13 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             }
             beginInsertRows({}, timelineBaseIndex(), timelineBaseIndex() + int(events.size()) - 1);
         });
-        connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this, [=](RoomEventsRange events) {
+        connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this, [this](RoomEventsRange events) {
             if (rowCount() > 0) {
                 rowBelowInserted = rowCount() - 1; // See #312
             }
             beginInsertRows({}, rowCount(), rowCount() + int(events.size()) - 1);
         });
-        connect(m_currentRoom, &Room::addedMessages, this, [=](int lowest, int biggest) {
+        connect(m_currentRoom, &Room::addedMessages, this, [this](int lowest, int biggest) {
             endInsertRows();
             if (!m_lastReadEventIndex.isValid()) {
                 // no read marker, so see if we need to create one.
@@ -184,7 +186,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginRemoveRows({}, i, i);
         });
         connect(m_currentRoom, &Room::pendingEventDiscarded, this, &MessageEventModel::endRemoveRows);
-        connect(m_currentRoom, &Room::readMarkerMoved, this, [=](const QString &fromEventId, const QString &toEventId) {
+        connect(m_currentRoom, &Room::readMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
             Q_UNUSED(fromEventId);
             moveReadMarker(toEventId);
         });
@@ -203,7 +205,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
 #ifndef QUOTIENT_07
         connect(m_currentRoom, &Room::fileTransferCancelled, this, &MessageEventModel::refreshEvent);
 #endif
-        connect(m_currentRoom->connection(), &Connection::ignoredUsersListChanged, this, [=] {
+        connect(m_currentRoom->connection(), &Connection::ignoredUsersListChanged, this, [this] {
             beginResetModel();
             endResetModel();
         });
@@ -423,8 +425,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             const KFormat format;
             return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
         }
-        case SpecialMarksRole:
-            return EventStatus::Hidden;
         }
         return {};
     }
@@ -458,7 +458,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return m_currentRoom->eventToString(evt);
     }
 
-    if (role == Qt::ToolTipRole) {
+    if (role == SourceRole) {
         return evt.originalJson();
     }
 
@@ -545,6 +545,15 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return e->content()->fileInfo()->mimeType.iconName();
     }
 
+    if (role == MimeTypeRole) {
+        auto e = eventCast<const RoomMessageEvent>(&evt);
+        if (!e || !e->hasFileContent()) {
+            return QVariant();
+        }
+
+        return e->content()->fileInfo()->mimeType.name();
+    }
+
     if (role == SpecialMarksRole) {
         if (isPending) {
             return pendingIt->deliveryStatus();

src/messageeventmodel.h

@@ -30,6 +30,7 @@ public:
         UserMarkerRole,
         FormattedBodyRole,
 
+        MimeTypeRole,
         FileMimetypeIcon,
 
         ReplyRole,
@@ -40,6 +41,7 @@ public:
         ReactionRole,
 
         IsEditedRole,
+        SourceRole,
 
         // For debugging
         EventResolvedTypeRole,

src/messagefiltermodel.cpp

@@ -6,6 +6,15 @@
 #include "messageeventmodel.h"
 #include "neochatconfig.h"
 
+MessageFilterModel::MessageFilterModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLeaveJoinEventChanged, this, [this] {
+        beginResetModel();
+        endResetModel();
+    });
+}
+
 bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);

src/messagefiltermodel.h

@@ -9,5 +9,6 @@ class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
+    MessageFilterModel(QObject *parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };

src/neochat.notifyrc

@@ -1,6 +1,7 @@
 [Global]
 IconName=org.kde.neochat
 Name=NeoChat
+Name[ar]=نيوتشات
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
@@ -32,6 +33,7 @@ Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
+Comment[ar]=عميل لماتركس، ميفاق الاتصال اللامركزي
 Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
 Comment[ca]=Un client per a Matrix, el protocol de comunicacions descentralitzat
 Comment[ca@valencia]=Un client per a Matrix, el protocol de comunicacions descentralitzat
@@ -63,6 +65,7 @@ Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 
 [Event/message]
 Name=New message
+Name[ar]=رسالة جديدة
 Name[az]=Yeni ismarıc
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
@@ -93,6 +96,7 @@ Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
 Comment=There is a new message
+Comment[ar]=توجد رسالة جديدة
 Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
@@ -122,3 +126,48 @@ Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息
 Action=Popup
+
+[Event/invite]
+Name=New Invitation
+Name[ar]=دعوة جديدة
+Name[az]=Yeni dəvət
+Name[ca]=Invitació nova
+Name[ca@valencia]=Invitació nova
+Name[en_GB]=New Invitation
+Name[es]=Nueva invitación
+Name[fi]=Uusi kutsu
+Name[fr]=Nouvelle invitation
+Name[ia]=Nove invitation
+Name[it]=Nuovo invito
+Name[ko]=새 초대장
+Name[nl]=Nieuwe uitnodiging
+Name[pa]=ਨਵਾਂ ਸੱਦਾ
+Name[pl]=Nowe zaproszenie
+Name[pt]=Novo Convite
+Name[pt_BR]=Novo convite
+Name[sl]=Novo povabilo
+Name[sv]=Ny inbjudan
+Name[uk]=Нове запрошення
+Name[x-test]=xxNew Invitationxx
+Comment=There is a new invitation to a room
+Comment[ar]=توجد دعوة جديدة
+Comment[az]=Otağa bir yeni dəvət var
+Comment[ca]=Hi ha una invitació nova a una sala
+Comment[ca@valencia]=Hi ha una invitació nova a una sala
+Comment[en_GB]=There is a new invitation to a room
+Comment[es]=Hay una nueva invitación a una sala
+Comment[fi]=Uusi kutsu huoneeseen
+Comment[fr]=Il y a une nouvelle invitation dans un salon.
+Comment[ia]=Il ha un nove invitation a un sala
+Comment[it]=È presente un nuovo invito a una stanza
+Comment[ko]=새로운 대화방 초대장을 받음
+Comment[nl]=Er is een nieuwe uitnodiging naar een room
+Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
+Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
+Comment[pt]=Existe um novo convite para uma sala
+Comment[pt_BR]=Existe um novo convite para uma sala
+Comment[sl]=Tam je novo povabilo v sobo
+Comment[sv]=Det finns en ny inbjudan till ett rum
+Comment[uk]=У кімнаті нове запрошення
+Comment[x-test]=xxThere is a new invitation to a roomxx
+Action=Popup

src/neochataccountregistry.cpp

@@ -0,0 +1,98 @@
+// SPDX-FileCopyrightText: Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "neochataccountregistry.h"
+
+#include "connection.h"
+
+using namespace Quotient;
+
+void AccountRegistry::add(Connection *c)
+{
+    if (m_accounts.contains(c))
+        return;
+    beginInsertRows(QModelIndex(), m_accounts.size(), m_accounts.size());
+    m_accounts += c;
+    endInsertRows();
+}
+
+void AccountRegistry::drop(Connection *c)
+{
+    beginRemoveRows(QModelIndex(), m_accounts.indexOf(c), m_accounts.indexOf(c));
+    m_accounts.removeOne(c);
+    endRemoveRows();
+    Q_ASSERT(!m_accounts.contains(c));
+}
+
+bool AccountRegistry::isLoggedIn(const QString &userId) const
+{
+    return std::any_of(m_accounts.cbegin(), m_accounts.cend(), [&userId](Connection *a) {
+        return a->userId() == userId;
+    });
+}
+
+bool AccountRegistry::contains(Connection *c) const
+{
+    return m_accounts.contains(c);
+}
+
+AccountRegistry::AccountRegistry() = default;
+
+QVariant AccountRegistry::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= m_accounts.count()) {
+        return {};
+    }
+
+    const auto account = m_accounts[index.row()];
+
+    if (role == ConnectionRole) {
+        return QVariant::fromValue(account);
+    }
+
+    return {};
+}
+
+int AccountRegistry::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+
+    return m_accounts.count();
+}
+
+QHash<int, QByteArray> AccountRegistry::roleNames() const
+{
+    return {{ConnectionRole, "connection"}};
+}
+
+bool AccountRegistry::isEmpty() const
+{
+    return m_accounts.isEmpty();
+}
+
+int AccountRegistry::count() const
+{
+    return m_accounts.count();
+}
+
+const QVector<Connection *> AccountRegistry::accounts() const
+{
+    return m_accounts;
+}
+
+Connection *AccountRegistry::get(const QString &userId)
+{
+    for (const auto &connection : m_accounts) {
+        if (connection->userId() == userId) {
+            return connection;
+        }
+    }
+    return nullptr;
+}

src/neochataccountregistry.h

@@ -0,0 +1,48 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QObject>
+
+namespace Quotient
+{
+class Connection;
+
+class AccountRegistry : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    enum EventRoles {
+        ConnectionRole = Qt::UserRole + 1,
+    };
+
+    static AccountRegistry &instance()
+    {
+        static AccountRegistry _instance;
+        return _instance;
+    }
+
+    const QVector<Connection *> accounts() const;
+    void add(Connection *a);
+    void drop(Connection *a);
+    bool isLoggedIn(const QString &userId) const;
+    bool isEmpty() const;
+    int count() const;
+    bool contains(Connection *) const;
+    Connection *get(const QString &userId);
+
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+private:
+    AccountRegistry();
+
+    QVector<Connection *> m_accounts;
+};
+}

src/neochatconfig.kcfg

@@ -73,6 +73,10 @@
       <label>Close NeoChat to system tray</label>
       <default>true</default>
     </entry>
+    <entry name="MinimizeToSystemTrayOnStartup" type="bool">
+      <label>Minimize to system tray on startup</label>
+      <default>false</default>
+    </entry>
     <entry name="ShowFancyEffects" type="bool">
       <label>Show Fancy Effects</label>
       <default>true</default>

src/neochatroom.cpp

@@ -43,7 +43,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
 {
     connect(this, &NeoChatRoom::notificationCountChanged, this, &NeoChatRoom::countChanged);
     connect(this, &NeoChatRoom::highlightCountChanged, this, &NeoChatRoom::countChanged);
-    connect(this, &Room::fileTransferCompleted, this, [=] {
+    connect(this, &Room::fileTransferCompleted, this, [this] {
         setFileUploadingProgress(0);
         setHasFileUploading(false);
     });
@@ -52,12 +52,27 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
 
     connect(this, &Quotient::Room::eventsHistoryJobChanged, this, &NeoChatRoom::lastActiveTimeChanged);
 
-    connect(this, &Room::joinStateChanged, this, [=](JoinState oldState, JoinState newState) {
+    connect(this, &Room::joinStateChanged, this, [this](JoinState oldState, JoinState newState) {
         if (oldState == JoinState::Invite && newState != JoinState::Invite) {
             Q_EMIT isInviteChanged();
         }
     });
     connect(this, &Room::displaynameChanged, this, &NeoChatRoom::displayNameChanged);
+
+    connectSingleShot(this, &Room::baseStateLoaded, this, [this]() {
+        if (this->joinState() != JoinState::Invite) {
+            return;
+        }
+        const QString senderId = getCurrentState<RoomMemberEvent>(localUser()->id())->senderId();
+        QImage avatar_image;
+        if (!user(senderId)->avatarUrl(this).isEmpty()) {
+            avatar_image = user(senderId)->avatar(128, this);
+        } else {
+            qWarning() << "using this room's avatar";
+            avatar_image = avatar(128);
+        }
+        NotificationsManager::instance().postInviteNotification(this, htmlSafeDisplayName(), htmlSafeMemberName(senderId), avatar_image);
+    });
 }
 
 void NeoChatRoom::uploadFile(const QUrl &url, const QString &body)
@@ -68,19 +83,19 @@ void NeoChatRoom::uploadFile(const QUrl &url, const QString &body)
 
     QString txnId = postFile(body.isEmpty() ? url.fileName() : body, url, false);
     setHasFileUploading(true);
-    connect(this, &Room::fileTransferCompleted, [=](const QString &id, const QUrl & /*localFile*/, const QUrl & /*mxcUrl*/) {
+    connect(this, &Room::fileTransferCompleted, [this, txnId](const QString &id, const QUrl & /*localFile*/, const QUrl & /*mxcUrl*/) {
         if (id == txnId) {
             setFileUploadingProgress(0);
             setHasFileUploading(false);
         }
     });
-    connect(this, &Room::fileTransferFailed, [=](const QString &id, const QString & /*error*/) {
+    connect(this, &Room::fileTransferFailed, [this, txnId](const QString &id, const QString & /*error*/) {
         if (id == txnId) {
             setFileUploadingProgress(0);
             setHasFileUploading(false);
         }
     });
-    connect(this, &Room::fileTransferProgress, [=](const QString &id, qint64 progress, qint64 total) {
+    connect(this, &Room::fileTransferProgress, [this, txnId](const QString &id, qint64 progress, qint64 total) {
         if (id == txnId) {
             setFileUploadingProgress(int(float(progress) / float(total) * 100));
         }
@@ -261,10 +276,11 @@ void NeoChatRoom::saveViewport(int topIndex, int bottomIndex)
     setLastDisplayedEvent(maxTimelineIndex() - bottomIndex);
 }
 
-QVariantList NeoChatRoom::getUsers(const QString &keyword) const
+QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
 {
     const auto userList = users();
     QVariantList matchedList;
+    int count = 0;
     for (const auto u : userList) {
         if (u->displayname(this).contains(keyword, Qt::CaseInsensitive)) {
             NeoChatUser user(u->id(), u->connection());
@@ -274,6 +290,10 @@ QVariantList NeoChatRoom::getUsers(const QString &keyword) const
                                     {QStringLiteral("color"), user.color()}};
 
             matchedList.append(QVariant::fromValue(userVariant));
+            count++;
+            if (count == limit) { // -1 is infinite
+                break;
+            }
         }
     }
 
@@ -316,7 +336,11 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
     const bool prettyPrint = (format == Qt::RichText);
 
     using namespace Quotient;
+#ifdef QUOTIENT_07
+    return switchOnType(
+#else
     return visit(
+#endif
         evt,
         [this, prettyPrint, removeReply](const RoomMessageEvent &e) {
             using namespace MessageEventContent;
@@ -485,9 +509,9 @@ void NeoChatRoom::changeAvatar(const QUrl &localFile)
 #endif
         connect(job, &BaseJob::success, this, [this, job] {
 #ifdef QUOTIENT_07
-            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri().toString()}});
+            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", QString(), QJsonObject{{"url", job->contentUri().toString()}});
 #else
-            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
+            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", QString(), QJsonObject{{"url", job->contentUri()}});
 #endif
         });
     }

src/neochatroom.h

@@ -102,7 +102,7 @@ public:
     Q_INVOKABLE [[nodiscard]] int savedBottomVisibleIndex() const;
     Q_INVOKABLE void saveViewport(int topIndex, int bottomIndex);
 
-    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword) const;
+    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword, int limit = -1) const;
     Q_INVOKABLE [[nodiscard]] QVariantMap getUser(const QString &userID) const;
 
     Q_INVOKABLE QUrl urlToMxcUrl(const QUrl &mxcUrl);

src/neochatuser.cpp

@@ -4,13 +4,23 @@
 #include "neochatuser.h"
 
 #include <QGuiApplication>
+#include <QJsonObject>
 #include <QPalette>
 
+#include <connection.h>
+
 NeoChatUser::NeoChatUser(QString userId, Connection *connection)
     : User(std::move(userId), connection)
 {
     connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, &NeoChatUser::polishColor);
     polishColor();
+    if (connection->userId() == id()) {
+        connect(connection, &Connection::accountDataChanged, this, [this](QString type) {
+            if (type == QLatin1String("org.kde.neochat.account_label")) {
+                Q_EMIT accountLabelChanged();
+            }
+        });
+    }
 }
 
 QColor NeoChatUser::color()
@@ -34,3 +44,17 @@ void NeoChatUser::polishColor()
     // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
     setColor(QColor::fromHslF(hueF(), 1, -0.7 * lightness + 0.9, 1));
 }
+
+void NeoChatUser::setAccountLabel(const QString &accountLabel)
+{
+    Q_ASSERT(connection()->user()->id() == id());
+    QJsonObject json;
+    json["account_label"] = accountLabel;
+    connection()->setAccountData("org.kde.neochat.account_label", json);
+}
+
+QString NeoChatUser::accountLabel() const
+{
+    Q_ASSERT(connection()->user()->id() == id());
+    return connection()->accountDataJson("org.kde.neochat.account_label")["account_label"].toString();
+}

src/neochatuser.h

@@ -13,6 +13,8 @@ class NeoChatUser : public User
 {
     Q_OBJECT
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+    // Only valid for the local user
+    Q_PROPERTY(QString accountLabel READ accountLabel WRITE setAccountLabel NOTIFY accountLabelChanged)
 public:
     NeoChatUser(QString userId, Connection *connection);
 
@@ -20,8 +22,13 @@ public Q_SLOTS:
     QColor color();
     void setColor(const QColor &color);
 
+    // Only valid for the local user
+    QString accountLabel() const;
+    void setAccountLabel(const QString &accountLabel);
+
 Q_SIGNALS:
     void colorChanged(QColor _t1);
+    void accountLabelChanged();
 
 private:
     QColor m_color;

src/notificationsmanager.cpp

@@ -11,9 +11,10 @@
 #include "knotifications_version.h"
 #include <KLocalizedString>
 #include <KNotification>
-#if KNOTIFICATIONS_VERSION >= QT_VERSION_CHECK(5, 81, 0)
-#include <KNotificationReplyAction>
+#ifdef HAVE_WINDOWSYSTEM
+#include <KWindowSystem>
 #endif
+#include <KNotificationReplyAction>
 
 #include "controller.h"
 #include "neochatconfig.h"
@@ -65,9 +66,45 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
     connect(replyAction.get(), &KNotificationReplyAction::replied, this, [room, replyEventId](const QString &text) {
         room->postMessage(text, room->preprocessText(text), RoomMessageEvent::MsgType::Text, replyEventId, QString());
     });
+
+    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localUser()->id());
+
     notification->setReplyAction(std::move(replyAction));
 
     notification->sendEvent();
 
     m_notifications.insert(room->id(), notification);
 }
+
+void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon)
+{
+    if (!NeoChatConfig::self()->showNotifications()) {
+        return;
+    }
+    QPixmap img;
+    img.convertFromImage(icon);
+    KNotification *notification = new KNotification("invite");
+    notification->setText(i18n("%1 invited you to a room", sender));
+    notification->setTitle(title);
+    notification->setPixmap(img);
+    notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
+    connect(notification, &KNotification::defaultActivated, this, [=]() {
+#if defined(HAVE_WINDOWSYSTEM) && KNOTIFICATIONS_VERSION >= QT_VERSION_CHECK(5, 90, 0)
+        KWindowSystem::setCurrentXdgActivationToken(notification->xdgActivationToken());
+#endif
+        RoomManager::instance().enterRoom(room);
+        Q_EMIT Controller::instance().showWindow();
+    });
+    notification->setActions({i18n("Accept Invitation"), i18n("Reject Invitation")});
+    connect(notification, &KNotification::action1Activated, this, [room]() {
+        room->acceptInvitation();
+    });
+    connect(notification, &KNotification::action2Activated, this, [room]() {
+        RoomManager::instance().leaveRoom(room);
+    });
+
+    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localUser()->id());
+
+    notification->sendEvent();
+    m_notifications.insert(room->id(), notification);
+}

src/notificationsmanager.h

@@ -21,6 +21,7 @@ public:
 
     Q_INVOKABLE void
     postNotification(NeoChatRoom *room, const QString &roomName, const QString &sender, const QString &text, const QImage &icon, const QString &replyEventId);
+    void postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon);
 
 private:
     NotificationsManager(QObject *parent = nullptr);

src/notifyrc.qrc

@@ -0,0 +1,9 @@
+<!--
+    SPDX-FileCopyrightText: None
+    SPDX-License-Identifier: CC0-1.0
+-->
+<RCC>
+    <qresource prefix="/knotifications5">
+        <file>neochat.notifyrc</file>
+    </qresource>
+</RCC>

src/publicroomlistmodel.cpp

@@ -115,7 +115,7 @@ void PublicRoomListModel::next(int count)
 
     job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword});
 
-    connect(job, &BaseJob::finished, this, [=] {
+    connect(job, &BaseJob::finished, this, [this] {
         attempted = true;
 
         if (job->status() == BaseJob::Success) {

src/roomlistmodel.cpp

@@ -92,7 +92,7 @@ void RoomListModel::setConnection(Connection *connection)
 
     m_connection = connection;
 
-    for (NeoChatRoom *room : qAsConst(m_rooms)) {
+    for (NeoChatRoom *room : std::as_const(m_rooms)) {
         room->disconnect(this);
     }
 
@@ -101,9 +101,9 @@ void RoomListModel::setConnection(Connection *connection)
     connect(connection, &Connection::joinedRoom, this, &RoomListModel::updateRoom);
     connect(connection, &Connection::leftRoom, this, &RoomListModel::updateRoom);
     connect(connection, &Connection::aboutToDeleteRoom, this, &RoomListModel::deleteRoom);
-    connect(connection, &Connection::directChatsListChanged, this, [=](Quotient::DirectChatsMap additions, Quotient::DirectChatsMap removals) {
+    connect(connection, &Connection::directChatsListChanged, this, [this, connection](Quotient::DirectChatsMap additions, Quotient::DirectChatsMap removals) {
         auto refreshRooms = [this, &connection](Quotient::DirectChatsMap rooms) {
-            for (const QString &roomID : qAsConst(rooms)) {
+            for (const QString &roomID : std::as_const(rooms)) {
                 auto room = connection->room(roomID);
                 if (room) {
                     refresh(static_cast<NeoChatRoom *>(room));
@@ -152,29 +152,29 @@ void RoomListModel::doAddRoom(Room *r)
 
 void RoomListModel::connectRoomSignals(NeoChatRoom *room)
 {
-    connect(room, &Room::displaynameChanged, this, [=] {
+    connect(room, &Room::displaynameChanged, this, [this, room] {
         refresh(room);
     });
-    connect(room, &Room::unreadMessagesChanged, this, [=] {
+    connect(room, &Room::unreadMessagesChanged, this, [this, room] {
         refresh(room);
     });
-    connect(room, &Room::notificationCountChanged, this, [=] {
+    connect(room, &Room::notificationCountChanged, this, [this, room] {
         refresh(room);
     });
     connect(room, &Room::avatarChanged, this, [this, room] {
         refresh(room, {AvatarRole});
     });
-    connect(room, &Room::tagsChanged, this, [=] {
+    connect(room, &Room::tagsChanged, this, [this, room] {
         refresh(room);
     });
-    connect(room, &Room::joinStateChanged, this, [=] {
+    connect(room, &Room::joinStateChanged, this, [this, room] {
         refresh(room);
     });
-    connect(room, &Room::addedMessages, this, [=] {
+    connect(room, &Room::addedMessages, this, [this, room] {
         refresh(room, {LastEventRole});
     });
     connect(room, &Room::notificationCountChanged, this, &RoomListModel::handleNotifications);
-    connect(room, &Room::highlightCountChanged, this, [=] {
+    connect(room, &Room::highlightCountChanged, this, [this, room] {
         if (room->highlightCount() == 0) {
             return;
         }
@@ -205,7 +205,7 @@ void RoomListModel::handleNotifications()
     static QStringList oldNotifications;
     auto job = m_connection->callApi<GetNotificationsJob>();
 
-    connect(job, &BaseJob::success, this, [=]() {
+    connect(job, &BaseJob::success, this, [this, job]() {
         const auto notifications = job->jsonData()["notifications"].toArray();
         if (initial) {
             initial = false;
@@ -249,7 +249,7 @@ void RoomListModel::handleNotifications()
 void RoomListModel::refreshNotificationCount()
 {
     int count = 0;
-    for (auto room : qAsConst(m_rooms)) {
+    for (auto room : std::as_const(m_rooms)) {
         count += room->notificationCount();
     }
     if (m_notificationCount == count) {
@@ -354,6 +354,9 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
             return NeoChatRoomType::Direct;
         }
         const RoomCreateEvent *creationEvent = room->creation();
+        if (!creationEvent) {
+            return NeoChatRoomType::Normal;
+        }
         QJsonObject contentJson = creationEvent->contentJson();
         QJsonObject::const_iterator typeIter = contentJson.find("type");
         if (typeIter != contentJson.end()) {
@@ -489,7 +492,7 @@ bool RoomListModel::categoryVisible(int category) const
 
 NeoChatRoom *RoomListModel::roomByAliasOrId(const QString &aliasOrId)
 {
-    for (const auto &room : qAsConst(m_rooms)) {
+    for (const auto &room : std::as_const(m_rooms)) {
         if (room->aliases().contains(aliasOrId) || room->id() == aliasOrId) {
             return room;
         }

src/roommanager.cpp

@@ -19,6 +19,7 @@ RoomManager::RoomManager(QObject *parent)
     , m_lastCurrentRoom(nullptr)
     , m_config(KConfig("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation))
 {
+    m_lastRoomConfig = m_config.group("LastOpenRoom");
 }
 
 RoomManager::~RoomManager()
@@ -97,8 +98,7 @@ void RoomManager::openRoomForActiveConnection()
         return;
     }
     // Read from last open room
-    KConfigGroup lastOpenRoomGroup(&m_config, "LastOpenRoom");
-    QString roomId = lastOpenRoomGroup.readEntry(Controller::instance().activeConnection()->userId(), QString());
+    QString roomId = m_lastRoomConfig.readEntry(Controller::instance().activeConnection()->userId(), QString());
 
     // TODO remove legacy check at some point.
     if (roomId.isEmpty()) {
@@ -130,9 +130,7 @@ void RoomManager::enterRoom(NeoChatRoom *room)
     }
 
     // Save last open room
-    KConfigGroup lastOpenRoomGroup(&m_config, "LastOpenRoom");
-    lastOpenRoomGroup.writeEntry(Controller::instance().activeConnection()->userId(), room->id());
-    lastOpenRoomGroup.config()->sync();
+    m_lastRoomConfig.writeEntry(Controller::instance().activeConnection()->userId(), room->id());
 }
 
 void RoomManager::openWindow(NeoChatRoom *room)
@@ -186,7 +184,7 @@ void RoomManager::visitRoom(Room *room, const QString &eventId)
 void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAliasOrId, const QStringList &viaServers)
 {
     account->joinRoom(QUrl::toPercentEncoding(roomAliasOrId), viaServers);
-    connectSingleShot(account, &Quotient::Connection::newRoom, this, [=](Quotient::Room *room) {
+    connectSingleShot(account, &Quotient::Connection::newRoom, this, [this](Quotient::Room *room) {
         enterRoom(dynamic_cast<NeoChatRoom *>(room));
     });
 }

src/roommanager.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <KConfig>
+#include <KConfigGroup>
 #include <QObject>
 #include <uriresolver.h>
 
@@ -104,4 +105,5 @@ private:
     NeoChatRoom *m_lastCurrentRoom;
     QString m_arg;
     KConfig m_config;
+    KConfigGroup m_lastRoomConfig;
 };

src/trayicon.cpp

@@ -12,7 +12,7 @@
 TrayIcon::TrayIcon(QObject *parent)
     : QSystemTrayIcon(parent)
 {
-    setIcon(QIcon::fromTheme("org.kde.neochat"));
+    setIcon(QIcon(":/icons/org.kde.neochat.tray.svg"));
     QMenu *menu = new QMenu();
     auto viewAction_ = new QAction(i18n("Show"), parent);
 

src/trayicon_sni.cpp

@@ -7,7 +7,8 @@
 TrayIcon::TrayIcon(QObject *parent)
     : KStatusNotifierItem(parent)
 {
-    setIconByName("org.kde.neochat");
+    setCategory(KStatusNotifierItem::ItemCategory::Communications);
+    setIconByName("org.kde.neochat.tray");
     connect(this, &KStatusNotifierItem::activateRequested, this, [this] {
         KWindowSystem::setCurrentXdgActivationToken(providedToken());
         Q_EMIT showWindow();

src/userdirectorylistmodel.cpp

@@ -75,7 +75,7 @@ void UserDirectoryListModel::search(int count)
 
     job = m_connection->callApi<SearchUserDirectoryJob>(m_keyword, count);
 
-    connect(job, &BaseJob::finished, this, [=] {
+    connect(job, &BaseJob::finished, this, [this] {
         attempted = true;
 
         if (job->status() == BaseJob::Success) {