SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.gitignore

@@ -5,4 +5,3 @@ build
 neochat.kdev4
 compile_commands.json
 .cache/
-.vscode/

.gitlab/issue_templates/bug.md

@@ -1,42 +0,0 @@
-<!--
-Hello, thanks for reporting a bug. To help us with the debugging,
-please make sure to fill all the recommended information.
-Thanks!
--->
-
-## Description
-
-(General description of the bug)
-
-## Steps to reproduce
-
-1. Open app
-2. ...
-3. ...
-
-## What is the current bug behavior?
-
-(What actually happens)
-
-## What is the expected correct behavior?
-
-(What you should see instead)
-
-## Relevant logs and/or screenshots
-
-(Paste any relevant logs - please use code blocks (```) to format console output, logs, and code, as
-it's very hard to read otherwise.)
-
-## Possible fixes
-
-(If you can, link to the line of code that might be responsible for the problem)
-
-## System/Matrix Information
-
- - **Distribution / Platform:** Ubuntu 20.04, openSUSE, Flatpak, Windows, MacOS, Android, ...
- - **Qt Version:** 5.15.2
- - **NeoChat version:** 1.2
- - **Quotient version:** 0.6.6
- - **Matrix server:** matrix.org, kde.org, ....
-
-/label ~Bug

.reuse/dep5

@@ -1,44 +0,0 @@
-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
-Copyright: 2020 Carson Black <uhhadd@gmail.com>
-License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-
-Files: qtquickcontrols2.conf
-Copyright: 2020 Tobias Fella <fella@posteo.de>
-License: CC0-1.0
-
-Files: android/res/drawable/splash.xml
-Copyright: 2020 Tobias Fella <fella@posteo.de>
-License: BSD-2-Clause
-
-Files: */qmldir .gitignore
-Copyright: None
-License: CC0-1.0
-
-Files: .gitlab/issue_templates/bug.md
-Copyright: 2021 Carl Schwan <carlschwan@kde.org>
-License: CC0-1.0
-
-Files: res.qrc
-Copyright: None
-License: CC0-1.0
-
-Files: cmake/Flatpak/99-noto-mono-color-emoji.conf
-Copyright: 2021 Carl Schwan <carlschwan@kde.org>
-License: BSD-2-Clause
-
-Files: src/neochatconfig.kcfg
-Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>
-Copyright: 2020-2021 Tobias Fella <fella@posteo.de>
-License: BSD-2-Clause
-
-Files: neochat.notifyrc
-Copyright: 2020 Tobias Fella <fella@posteo.de>
-License: BSD-2-Clause
-
-Files: imports/NeoChat/Component/confetti.png imports/NeoChat/Component/glowdot.png
-Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
-License: CC0-1.0

CMakeLists.txt

@@ -1,25 +1,17 @@
-# SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
-# SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
-# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
-# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
-# SPDX-License-Identifier: BSD-2-Clause
+cmake_minimum_required(VERSION 3.1)
 
-cmake_minimum_required(VERSION 3.16)
+project(Neochat)
 
-project(NeoChat)
-
-set(KF5_MIN_VERSION "5.86.0")
+set(KF5_MIN_VERSION "5.77.0")
 set(QT_MIN_VERSION "5.15.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(KDE_COMPILERSETTINGS_LEVEL 5.84)
-
 include(FeatureSummary)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
@@ -28,8 +20,6 @@ include(KDEClangFormat)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
-include(KDEGitCommitHooks)
-include(ECMCheckOutboundLicense)
 
 if(NEOCHAT_FLATPAK)
     include(cmake/Flatpak.cmake)
@@ -38,12 +28,12 @@ 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(1.1.1
     VARIABLE_PREFIX NEOCHAT
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
+find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Widgets Core Quick Gui QuickControls2 Multimedia Svg)
 set_package_properties(Qt5 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -58,12 +48,6 @@ set_package_properties(KF5Kirigami2 PROPERTIES
     PURPOSE "Kirigami application UI framework"
 )
 
-find_package(Qt5Keychain)
-set_package_properties(Qt5Keychain PROPERTIES
-    TYPE REQUIRED
-    PURPOSE "Secure storage of account secrets"
-)
-
 if(ANDROID)
     find_package(OpenSSL)
     set_package_properties(OpenSSL PROPERTIES
@@ -71,12 +55,11 @@ if(ANDROID)
         PURPOSE "Encrypted communications"
     )
 else()
-    find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem Sonnet)
-    set_package_properties(KF5QQC2DesktopStyle PROPERTIES
-        TYPE RUNTIME
+    find_package(Qt5Keychain)
+    set_package_properties(Qt5Keychain PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Secure storage of account secrets"
     )
-    ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
@@ -110,10 +93,6 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro REQUIRED)
-
-qcoro_enable_coroutines()
-
 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)
@@ -131,7 +110,3 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
 
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
-
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
-file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
-ecm_check_outbound_license(LICENSES GPL-3.0-only FILES ${ALL_SOURCE_FILES})

LICENSES/CC0-1.0.txt

@@ -1,119 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
-AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
-OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
-OR WORKS PROVIDED HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer exclusive
-Copyright and Related Rights (defined below) upon the creator and subsequent
-owner(s) (each and all, an "owner") of an original work of authorship and/or
-a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later claims
-of infringement build upon, modify, incorporate in other works, reuse and
-redistribute as freely as possible in any form whatsoever and for any purposes,
-including without limitation commercial purposes. These owners may contribute
-to the Commons to promote the ideal of a free culture and the further production
-of creative, cultural and scientific works, or to gain reputation or greater
-distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with
-a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or
-her Copyright and Related Rights in the Work and the meaning and intended
-legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be protected
-by copyright and related or neighboring rights ("Copyright and Related Rights").
-Copyright and Related Rights include, but are not limited to, the following:
-
-i. the right to reproduce, adapt, distribute, perform, display, communicate,
-and translate a Work;
-
-      ii. moral rights retained by the original author(s) and/or performer(s);
-
-iii. publicity and privacy rights pertaining to a person's image or likeness
-depicted in a Work;
-
-iv. rights protecting against unfair competition in regards to a Work, subject
-to the limitations in paragraph 4(a), below;
-
-v. rights protecting the extraction, dissemination, use and reuse of data
-in a Work;
-
-vi. database rights (such as those arising under Directive 96/9/EC of the
-European Parliament and of the Council of 11 March 1996 on the legal protection
-of databases, and under any national implementation thereof, including any
-amended or successor version of such directive); and
-
-vii. other similar, equivalent or corresponding rights throughout the world
-based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time extensions),
-(iii) in any current or future medium and for any number of copies, and (iv)
-for any purpose whatsoever, including without limitation commercial, advertising
-or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
-benefit of each member of the public at large and to the detriment of Affirmer's
-heirs and successors, fully intending that such Waiver shall not be subject
-to revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account Affirmer's
-express Statement of Purpose. In addition, to the extent the Waiver is so
-judged Affirmer hereby grants to each affected person a royalty-free, non
-transferable, non sublicensable, non exclusive, irrevocable and unconditional
-license to exercise Affirmer's Copyright and Related Rights in the Work (i)
-in all territories worldwide, (ii) for the maximum duration provided by applicable
-law or treaty (including future time extensions), (iii) in any current or
-future medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional purposes
-(the "License"). The License shall be deemed effective as of the date CC0
-was applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder of
-the License, and in such case Affirmer hereby affirms that he or she will
-not (i) exercise any of his or her remaining Copyright and Related Rights
-in the Work or (ii) assert any associated claims and causes of action with
-respect to the Work, in either case contrary to Affirmer's express Statement
-of Purpose.
-
-   4. Limitations and Disclaimers.
-
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
-licensed or otherwise affected by this document.
-
-b. Affirmer offers the Work as-is and makes no representations or warranties
-of any kind concerning the Work, express, implied, statutory or otherwise,
-including without limitation warranties of title, merchantability, fitness
-for a particular purpose, non infringement, or the absence of latent or other
-defects, accuracy, or the present or absence of errors, whether or not discoverable,
-all to the greatest extent permissible under applicable law.
-
-c. Affirmer disclaims responsibility for clearing rights of other persons
-that may apply to the Work or any use thereof, including without limitation
-any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
-responsibility for obtaining any necessary consents, permissions or other
-rights required for any use of the Work.
-
-d. Affirmer understands and acknowledges that Creative Commons is not a party
-to this document and has no duty or obligation with respect to this CC0 or
-use of the Work.

LICENSES/GPL-2.0-only.txt

@@ -1,319 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 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.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share
-and change it. By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users. This General Public License applies to
-most of the Free Software Foundation's software and to any other program whose
-authors commit to using it. (Some other Free Software Foundation software
-is covered by the GNU Lesser General Public License instead.) You can apply
-it to your programs, too.
-
-When we speak of free software, we are referring to freedom, 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 or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of
-the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have. You
-must make sure that they, too, receive or can get the source code. And you
-must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If
-the software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems introduced
-by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or translated
-into another language. (Hereinafter, translation is included without limitation
-in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program
-is not restricted, and the output from the Program is covered only if its
-contents constitute a work based on the Program (independent of having been
-made by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's 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 give any other recipients of the Program a copy of this
-License along with the Program.
-
-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 Program or any portion of it,
-thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or
-in part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print
-such an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, 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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program with
-the Program (or with a work based on the Program) on a volume of a storage
-or distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section
-2) in object code or executable form under the terms of Sections 1 and 2 above
-provided that you also do one of the following:
-
-a) 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; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for noncommercial
-distribution and only if you received the program in object code or executable
-form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, 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 executable. However, as a special exception, the source code 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.
-
-If distribution of executable or 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 counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with
-the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except
-as expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program 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.
-
-5. 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
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the Program
-(or any work based on the Program), you indicate your acceptance of this License
-to do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor
-to copy, distribute or modify the Program 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 to this License.
-
-7. 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 Program at all. For example, if a
-patent license would not permit royalty-free redistribution of the Program
-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 Program.
-
-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.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program 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.
-
-9. The Free Software Foundation may publish revised and/or new versions of
-the 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 Program 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
-Program does not specify a version number of this License, you may choose
-any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, 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
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
-"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 PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 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 Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. 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 program's name and an idea of what it does.>
-
-Copyright (C)< yyyy> <name of author>
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, 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.
-
-If the program is interactive, make it output a short notice like this when
-it starts in an interactive mode:
-
-Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
-with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software,
-and you are welcome to redistribute it under certain conditions; type `show
-c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may be
-called something other than `show w' and `show c'; they could even be mouse-clicks
-or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the program, if necessary. Here
-is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
-(which makes passes at compilers) written by James Hacker.
-
-<signature of Ty Coon >, 1 April 1989 Ty Coon, President of Vice This General
-Public License does not permit incorporating your program into proprietary
-programs. If your program is a subroutine library, you may consider it more
-useful to permit linking proprietary applications with the library. If this
-is what you want to do, use the GNU Lesser General Public License instead
-of this License.

LICENSES/LGPL-2.0-or-later.txt

@@ -1,446 +0,0 @@
-GNU LIBRARY GENERAL PUBLIC LICENSE
-
-Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
-
-51 Franklin St, 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 library GPL. It is numbered 2 because
-it goes with version 2 of the ordinary GPL.]
-
-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 Library General Public License, applies to some specially
-designated Free Software Foundation software, and to any other libraries whose
-authors decide to use it. You can use it for your libraries, too.
-
-When we speak of free software, we are referring to freedom, 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 or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the 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
-a program 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.
-
-Our method of protecting your rights has two steps: (1) copyright the library,
-and (2) offer you this license which gives you legal permission to copy, distribute
-and/or modify the library.
-
-Also, for each distributor's protection, we want to make certain that everyone
-understands that there is no warranty for this free library. If the library
-is modified by someone else and passed on, we want its recipients to know
-that what they have is not the original version, so that any problems introduced
-by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that companies distributing free software will individually
-obtain patent licenses, thus in effect transforming the program into proprietary
-software. To prevent this, we have made it clear that any patent must be licensed
-for everyone's free use or not licensed at all.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU
-General Public License, which was designed for utility programs. This license,
-the GNU Library General Public License, applies to certain designated libraries.
-This license is quite different from the ordinary one; be sure to read it
-in full, and don't assume that anything in it is the same as in the ordinary
-license.
-
-The reason we have a separate public license for some libraries is that they
-blur the distinction we usually make between modifying or adding to a program
-and simply using it. Linking a program with a library, without changing the
-library, is in some sense simply using the library, and is analogous to running
-a utility program or application program. However, in a textual and legal
-sense, the linked executable is a combined work, a derivative of the original
-library, and the ordinary General Public License treats it as such.
-
-Because of this blurred distinction, using the ordinary General Public License
-for libraries did not effectively promote software sharing, because most developers
-did not use the libraries. We concluded that weaker conditions might promote
-sharing better.
-
-However, unrestricted linking of non-free programs would deprive the users
-of those programs of all benefit from the free status of the libraries themselves.
-This Library General Public License is intended to permit developers of non-free
-programs to use free libraries, while preserving your freedom as a user of
-such programs to change the free libraries that are incorporated in them.
-(We have not seen how to achieve this as regards changes in header files,
-but we have achieved it as regards changes in the actual functions of the
-Library.) The hope is that this will lead to faster development of free libraries.
-
-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, while the latter only works together with the library.
-
-Note that it is possible for a library to be covered by the ordinary General
-Public License rather than by this special one.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library which contains a
-notice placed by the copyright holder or other authorized party saying it
-may be distributed under the terms of this Library 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 compile 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) 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.
-
-c) 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.
-
-d) 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 source code 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 to 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 Library 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 Library General Public License as published by the Free
-Software Foundation; either version 2 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 Library General Public License for more
-details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, 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!

LICENSES/LGPL-2.1-or-later.txt

@@ -1,468 +0,0 @@
-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!

LICENSES/LGPL-3.0-only.txt

@@ -1,163 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates the terms
-and conditions of version 3 of the GNU General Public License, supplemented
-by the additional permissions listed below.
-
-   0. Additional Definitions.
-
-      
-
-As used herein, "this License" refers to version 3 of the GNU Lesser General
-Public License, and the "GNU GPL" refers to version 3 of the GNU General Public
-License.
-
-      
-
-"The Library" refers to a covered work governed by this License, other than
-an Application or a Combined Work as defined below.
-
-      
-
-An "Application" is any work that makes use of an interface provided by the
-Library, but which is not otherwise based on the Library. Defining a subclass
-of a class defined by the Library is deemed a mode of using an interface provided
-by the Library.
-
-      
-
-A "Combined Work" is a work produced by combining or linking an Application
-with the Library. The particular version of the Library with which the Combined
-Work was made is also called the "Linked Version".
-
-      
-
-The "Minimal Corresponding Source" for a Combined Work means the Corresponding
-Source for the Combined Work, excluding any source code for portions of the
-Combined Work that, considered in isolation, are based on the Application,
-and not on the Linked Version.
-
-      
-
-The "Corresponding Application Code" for a Combined Work means the object
-code and/or source code for the Application, including any data and utility
-programs needed for reproducing the Combined Work from the Application, but
-excluding the System Libraries of the Combined Work.
-
-   1. Exception to Section 3 of the GNU GPL.
-
-You may convey a covered work under sections 3 and 4 of this License without
-being bound by section 3 of the GNU GPL.
-
-   2. Conveying Modified Versions.
-
-If you modify a copy of the Library, and, in your modifications, a facility
-refers to a function or data to be supplied by an Application that uses the
-facility (other than as an argument passed when the facility is invoked),
-then you may convey a copy of the modified version:
-
-a) under this License, provided that you make a good faith effort to ensure
-that, in the event an Application does not supply the function or data, the
-facility still operates, and performs whatever part of its purpose remains
-meaningful, or
-
-b) under the GNU GPL, with none of the additional permissions of this License
-applicable to that copy.
-
-   3. Object Code Incorporating Material from Library Header Files.
-
-The object code form of an Application may incorporate material from a header
-file that is part of the Library. You may convey such object code under terms
-of your choice, provided that, if the incorporated material is not limited
-to numerical parameters, data structure layouts and accessors, or small macros,
-inline functions and templates (ten or fewer lines in length), you do both
-of the following:
-
-a) Give prominent notice with each copy of the object code that the Library
-is used in it and that the Library and its use are covered by this License.
-
-b) Accompany the object code with a copy of the GNU GPL and this license document.
-
-   4. Combined Works.
-
-You may convey a Combined Work under terms of your choice that, taken together,
-effectively do not restrict modification of the portions of the Library contained
-in the Combined Work and reverse engineering for debugging such modifications,
-if you also do each of the following:
-
-a) Give prominent notice with each copy of the Combined Work that the Library
-is used in it and that the Library and its use are covered by this License.
-
-b) Accompany the Combined Work with a copy of the GNU GPL and this license
-document.
-
-c) For a Combined Work that displays copyright notices during execution, include
-the copyright notice for the Library among these notices, as well as a reference
-directing the user to the copies of the GNU GPL and this license document.
-
-      d) Do one of the following:
-
-0) Convey the Minimal Corresponding Source under the terms of this License,
-and the Corresponding Application Code in a form suitable for, and under terms
-that permit, the user to recombine or relink the Application with a modified
-version of the Linked Version to produce a modified Combined Work, in the
-manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
-
-1) Use a suitable shared library mechanism for linking with the Library. A
-suitable mechanism is one that (a) uses at run time a copy of the Library
-already present on the user's computer system, and (b) will operate properly
-with a modified version of the Library that is interface-compatible with the
-Linked Version.
-
-e) Provide Installation Information, but only if you would otherwise be required
-to provide such information under section 6 of the GNU GPL, and only to the
-extent that such information is necessary to install and execute a modified
-version of the Combined Work produced by recombining or relinking the Application
-with a modified version of the Linked Version. (If you use option 4d0, the
-Installation Information must accompany the Minimal Corresponding Source and
-Corresponding Application Code. If you use option 4d1, you must provide the
-Installation Information in the manner specified by section 6 of the GNU GPL
-for conveying Corresponding Source.)
-
-   5. Combined Libraries.
-
-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 that are
-not Applications and are not covered by this License, and convey such a combined
-library under terms of your choice, if you do both of the following:
-
-a) Accompany the combined library with a copy of the same work based on the
-Library, uncombined with any other library facilities, conveyed under the
-terms of this License.
-
-b) Give prominent notice with the combined library that part of it is a work
-based on the Library, and explaining where to find the accompanying uncombined
-form of the same work.
-
-   6. Revised Versions of the GNU Lesser General Public License.
-
-The Free Software Foundation may publish revised and/or new versions of the
-GNU 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 as you
-received it specifies that a certain numbered version of the GNU Lesser General
-Public License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that published version or of
-any later version published by the Free Software Foundation. If the Library
-as you received it does not specify a version number of the GNU Lesser General
-Public License, you may choose any version of the GNU Lesser General Public
-License ever published by the Free Software Foundation.
-
-If the Library as you received it specifies that a proxy can decide whether
-future versions of the GNU Lesser General Public License shall apply, that
-proxy's public statement of acceptance of any version is permanent authorization
-for you to choose that version for the Library.

LICENSES/LicenseRef-KDE-Accepted-GPL.txt

@@ -1,12 +0,0 @@
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 3 of
-the license or (at your option) at any later version that is
-accepted by the membership of KDE e.V. (or its successor
-approved by the membership of KDE e.V.), which shall act as a
-proxy as defined in Section 14 of version 3 of the license.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.

LICENSES/MIT.txt

@@ -1,19 +0,0 @@
-MIT License Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-# SPDX-FileCopyrightText: None
-# SPDX-License-Identifier: CC0-1.0
 $XGETTEXT `find . \( -name \*.cpp -o -name \*.h -o -name \*.qml \)` -o $podir/neochat.pot

README.md

@@ -1,17 +1,9 @@
-<!--
-    SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
-    SPDX-License-Identifier: CC0-1.0
--->
-# NeoChat
+# Neochat
 
-NeoChat is a client for Matrix, the decentralized communication protocol for instant
+Neochat is a client for Matrix, the decentralized communication protocol for instant
 messaging. It is a fork of Spectral, using KDE frameworks, most notably Kirigami,
 KConfig and KI18n.
 
-<a href='https://flathub.org/apps/details/org.kde.neochat'><img width='190px' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-i-en.png'/></a>
-
-
 ## Get it
 
 A stable release [is available](https://apps.kde.org/en/neochat) for download for Linux distributions.
@@ -27,11 +19,11 @@ flatpak install kdeapps org.kde.neochat
 ```
 
 A nightly build is also available for Android in the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid)
-and can also directly be downloaded from the [binary factory](https://binary-factory.kde.org/view/Android/job/NeoChat_Nightly_android-arm64/).
+and can also directly be downloaded from the [binary factory](https://binary-factory.kde.org/view/Android/job/Neochat_android/).
 
 Nightly builds for [Windows](https://binary-factory.kde.org/job/NeoChat_Nightly_win64/), [MacOS](https://binary-factory.kde.org/job/NeoChat_Nightly_macos/) and [AppImages](https://binary-factory.kde.org/job/NeoChat_Nightly_appimage/) can also be downloaded from the [binary factory](https://binary-factory.kde.org/search/?q=neochat).
 
-![Timeline](https://invent.kde.org/websites/product-screenshots/-/raw/master/neochat/application.png)
+![Timeline](https://www.plasma-mobile.org/img/post-2020-10/post-2020-10-neochat-timeline.png)
 
 ## Features
 

android/AndroidManifest.xml

@@ -9,10 +9,10 @@
           android:versionName="0.0.1"
           android:versionCode="1604412458"
           android:installLocation="auto">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
+    <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:name="org.qtproject.qt5.android.bindings.QtActivity"
-                  android:label="NeoChat"
+                  android:label="Neochat"
                   android:windowSoftInputMode="adjustResize"
                   android:launchMode="singleTop">
 
@@ -53,6 +53,7 @@
         </activity>
     </application>
 
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

cmake/Findcmark.cmake

@@ -1,22 +1,17 @@
-# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-# SPDX-License-Identifier: GPL-3.0-only
-
 #
 # CMake module to search for the cmark library
 #
 
 # first try to find cmark-config.cmake
 # path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-find_package(cmark CONFIG QUIET)
+find_package(cmark CONFIG)
 if(cmark_FOUND AND TARGET cmark::cmark)
   # found it!
   return()
 endif()
 
-find_package(PkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_CMARK QUIET cmark)
-endif()
+include(FindPkgConfig)
+pkg_check_modules(PC_CMARK QUIET cmark)
 
 if(NOT CMARK_INCLUDE_DIR)
   find_path(CMARK_INCLUDE_DIR

cmake/Flatpak.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-# SPDX-License-Identifier: BSD-2-Clause
-
 include(GNUInstallDirs)
 
 # Include FontConfig config which uses the Emoji One font from the

imports/NeoChat/Component/AutoMouseArea.qml

@@ -0,0 +1,18 @@
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+
+import NeoChat.Setting 1.0
+
+MouseArea {
+    signal primaryClicked()
+    signal secondaryClicked()
+
+    acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+    onClicked: mouse.button == Qt.RightButton ? secondaryClicked() : primaryClicked()
+    onPressAndHold: secondaryClicked()
+}

imports/NeoChat/Component/ChatBox/AttachmentPane.qml

@@ -1,197 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Page 1.0
-
-Loader {
-    id: root
-
-    property var attachmentMimetype: FileType.mimeTypeForUrl(ChatBoxHelper.attachmentPath)
-    readonly property bool hasImage: attachmentMimetype.valid && FileType.supportedImageFormats.includes(attachmentMimetype.preferredSuffix)
-
-    active: visible
-    sourceComponent: Component {
-        Pane {
-            id: attachmentPane
-            property string baseFileName: ChatBoxHelper.attachmentPath.toString().substring(ChatBoxHelper.attachmentPath.toString().lastIndexOf('/') + 1, ChatBoxHelper.attachmentPath.length)
-            Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-            contentItem: Item {
-                property real spacing: attachmentPane.spacing > 0 ? attachmentPane.spacing : toolBar.spacing
-                implicitWidth: Math.max(image.implicitWidth, imageBusyIndicator.implicitWidth, fileInfoLayout.implicitWidth, toolBar.implicitWidth)
-                implicitHeight: Math.max(
-                    (hasImage ? Math.max(image.preferredHeight, imageBusyIndicator.implicitHeight) + spacing : 0)
-                        + fileInfoLayout.implicitHeight,
-                    toolBar.implicitHeight
-                )
-
-                Image {
-                    id: image
-                    property real preferredHeight: Math.min(implicitHeight, Kirigami.Units.gridUnit * 8)
-                    height: preferredHeight
-                    anchors {
-                        horizontalCenter: parent.horizontalCenter
-                        bottom: fileInfoLayout.top
-                        bottomMargin: parent.spacing
-                    }
-                    width: Math.min(implicitWidth, attachmentPane.availableWidth)
-                    asynchronous: true
-                    cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-                    smooth: height == preferredHeight && parent.height == parent.implicitHeight // Don't smooth until height animation stops
-                    source: hasImage ? ChatBoxHelper.attachmentPath : ""
-                    visible: hasImage
-                    fillMode: Image.PreserveAspectFit
-
-                    onSourceChanged: {
-                        // Reset source size height, which affect implicitHeight
-                        sourceSize.height = -1
-                    }
-
-                    onSourceSizeChanged: {
-                        if (implicitHeight > Kirigami.Units.gridUnit * 8) {
-                            // This can save a lot of RAM when loading large images.
-                            // It also improves visual quality for large images.
-                            sourceSize.height = Kirigami.Units.gridUnit * 8
-                        }
-                    }
-
-                    Behavior on height {
-                        NumberAnimation {
-                            property: "height"
-                            duration: Kirigami.Units.shortDuration
-                            easing.type: Easing.OutCubic
-                        }
-                    }
-                }
-
-                BusyIndicator {
-                    id: imageBusyIndicator
-                    anchors {
-                        horizontalCenter: parent.horizontalCenter
-                        top: parent.top
-                        bottom: fileInfoLayout.top
-                        bottomMargin: parent.spacing
-                    }
-                    visible: running
-                    running: image.visible && image.progress < 1
-                }
-
-                RowLayout {
-                    id: fileInfoLayout
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.verticalCenter: undefined
-                    anchors.bottom: parent.bottom
-                    spacing: parent.spacing
-
-                    Kirigami.Icon {
-                        id: mimetypeIcon
-                        implicitHeight: Kirigami.Units.fontMetrics.roundedIconSize(fileLabel.implicitHeight)
-                        implicitWidth: implicitHeight
-                        source: attachmentMimetype.iconName
-                    }
-
-                    Label {
-                        id: fileLabel
-                        text: baseFileName
-                    }
-
-                    states: State {
-                        when: !hasImage
-                        AnchorChanges {
-                            target: fileInfoLayout
-                            anchors.bottom: undefined
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-                }
-
-                // Using a toolbar to get a button spacing consistent with what the QQC2 style normally has
-                // Also has some accessibility info
-                ToolBar {
-                    id: toolBar
-                    width: parent.width
-                    anchors.top: parent.top
-
-                    leftPadding: 0
-                    rightPadding: 0
-                    topPadding: 0
-                    bottomPadding: 0
-
-                    Kirigami.Theme.inherit: true
-                    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-                    contentItem: RowLayout {
-                        spacing: parent.spacing
-                        Label {
-                            Layout.leftMargin: -attachmentPane.leftPadding
-                            Layout.topMargin: -attachmentPane.topPadding
-                            leftPadding: cancelAttachmentButton.leftPadding + 1 + attachmentPane.leftPadding
-                            rightPadding: cancelAttachmentButton.rightPadding + 1
-                            topPadding: cancelAttachmentButton.topPadding + attachmentPane.topPadding
-                            bottomPadding: cancelAttachmentButton.bottomPadding
-                            text: i18n("Attachment:")
-                            horizontalAlignment: Text.AlignLeft
-                            verticalAlignment: Text.AlignVCenter
-                            background: Kirigami.ShadowedRectangle {
-                                property real cornerRadius: cancelAttachmentButton.background.hasOwnProperty("radius") ?
-                                    Math.min(cancelAttachmentButton.background.radius, height/2) : 0
-                                corners.bottomLeftRadius: toolBar.mirrored ? cornerRadius : 0
-                                corners.bottomRightRadius: toolBar.mirrored ? 0 : cornerRadius
-                                color: Kirigami.Theme.backgroundColor
-                                opacity: 0.75
-                            }
-                        }
-                        Item {
-                            Layout.fillWidth: true
-                        }
-                        Button {
-                            id: editImageButton
-                            visible: hasImage
-                            icon.name: "document-edit"
-                            text: i18n("Edit")
-                            display: AbstractButton.IconOnly
-
-                            Component {
-                                id: imageEditorPage
-                                ImageEditorPage {
-                                    imagePath: ChatBoxHelper.attachmentPath
-                                }
-                            }
-                            onClicked: {
-                                let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage);
-                                imageEditor.newPathChanged.connect(function(newPath) {
-                                    applicationWindow().pageStack.layers.pop();
-                                    ChatBoxHelper.attachmentPath = newPath;
-                                });
-                            }
-                            ToolTip.text: text
-                            ToolTip.visible: hovered
-                        }
-                        Button {
-                            id: cancelAttachmentButton
-                            icon.name: "dialog-cancel"
-                            text: i18n("Cancel")
-                            display: AbstractButton.IconOnly
-                            onClicked: ChatBoxHelper.clearAttachment();
-                            ToolTip.text: text
-                            ToolTip.visible: hovered
-                        }
-                    }
-                    background: null
-                }
-            }
-
-            background: Rectangle {
-                color: Kirigami.Theme.backgroundColor
-            }
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/ChatBar.qml

@@ -1,520 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-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.neochat 1.0
-
-ToolBar {
-    id: chatBar
-    property string replyEventId: ""
-    property string editEventId: ""
-    property alias inputFieldText: inputField.text
-    property alias textField: inputField
-    property alias emojiPaneOpened: emojiButton.checked
-
-    // store each user we autoComplete here, this will be helpful later to generate
-    // the matrix.to links.
-    // This use an hack to define: https://doc.qt.io/qt-5/qml-var.html#property-value-initialization-semantics
-    property var userAutocompleted: ({})
-
-    signal closeAllTriggered()
-    signal inputFieldForceActiveFocusTriggered()
-    signal messageSent()
-    signal pasteImageTriggered()
-    signal editLastUserMessage()
-    signal replyPreviousUserMessage()
-
-    property alias isCompleting: completionMenu.visible
-
-    onInputFieldForceActiveFocusTriggered: {
-        inputField.forceActiveFocus();
-        // set the cursor to the end of the text
-        inputField.cursorPosition = inputField.length;
-    }
-
-    position: ToolBar.Footer
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    // Using a custom background because some styles like Material
-    // or Fusion might have ugly colors for a TextArea placed inside
-    // of a toolbar. ToolBar is otherwise the closest QQC2 component
-    // to what we want because of the padding and spacing values.
-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-    }
-
-    contentItem: RowLayout {
-        spacing: chatBar.spacing
-
-        ScrollView {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: inputField.implicitHeight
-            // lineSpacing is height+leading, so subtract leading once since leading only exists between lines.
-            Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading
-                                + inputField.topPadding + inputField.bottomPadding
-
-            FontMetrics {
-                id: fontMetrics
-                font: inputField.font
-            }
-
-            T.TextArea {
-                id: inputField
-                focus: true
-                /* Some QQC2 styles will have their own predefined backgrounds for TextAreas.
-                * Make sure there is no background since we are using the ToolBar background.
-                *
-                * This could cause a problem if the QQC2 style was designed around TextArea
-                * background colors being very different from the QPalette::Base color.
-                * Luckily, none of the Qt QQC2 styles do that and neither do KDE's QQC2 styles.
-                */
-                background: MouseArea {
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: Qt.IBeamCursor
-                    z: 1
-                }
-
-                leftPadding: mirrored ? 0 : Kirigami.Units.largeSpacing
-                rightPadding: !mirrored ? 0 : Kirigami.Units.largeSpacing
-                topPadding: 0
-                bottomPadding: 0
-
-                property real progress: 0
-                property bool autoAppeared: false
-                //property int lineHeight: contentHeight / lineCount
-
-                text: inputFieldText
-                placeholderText: currentRoom.usesEncryption ? i18n("This room is encrypted. Sending encrypted messages is not yet supported.") : editEventId.length > 0 ? i18n("Edit Message") : i18n("Write your message...")
-                verticalAlignment: TextEdit.AlignVCenter
-                horizontalAlignment: TextEdit.AlignLeft
-                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)
-
-                color: Kirigami.Theme.textColor
-                selectionColor: Kirigami.Theme.highlightColor
-                selectedTextColor: Kirigami.Theme.highlightedTextColor
-                hoverEnabled: !Kirigami.Settings.tabletMode
-
-                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
-                    cursorPosition: inputField.cursorPosition
-                    selectionStart: inputField.selectionStart
-                    selectionEnd: inputField.selectionEnd
-                    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
-                    interval: 2000
-                    onTriggered: {
-                        repeatTimer.stop()
-                        currentRoom.sendTypingNotification(false)
-                    }
-                }
-
-                Timer {
-                    id: repeatTimer
-                    repeat: true
-                    interval: 5000
-                    triggeredOnStart: true
-                    onTriggered: currentRoom.sendTypingNotification(true)
-                }
-
-                function sendMessage(event) {
-                    if (isCompleting) {
-                        chatBar.complete();
-
-                        isCompleting = false;
-                        return;
-                    }
-                    if (event.modifiers & Qt.ShiftModifier) {
-                        inputField.insert(cursorPosition, "\n")
-                    } else {
-                        chatBar.postMessage()
-                    }
-                }
-
-                Keys.onReturnPressed: { sendMessage(event) }
-                Keys.onEnterPressed: { sendMessage(event) }
-
-                Keys.onEscapePressed: {
-                    closeAllTriggered()
-                }
-
-                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) {
-                        switchRoomUp();
-                    } else if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
-                        chatBar.pasteImage();
-                    } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
-                        replyPreviousUserMessage();
-                    } else if (event.key === Qt.Key_Up && inputField.text.length === 0) {
-                        editLastUserMessage();
-                    }
-                }
-
-                Keys.onBacktabPressed: {
-                    if (event.modifiers & Qt.ControlModifier) {
-                        switchRoomUp();
-                        return;
-                    }
-                    if (!isCompleting) {
-                        nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocusReason)
-                        return
-                    }
-                    if (!autoAppeared) {
-                        let decrementedIndex = completionMenu.currentIndex - 1
-                        // Wrap around to the last item
-                        if (decrementedIndex < 0) {
-                            decrementedIndex = Math.max(completionMenu.count - 1, 0) // 0 if count == 0
-                        }
-                        completionMenu.currentIndex = decrementedIndex
-                    } else {
-                        autoAppeared = false;
-                    }
-
-                    chatBar.complete();
-                }
-
-                // yes, decrement goes up and increment goes down visually.
-                Keys.onUpPressed: (event) => {
-                    if (chatBar.isCompleting) {
-                        event.accepted = true
-                        completionMenu.listView.decrementCurrentIndex()
-                        autoAppeared = true;
-                    }
-                    event.accepted = false
-                }
-
-                Keys.onDownPressed: (event) => {
-                    if (chatBar.isCompleting) {
-                        event.accepted = true
-                        completionMenu.listView.incrementCurrentIndex()
-                        autoAppeared = true;
-                    }
-                    event.accepted = false
-                }
-
-                Keys.onTabPressed: {
-                    if (event.modifiers & Qt.ControlModifier) {
-                        switchRoomDown();
-                        return;
-                    }
-                    if (!isCompleting) {
-                        nextItemInFocusChain().forceActiveFocus(Qt.TabFocusReason);
-                        return;
-                    }
-
-                    // TODO detect moved cursor
-
-                    // ignore first time tab was clicked so that user can select
-                    // first emoji/user
-                    if (!autoAppeared) {
-                        let incrementedIndex = completionMenu.currentIndex + 1;
-                        // Wrap around to the first item
-                        if (incrementedIndex > completionMenu.count - 1) {
-                            incrementedIndex = 0
-                        }
-                        completionMenu.currentIndex = incrementedIndex;
-                    } else {
-                        autoAppeared = false;
-                    }
-
-                    chatBar.complete();
-                }
-
-                onPressed: MobileTextActionsToolBar.shouldBeVisible = true;
-
-                onTextChanged: {
-                    MobileTextActionsToolBar.shouldBeVisible = false;
-                    timeoutTimer.restart()
-                    repeatTimer.start()
-                    currentRoom.cachedInput = text
-                    autoAppeared = false;
-
-                    const completionInfo = documentHandler.getAutocompletionInfo(isCompleting);
-
-                    if (completionInfo.type === ChatDocumentHandler.Ignore) {
-                        if (completionInfo.keyword) {
-                            // custom emojis
-                            const idx = completionMenu.currentIndex;
-                            completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
-                            completionMenu.currentIndex = idx;
-                        }
-                        return;
-                    }
-
-                    if (completionInfo.type === ChatDocumentHandler.None) {
-                        isCompleting = false;
-                        return;
-                    }
-
-                    completionMenu.completionType = completionInfo.type
-                    if (completionInfo.type === ChatDocumentHandler.User) {
-                        completionMenu.model = currentRoom.getUsers(completionInfo.keyword);
-                    } else if (completionInfo.type === ChatDocumentHandler.Command) {
-                        completionMenu.model = CommandModel.filterModel(completionInfo.keyword);
-                    } else {
-                        completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
-                    }
-
-                    if (completionMenu.model.length === 0) {
-                        isCompleting = false;
-                        return;
-                    }
-
-                    if (!isCompleting) {
-                        isCompleting = true
-                        autoAppeared = true;
-                        completionMenu.endPosition = cursorPosition
-                    }
-                }
-            }
-        }
-
-        Item {
-            visible: !ChatBoxHelper.isReplying && (!ChatBoxHelper.hasAttachment || uploadingBusySpinner.running)
-            implicitWidth: uploadButton.implicitWidth
-            implicitHeight: uploadButton.implicitHeight
-            ToolButton {
-                id: uploadButton
-                anchors.fill: parent
-                // Matrix does not allow sending attachments in replies
-                visible: !ChatBoxHelper.isReplying  && !ChatBoxHelper.hasAttachment && !uploadingBusySpinner.running
-                icon.name: "mail-attachment"
-                text: i18n("Attach an image or file")
-                display: AbstractButton.IconOnly
-
-                onClicked: {
-                    if (Clipboard.hasImage) {
-                        attachDialog.open()
-                    } else {
-                        var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
-                        fileDialog.chosen.connect((path) => {
-                            if (!path) { return }
-                            ChatBoxHelper.attachmentPath = path;
-                        })
-                        fileDialog.open()
-                    }
-                }
-
-                ToolTip.text: text
-                ToolTip.visible: hovered
-            }
-            BusyIndicator {
-                id: uploadingBusySpinner
-                anchors.fill: parent
-                visible: running
-                running: currentRoom && currentRoom.hasFileUploading
-            }
-        }
-
-        ToolButton {
-            id: emojiButton
-            icon.name: "preferences-desktop-emoticons"
-            text: i18n("Add an Emoji")
-            display: AbstractButton.IconOnly
-            checkable: true
-
-            ToolTip.text: text
-            ToolTip.visible: hovered
-        }
-
-        ToolButton {
-            id: sendButton
-            icon.name: "document-send"
-            text: i18n("Send message")
-            display: AbstractButton.IconOnly
-
-            onClicked: {
-                chatBar.postMessage()
-            }
-
-            ToolTip.text: text
-            ToolTip.visible: hovered
-        }
-    }
-
-    Action {
-        id: pasteAction
-        shortcut: StandardKey.Paste
-        onTriggered: {
-            if (Clipboard.hasImage) {
-                pasteImageTriggered();
-            }
-            activeFocusItem.paste();
-        }
-    }
-
-    CompletionMenu {
-        id: completionMenu
-        width: parent.width
-        //height: 80 //Math.min(implicitHeight, delegate.implicitHeight * 6)
-        height: implicitHeight
-        y: -height - 1
-        z: 1
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-        onCompleteTriggered: {
-            complete()
-            isCompleting = false;
-        }
-    }
-
-    property CustomEmojiModel customEmojiModel: CustomEmojiModel {
-        connection: Controller.activeConnection
-    }
-
-    function pasteImage() {
-        let localPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/screenshots/" + (new Date()).getTime() + ".png";
-        if (!Clipboard.saveImage(localPath)) {
-            return;
-        }
-        ChatBoxHelper.attachmentPath = localPath;
-    }
-
-    function postMessage() {
-        checkForFancyEffectsReason();
-
-        if (ChatBoxHelper.hasAttachment) {
-            // send attachment but don't reset the text
-            actionsHandler.postMessage("", ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, {}, this.customEmojiModel);
-            currentRoom.markAllMessagesAsRead();
-            messageSent();
-            return;
-        }
-
-        const re = /^s\/([^\/]*)\/([^\/]*)/;
-        if (Config.allowQuickEdit && re.test(inputField.text)) {
-            // send edited messages
-            actionsHandler.postEdit(inputField.text);
-        } else {
-            // send normal message
-            actionsHandler.postMessage(inputField.text.trim(), ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, userAutocompleted, this.customEmojiModel);
-        }
-        currentRoom.markAllMessagesAsRead();
-        inputField.clear();
-        inputField.text = Qt.binding(function() {
-            return currentRoom ? currentRoom.cachedInput : "";
-        });
-        messageSent()
-    }
-
-    function complete() {
-        documentHandler.replaceAutoComplete(completionMenu.currentDisplayText);
-        if (completionMenu.completionType === ChatDocumentHandler.User
-            && completionMenu.currentDisplayText.length > 0
-            && completionMenu.currentItem.userId.length > 0) {
-            userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentItem.userId;
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/ChatBox.qml

@@ -1,276 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import Qt.labs.platform 1.1 as Platform
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component.ChatBox 1.0
-import NeoChat.Component.Emoji 1.0
-
-Item {
-    id: root
-    property alias inputFieldText: chatBar.inputFieldText
-
-    signal fancyEffectsReasonFound(string fancyEffect)
-    signal messageSent()
-    signal editLastUserMessage()
-    signal replyPreviousUserMessage()
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    implicitWidth: {
-        let w = 0
-        for(let i = 0; i < visibleChildren.length; ++i) {
-            w = Math.max(w, Math.ceil(visibleChildren[i].implicitWidth))
-        }
-        return w
-    }
-    implicitHeight: {
-        let h = 0
-        for(let i = 0; i < visibleChildren.length; ++i) {
-            h += Math.ceil(visibleChildren[i].implicitHeight)
-        }
-        return h
-    }
-
-    // For some reason, this is needed to make the height animation work even though
-    // it used to work and height should be directly affected by implicitHeight
-    height: implicitHeight
-
-    Behavior on height {
-        NumberAnimation {
-            property: "height"
-            duration: Kirigami.Units.shortDuration
-            easing.type: Easing.OutCubic
-        }
-    }
-
-    Kirigami.Separator {
-        id: connectionPaneSeparator
-        visible: connectionPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: connectionPane.top
-        z: 1
-    }
-
-    QQC2.Pane {
-        id: connectionPane
-        padding: fontMetrics.lineSpacing * 0.25
-        FontMetrics {
-            id: fontMetrics
-            font: networkLabel.font
-        }
-        spacing: 0
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        background: Rectangle {
-            color: Kirigami.Theme.backgroundColor
-        }
-        visible: !Controller.isOnline
-        width: parent.width
-        QQC2.Label {
-            id: networkLabel
-            text: i18n("NeoChat is offline. Please check your network connection.")
-        }
-        anchors.bottom: emojiPickerLoaderSeparator.top
-    }
-
-    Kirigami.Separator {
-        id: emojiPickerLoaderSeparator
-        visible: emojiPickerLoader.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: emojiPickerLoader.top
-        z: 1
-    }
-
-    Loader {
-        id: emojiPickerLoader
-        active: visible
-        visible: chatBar.emojiPaneOpened
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: replySeparator.top
-        sourceComponent: EmojiPicker{
-            textArea: chatBar.textField
-            onChosen: addText(emoji)
-        }
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-
-    }
-
-    Kirigami.Separator {
-        id: replySeparator
-        visible: replyPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: replyPane.top
-    }
-
-
-    ReplyPane {
-        id: replyPane
-        visible: ChatBoxHelper.isReplying || ChatBoxHelper.isEditing
-        user: ChatBoxHelper.replyUser
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: attachmentSeparator.top
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-        onReplyCancelled: {
-            root.focusInputField()
-        }
-    }
-
-    Kirigami.Separator {
-        id: attachmentSeparator
-        visible: attachmentPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: attachmentPane.top
-    }
-
-    AttachmentPane {
-        id: attachmentPane
-        visible: ChatBoxHelper.hasAttachment
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: chatBarSeparator.top
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-    }
-
-    Kirigami.Separator {
-        id: chatBarSeparator
-        visible: chatBar.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: chatBar.top
-    }
-
-    ChatBar {
-        id: chatBar
-        visible: currentRoom.canSendEvent("m.room.message")
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: parent.bottom
-
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-
-        onCloseAllTriggered: closeAll()
-        onMessageSent: {
-            closeAll()
-            checkForFancyEffectsReason()
-            root.messageSent();
-        }
-        onEditLastUserMessage: {
-            root.editLastUserMessage();
-        }
-        onReplyPreviousUserMessage: {
-            root.replyPreviousUserMessage();
-        }
-    }
-
-    function checkForFancyEffectsReason() {
-        if (!Config.showFancyEffects) {
-            return
-        }
-
-        let text = root.inputFieldText.trim()
-        if (text.includes('\u{2744}')) {
-            root.fancyEffectsReasonFound("snowflake")
-        }
-        if (text.includes('\u{1F386}')) {
-            root.fancyEffectsReasonFound("fireworks")
-        }
-        if (text.includes('\u{1F387}')) {
-            root.fancyEffectsReasonFound("fireworks")
-        }
-        if (text.includes('\u{1F389}')) {
-            root.fancyEffectsReasonFound("confetti")
-        }
-        if (text.includes('\u{1F38A}')) {
-            root.fancyEffectsReasonFound("confetti")
-        }
-    }
-
-    function addText(text) {
-        root.inputFieldText = inputFieldText + text
-    }
-
-    function insertText(str) {
-        root.inputFieldText = inputFieldText.substr(0, inputField.cursorPosition) + str + inputFieldText.substr(inputField.cursorPosition)
-    }
-
-    function focusInputField() {
-        chatBar.inputFieldForceActiveFocusTriggered()
-    }
-
-    Connections {
-        target: RoomManager
-
-        function onCurrentRoomChanged() {
-            chatBar.userAutocompleted = {};
-        }
-    }
-
-    Connections {
-        target: ChatBoxHelper
-
-        function onShouldClearText() {
-            root.inputFieldText = "";
-        }
-
-        function onEditing(editContent, editFormatedContent) {
-            // Set the input field in edit mode
-            root.inputFieldText = editContent;
-
-            // clean autocompletion list
-            chatBar.userAutocompleted = {};
-
-            // Fill autocompletion list with values extracted from message.
-            // We can't just iterate on every user in the list and try to
-            // find matching display name since some users have display name
-            // matching frequent words and this will marks too many words as
-            // mentions.
-            const regex = /<a href=\"https:\/\/matrix.to\/#\/(@[a-zA-Z09]*:[a-zA-Z09.]*)\">([^<]*)<\/a>/g;
-
-            let match;
-            while ((match = regex.exec(editFormatedContent.toString())) !== null) {
-                chatBar.userAutocompleted[match[2]] = match[1];
-            }
-            chatBox.forceActiveFocus();
-        }
-    }
-
-    function closeAll() {
-        ChatBoxHelper.clear();
-        chatBar.emojiPaneOpened = false;
-    }
-}

imports/NeoChat/Component/ChatBox/CompletionMenu.qml

@@ -1,161 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qt.labs.qmlmodels 1.0
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-
-Popup {
-    id: control
-
-    // Expose internal ListView properties.
-    property alias model: completionListView.model
-    property alias listView: completionListView
-    property alias currentIndex: completionListView.currentIndex
-    property alias currentItem: completionListView.currentItem
-    property alias count: completionListView.count
-    property alias delegate: completionListView.delegate
-
-    // Autocomplee text
-    property string currentDisplayText: currentItem && (currentItem.displayName ?? "")
-
-    property int completionType: ChatDocumentHandler.Emoji
-    property int beginPosition: 0
-    property int endPosition: 0
-
-    signal completeTriggered()
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    bottomPadding: 0
-    leftPadding: 0
-    rightPadding: 0
-    topPadding: 0
-    clip: true
-
-    onVisibleChanged: if (!visible) {
-        completionListView.currentIndex = 0;
-    }
-
-    implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 10)
-
-    contentItem: ScrollView {
-        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-        ListView {
-            id: completionListView
-            implicitWidth: contentWidth
-            delegate: {
-                if (completionType === ChatDocumentHandler.Emoji) {
-                    emojiDelegate
-                } else if (completionType === ChatDocumentHandler.Command) {
-                    commandDelegate
-                } else if (completionType === ChatDocumentHandler.User) {
-                    usernameDelegate
-                }
-            }
-
-            keyNavigationWraps: true
-
-            //interactive: Window.window ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height : false
-            clip: true
-            currentIndex: control.currentIndex || 0
-        }
-    }
-
-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-    }
-
-    Component {
-        id: usernameDelegate
-        Kirigami.BasicListItem {
-            id: usernameItem
-            width: ListView.view.width ?? implicitWidth
-            property string displayName: modelData.displayName
-            property string userId: modelData.id
-            leading: Kirigami.Avatar {
-                implicitHeight: Kirigami.Units.gridUnit
-                implicitWidth: implicitHeight
-                source: modelData.avatarMediaId ? ("image://mxc/" + modelData.avatarMediaId) : ""
-                color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
-            }
-            text: modelData.displayName
-            onClicked: completeTriggered();
-        }
-    }
-
-    Component {
-        id: emojiDelegate
-        Kirigami.BasicListItem {
-            id: emojiItem
-            width: ListView.view.width ?? implicitWidth
-            property string displayName: modelData.isCustom ? modelData.shortname : modelData.unicode
-            text: modelData.shortname
-            height: Kirigami.Units.gridUnit * 2
-
-            leading: Image {
-                source: modelData.isCustom ? modelData.unicode : ""
-
-                width: height
-                sourceSize.width: width
-                sourceSize.height: height
-
-                Rectangle {
-                    anchors.fill: parent
-                    visible: parent.status === Image.Loading
-                    radius: height/2
-                    gradient: ShimmerGradient { }
-                }
-
-                Label {
-                    id: unicodeLabel
-
-                    visible: !modelData.isCustom
-
-                    font.family: 'emoji'
-                    font.pixelSize: height - 2
-
-                    text: modelData.unicode
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                    anchors.fill: parent
-                }
-            }
-
-            onClicked: completeTriggered();
-        }
-    }
-
-    Component {
-        id: commandDelegate
-        Kirigami.BasicListItem {
-            id: commandItem
-            width: ListView.view.width ?? implicitWidth
-            text: "<i>" + modelData.parameter.replace("<", "&lt;").replace(">", "&gt;") + "</i> " +  modelData.help
-            property string displayName: modelData.command
-
-            leading: Label {
-                id: commandLabel
-                Layout.preferredHeight: Kirigami.Units.gridUnit
-                Layout.preferredWidth: textMetrics.tightBoundingRect.width
-                text: modelData.command
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-            TextMetrics {
-                id: textMetrics
-                text: modelData.command
-                font: commandLabel.font
-            }
-            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

@@ -1,117 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import org.kde.kirigami 2.14 as Kirigami
-
-import org.kde.neochat 1.0
-
-Loader {
-    id: root
-    readonly property bool isEdit: ChatBoxHelper.isEditing
-    property var user: null
-    property string avatarMediaUrl: user ? "image://mxc/" + user.avatarMediaId : ""
-
-    signal replyCancelled()
-
-    active: visible
-    sourceComponent: Pane {
-        id: replyPane
-
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-        spacing: leftPadding
-
-        contentItem: RowLayout {
-            Layout.fillWidth: true
-            spacing: replyPane.spacing
-
-            FontMetrics {
-                id: fontMetrics
-                font: textArea.font
-            }
-
-            Kirigami.Avatar {
-                id: avatar
-                Layout.alignment: textContentLayout.height > avatar.height ? Qt.AlignHCenter | Qt.AlignTop : Qt.AlignCenter
-                Layout.preferredWidth: Layout.preferredHeight
-                Layout.preferredHeight: fontMetrics.lineSpacing * 2 - fontMetrics.leading
-                source: root.avatarMediaUrl
-                name: user ? user.displayName : ""
-                color: user ? user.color : "transparent"
-                visible: Boolean(user)
-            }
-
-            ColumnLayout {
-                id: textContentLayout
-                Layout.alignment: Qt.AlignCenter
-                Layout.fillWidth: true
-                spacing: fontMetrics.leading
-                Label {
-                    Layout.fillWidth: true
-                    textFormat: Text.StyledText
-                    elide: Text.ElideRight
-                    text: {
-                        let heading = "<b>%1</b>"
-                        let userName = user ? "<font color=\""+ user.color +"\">" + currentRoom.htmlSafeMemberName(user.id) + "</font>" : ""
-                        if (isEdit) {
-                            heading = heading.arg(i18n("Editing message:")) + "<br/>"
-                        } else {
-                            heading = heading.arg(i18n("Replying to %1:", userName))
-                        }
-
-                        return heading
-                    }
-                }
-                ScrollView {
-                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                    Layout.fillWidth: true
-                    Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading
-                    TextArea {
-                        id: textArea
-                        leftPadding: 0
-                        rightPadding: 0
-                        topPadding: 0
-                        bottomPadding: 0
-                        text: {
-                            const stylesheet = "<style> a{color:"+Kirigami.Theme.linkColor+";}.user-pill{}</style>";
-                            const content = ChatBoxHelper.isReplying ? ChatBoxHelper.replyEventContent : ChatBoxHelper.editContent;
-                            return stylesheet + content;
-                        }
-                        selectByMouse: true
-                        selectByKeyboard: true
-                        readOnly: true
-                        wrapMode: Label.Wrap
-                        textFormat: TextEdit.RichText
-                        background: null
-                        HoverHandler {
-                            cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
-                        }
-                    }
-                }
-            }
-
-            Button {
-                id: cancelReplyButton
-                Layout.alignment: avatar.Layout.alignment
-                icon.name: "dialog-cancel"
-                text: i18n("Cancel")
-                display: AbstractButton.IconOnly
-                onClicked: {
-                    ChatBoxHelper.clearEditReply();
-                    root.replyCancelled();
-                }
-                ToolTip.text: text
-                ToolTip.visible: hovered
-            }
-        }
-
-        background: Rectangle {
-            color: Kirigami.Theme.backgroundColor
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-module NeoChat.Component.ChatBox
-ChatBox 1.0 ChatBox.qml
-ChatBar 1.0 ChatBar.qml
-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/ChatTextInput.qml

@@ -0,0 +1,648 @@
+/**
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import Qt.labs.platform 1.0 as Platform
+import org.kde.kirigami 2.13 as Kirigami
+
+import NeoChat.Component 1.0
+import NeoChat.Component.Emoji 1.0
+import NeoChat.Dialog 1.0
+import NeoChat.Page 1.0
+
+import org.kde.neochat 1.0
+
+ToolBar {
+    id: root
+
+    property alias isReply: replyItem.visible
+    property bool isReaction: false
+    property var replyUser
+    property string replyEventID: ""
+    property string replyContent: ""
+
+    property string editEventId
+
+    property alias isAutoCompleting: autoCompleteListView.visible
+    property var autoCompleteModel
+    property int autoCompleteBeginPosition
+    property int autoCompleteEndPosition
+
+    property bool hasAttachment: false
+    property url attachmentPath: ""
+    property var attachmentMimetype: FileType.mimeTypeForUrl(attachmentPath)
+    property bool hasImageAttachment: hasAttachment && attachmentMimetype.valid
+        && FileType.supportedImageFormats.includes(attachmentMimetype.preferredSuffix)
+
+    position: ToolBar.Footer
+
+    function addText(text) {
+        inputField.insert(inputField.length, text)
+    }
+    Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+    Action {
+        id: pasteAction
+        shortcut: StandardKey.Paste
+        onTriggered: {
+            if (Clipboard.hasImage) {
+                root.pasteImage();
+            }
+            activeFocusItem.paste();
+        }
+    }
+
+    contentItem: ColumnLayout {
+        id: layout
+        spacing: 0
+        EmojiPicker {
+            id: emojiPicker
+
+            Layout.fillWidth: true
+
+            visible: false
+
+            textArea: inputField
+            emojiModel: EmojiModel { id: emojiModel }
+            onChosen: {
+                textArea.insert(textArea.cursorPosition, emoji);
+                textArea.forceActiveFocus();
+            }
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
+            Layout.margins: 8
+
+            id: replyItem
+
+            visible: false
+
+            spacing: 8
+
+            Control {
+                Layout.alignment: Qt.AlignTop
+
+                padding: 4
+
+                contentItem: RowLayout {
+                    Kirigami.Avatar {
+                        Layout.preferredWidth: Kirigami.Units.gridUnit
+                        Layout.preferredHeight: Kirigami.Units.gridUnit
+
+                        source: replyUser ? ("image://mxc/" + replyUser.avatarMediaId) : ""
+                        name: replyUser ? replyUser.name : i18n("No name")
+                    }
+
+                    Label {
+                        Layout.alignment: Qt.AlignVCenter
+                        text: replyUser ? replyUser.displayName : i18n("No name")
+                        rightPadding: 8
+                    }
+                }
+            }
+
+            TextEdit {
+                Layout.fillWidth: true
+
+                text: "<style>a{color: " + color + ";} .user-pill{}</style>" + replyContent
+                color: Kirigami.Theme.textColor
+
+                selectByMouse: true
+                readOnly: true
+                wrapMode: Label.Wrap
+                textFormat: Text.RichText
+                selectedTextColor: "white"
+            }
+        }
+
+        ListView {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 36
+            Layout.margins: 8
+
+            id: autoCompleteListView
+
+            visible: false
+
+            model: autoCompleteModel
+
+            clip: true
+            spacing: 4
+            orientation: ListView.Horizontal
+            highlightFollowsCurrentItem: true
+            keyNavigationWraps: true
+
+            delegate: Control {
+                readonly property string userId: modelData.id ?? ""
+                readonly property string displayText: modelData.displayName ?? modelData.unicode
+                readonly property bool isEmoji: modelData.unicode != null
+                readonly property bool highlighted: autoCompleteListView.currentIndex == index
+
+                padding: Kirigami.Units.smallSpacing
+
+                contentItem: RowLayout {
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Label {
+                        width: Kirigami.Units.gridUnit
+                        height: Kirigami.Units.gridUnit
+                        visible: isEmoji
+                        text: displayText
+                        font.family: "Emoji"
+                        font.pointSize: 20
+                        verticalAlignment: Text.AlignVCenter
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    Kirigami.Avatar {
+                        Layout.preferredWidth: Kirigami.Units.gridUnit
+                        Layout.preferredHeight: Kirigami.Units.gridUnit
+                        source: modelData.avatarMediaId ? ("image://mxc/" + modelData.avatarMediaId) : ""
+                        color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
+                        visible: !isEmoji
+                    }
+                    Label {
+                        Layout.fillHeight: true
+
+                        visible: !isEmoji
+                        text: displayText
+                        color: highlighted ? Kirigami.Theme.highlightTextColor : Kirigami.Theme.textColor
+                        font.underline: highlighted
+                        verticalAlignment: Text.AlignVCenter
+                        rightPadding: Kirigami.Units.largeSpacing
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        autoCompleteListView.currentIndex = index
+                        inputField.autoComplete();
+                    }
+                }
+            }
+        }
+
+        Kirigami.Separator {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 1
+            visible: emojiPicker.visible || replyItem.visible || autoCompleteListView.visible
+        }
+
+        Image {
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 10
+            source: attachmentPath
+            visible: hasImageAttachment
+            fillMode: Image.PreserveAspectFit
+            Layout.preferredWidth: paintedWidth
+            RowLayout {
+                anchors.right: parent.right
+                Button {
+                    icon.name: "document-edit"
+
+                    // HACK: Use a component because an url doesn't work
+                    Component {
+                        id: imageEditorPage
+                        ImageEditorPage {
+                            imagePath: attachmentPath
+                        }
+                    }
+                    onClicked: {
+                        let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage, {
+                            imagePath: attachmentPath
+                        });
+                        imageEditor.newPathChanged.connect(function(newPath) {
+                            applicationWindow().pageStack.layers.pop();
+                            attachmentPath = newPath;
+                        });
+                    }
+                    ToolTip {
+                        text: i18n("Edit")
+                    }
+                }
+                Button {
+                    icon.name: "dialog-cancel"
+                    onClicked: {
+                        hasAttachment = false;
+                        attachmentPath = "";
+                    }
+                    ToolTip {
+                        text: i18n("Cancel")
+                    }
+                }
+            }
+            Rectangle {
+                color: Qt.rgba(255, 255, 255, 40)
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                implicitHeight: fileLabel.implicitHeight
+
+                Label {
+                    id: fileLabel
+                    Layout.alignment: Qt.AlignVCenter
+                    text: attachmentPath !== "" ? attachmentPath.toString().substring(attachmentPath.toString().lastIndexOf('/') + 1, attachmentPath.length) : ""
+                }
+            }
+        }
+
+        RowLayout {
+            visible: hasAttachment && !hasImageAttachment
+            ToolButton {
+                icon.name: "dialog-cancel"
+                onClicked: {
+                    hasAttachment = false;
+                    attachmentPath = "";
+                }
+            }
+
+            Kirigami.Icon {
+                id: mimetypeIcon
+                implicitHeight: Kirigami.Units.fontMetrics.roundedIconSize(horizontalFileLabel.implicitHeight)
+                implicitWidth: implicitHeight
+                source: attachmentMimetype.iconName
+            }
+
+            Label {
+                id: horizontalFileLabel
+                Layout.alignment: Qt.AlignVCenter
+                text: attachmentPath !== "" ? attachmentPath.toString().substring(attachmentPath.toString().lastIndexOf('/') + 1, attachmentPath.length) : ""
+            }
+        }
+
+        RowLayout {
+            visible: editEventId.length > 0
+            ToolButton {
+                icon.name: "dialog-cancel"
+                onClicked: clearEditReply();
+            }
+
+            Label {
+                Layout.alignment: Qt.AlignVCenter
+                text: i18n("Edit Message")
+            }
+        }
+
+        Kirigami.Separator {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 1
+            visible: hasAttachment
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
+
+            spacing: 0 //Kirigami.Units.smallSpacing
+
+            Button {
+                id: cancelReplyButton
+
+                visible: isReply
+
+                icon.name: "dialog-cancel"
+
+                onClicked: clearEditReply()
+            }
+
+
+            ScrollView {
+                Layout.fillWidth: true
+                Layout.maximumHeight: inputField.lineHeight * 8
+                TextArea {
+                    id: inputField
+                    property real progress: 0
+                    property bool autoAppeared: false
+
+                    // store each user we autoComplete here, this will be helpful later to generate
+                    // the matrix.to links.
+                    // This use an hack to define: https://doc.qt.io/qt-5/qml-var.html#property-value-initialization-semantics
+                    property var userAutocompleted: ({})
+
+                    ChatDocumentHandler {
+                        id: documentHandler
+                        document: inputField.textDocument
+                        cursorPosition: inputField.cursorPosition
+                        selectionStart: inputField.selectionStart
+                        selectionEnd: inputField.selectionEnd
+                        room: currentRoom ?? null
+                    }
+
+                    property int lineHeight: contentHeight / lineCount
+
+                    wrapMode: Text.Wrap
+                    placeholderText: i18n("Write your message...")
+                    topPadding: 0
+                    bottomPadding: 0
+                    leftPadding: Kirigami.Units.smallSpacing
+                    selectByMouse: true
+                    verticalAlignment: TextEdit.AlignVCenter
+
+                    text: currentRoom != null ? currentRoom.cachedInput : ""
+
+                    background: MouseArea {
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: Qt.IBeamCursor
+                        z: 1
+                    }
+
+                    Rectangle {
+                        width: currentRoom && currentRoom.hasFileUploading ? parent.width * currentRoom.fileUploadingProgress / 100 : 0
+                        height: parent.height
+
+                        opacity: 0.2
+                    }
+
+                    Timer {
+                        id: timeoutTimer
+
+                        repeat: false
+                        interval: 2000
+                        onTriggered: {
+                            repeatTimer.stop()
+                            currentRoom.sendTypingNotification(false)
+                        }
+                    }
+
+                    Timer {
+                        id: repeatTimer
+
+                        repeat: true
+                        interval: 5000
+                        triggeredOnStart: true
+                        onTriggered: currentRoom.sendTypingNotification(true)
+                    }
+
+                    Keys.onReturnPressed: {
+                        if (isAutoCompleting) {
+                            inputField.autoComplete();
+
+                            isAutoCompleting = false;
+                            return;
+                        }
+                        if (event.modifiers & Qt.ShiftModifier) {
+                            insert(cursorPosition, "\n")
+                        } else {
+                            postMessage()
+                            text = ""
+                            clearEditReply()
+                            closeAll()
+                        }
+                    }
+
+                    Keys.onEscapePressed: {
+                        clearEditReply();
+                        closeAll();
+                    }
+
+                    Keys.onPressed: {
+                        if (event.key === Qt.Key_PageDown) {
+                            switchRoomDown();
+                        } else if (event.key === Qt.Key_PageUp) {
+                            switchRoomUp();
+                        } else if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
+                            root.pasteImage();
+                        }
+                    }
+
+                    Keys.onBacktabPressed: {
+                        if (event.modifiers & Qt.ControlModifier) {
+                            switchRoomUp();
+                            return;
+                        }
+                        if (isAutoCompleting) {
+                            autoCompleteListView.decrementCurrentIndex();
+                        }
+                    }
+
+                    Keys.onTabPressed: {
+                        if (event.modifiers & Qt.ControlModifier) {
+                            switchRoomDown();
+                            return;
+                        }
+                        if (!isAutoCompleting) {
+                            return;
+                        }
+
+                        // TODO detect moved cursor
+
+                        // ignore first time tab was clicked so that user can select
+                        // first emoji/user
+                        if (autoAppeared === false) {
+                            autoCompleteListView.incrementCurrentIndex()
+                        } else {
+                            autoAppeared = false;
+                        }
+
+                        inputField.autoComplete();
+                    }
+
+                    onTextChanged: {
+                        timeoutTimer.restart()
+                        repeatTimer.start()
+                        currentRoom.cachedInput = text
+                        autoAppeared = false;
+
+                        const autocompletionInfo = documentHandler.getAutocompletionInfo();
+
+                        if (autocompletionInfo.type === ChatDocumentHandler.Ignore) {
+                            return;
+                        }
+                        if (autocompletionInfo.type === ChatDocumentHandler.None) {
+                            isAutoCompleting = false;
+                            autoCompleteListView.currentIndex = 0;
+                            return;
+                        }
+
+                        if (autocompletionInfo.type === ChatDocumentHandler.User) {
+                            autoCompleteModel = currentRoom.getUsers(autocompletionInfo.keyword);
+                        } else {
+                            autoCompleteModel = emojiModel.filterModel(autocompletionInfo.keyword);
+                        }
+
+                        if (autoCompleteModel.length === 0) {
+                            isAutoCompleting = false;
+                            autoCompleteListView.currentIndex = 0;
+                            return;
+                        }
+                        isAutoCompleting = true
+                        autoAppeared = true;
+                        autoCompleteEndPosition = cursorPosition
+                    }
+
+                    function postMessage() {
+                        roomManager.actionsHandler.postMessage(inputField.text.trim(), attachmentPath,
+                            replyEventID, editEventId, inputField.userAutocompleted);
+                        clearAttachment();
+                        currentRoom.markAllMessagesAsRead();
+                        clear();
+                        text = Qt.binding(function() {
+                            return currentRoom != null ? currentRoom.cachedInput : "";
+                        });
+                    }
+
+                    function autoComplete() {
+                        documentHandler.replaceAutoComplete(autoCompleteListView.currentItem.displayText)
+                        if (!autoCompleteListView.currentItem.isEmoji) {
+                            inputField.userAutocompleted[autoCompleteListView.currentItem.displayText] = autoCompleteListView.currentItem.userId;
+                        }
+
+                    }
+                }
+            }
+
+
+            ToolButton {
+                id: emojiButton
+                icon.name: "preferences-desktop-emoticons"
+                icon.color: "transparent"
+
+                checkable: true
+                checked: emojiPicker.visible
+                onToggled: emojiPicker.visible = !emojiPicker.visible
+
+                ToolTip {
+                    text: i18n("Add an Emoji")
+                }
+            }
+
+            ToolButton {
+                id: uploadButton
+
+                visible: !isReply && !hasAttachment
+
+                icon.name: "mail-attachment"
+
+                onClicked: {
+                    if (Clipboard.hasImage) {
+                        attachDialog.open()
+                    } else {
+                        var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
+
+                        fileDialog.chosen.connect(function(path) {
+                            if (!path) return
+
+                            root.attach(path)
+                        })
+
+                        fileDialog.open()
+                    }
+                }
+
+                ToolTip {
+                    text: i18n("Attach an image or file")
+                }
+
+                BusyIndicator {
+                    anchors.fill: parent
+
+                    running: currentRoom && currentRoom.hasFileUploading
+                }
+            }
+
+            ToolButton {
+                icon.name: "document-send"
+                icon.color: "transparent"
+
+                enabled: inputField.length > 0 || hasAttachment
+
+                onClicked: {
+                    inputField.postMessage()
+                    inputField.text = ""
+                    root.clearEditReply()
+                    root.closeAll()
+                }
+
+                ToolTip {
+                    text: i18n("Send message")
+                }
+            }
+        }
+    }
+
+    background: Rectangle {
+        implicitHeight: 40
+        color: Kirigami.Theme.backgroundColor
+        Kirigami.Separator {
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+            }
+        }
+    }
+
+
+    function insert(str) {
+        inputField.insert(inputField.cursorPosition, str)
+    }
+
+    function clear() {
+        inputField.clear();
+        inputField.userAutocompleted = {};
+    }
+
+    function clearEditReply() {
+        isReply = false;
+        replyUser = null;
+        clear();
+        root.replyContent = "";
+        root.replyEventID = "";
+        root.editEventId = "";
+        focus();
+    }
+
+    function focus() {
+        inputField.forceActiveFocus()
+    }
+
+    function edit(editContent, editFormatedContent, editEventId) {
+        console.log("Editing ", editContent, "html:", editFormatedContent)
+        // Set the input field in edit mode
+        inputField.text = editContent;
+        root.editEventId = editEventId
+
+        // clean autocompletion list
+        inputField.userAutocompleted = {};
+
+        // Fill autocompletion list with values extracted from message.
+        // We can't just iterate on every user in the list and try to
+        // find matching display name since some users have display name
+        // matching frequent words and this will marks too many words as
+        // mentions.
+        const regex = /<a href=\"https:\/\/matrix.to\/#\/(@[a-zA-Z09]*:[a-zA-Z09.]*)\">([^<]*)<\/a>/g;
+
+        let match;
+        while ((match = regex.exec(editFormatedContent.toString())) !== null) {
+            inputField.userAutocompleted[match[2]] = match[1];
+        }
+    }
+
+    function closeAll() {
+        replyItem.visible = false
+        autoCompleteListView.visible = false
+        emojiPicker.visible = false
+    }
+
+    function attach(localPath) {
+        hasAttachment = true
+        attachmentPath = localPath
+    }
+
+    function clearAttachment() {
+        hasAttachment = false
+        attachmentPath = ""
+    }
+
+    function pasteImage() {
+        var localPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/screenshots/" + (new Date()).getTime() + ".png";
+        if (!Clipboard.saveImage(localPath)) {
+            return;
+        }
+        root.attach(localPath);
+    }
+}

imports/NeoChat/Component/Emoji/EmojiPicker.qml

@@ -1,24 +1,21 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
-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 as NeoChat
 import NeoChat.Component 1.0
 
-ColumnLayout {
-    id: _picker
+import org.kde.neochat 1.0
 
+ColumnLayout {
     property string emojiCategory: "history"
     property var textArea
-    readonly property var emojiModel: NeoChat.EmojiModel
-
-    property NeoChat.CustomEmojiModel customModel: NeoChat.CustomEmojiModel {
-        connection: NeoChat.Controller.activeConnection
-    }
+    property var emojiModel
 
     signal chosen(string emoji)
 
@@ -35,7 +32,6 @@ ColumnLayout {
         orientation: ListView.Horizontal
 
         model: ListModel {
-            ListElement { label: "custom"; category: "custom" }
             ListElement { label: "⌛️"; category: "history" }
             ListElement { label: "😏"; category: "people" }
             ListElement { label: "🌲"; category: "nature" }
@@ -48,23 +44,16 @@ ColumnLayout {
         }
 
         delegate: ItemDelegate {
-            id: del
-
-            required property string label
-            required property string category
-
-            width: contentItem.Layout.preferredWidth
+            width: Kirigami.Units.gridUnit * 2
             height: Kirigami.Units.gridUnit * 2
 
             contentItem: Kirigami.Heading {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                level: del.label === "custom" ? 4 : 1
+                level: 1
 
-                Layout.preferredWidth: del.label === "custom" ? implicitWidth + Kirigami.Units.largeSpacing : Kirigami.Units.gridUnit * 2
-
-                font.family: del.label === "custom" ? "" : 'emoji'
-                text: del.label === "custom" ? i18n("Custom") : del.label
+                font.family: 'emoji'
+                text: label
             }
 
             Rectangle {
@@ -101,8 +90,6 @@ ColumnLayout {
 
         model: {
             switch (emojiCategory) {
-            case "custom":
-                return _picker.customModel
             case "history":
                 return emojiModel.history
             case "people":
@@ -134,32 +121,11 @@ ColumnLayout {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 font.family: 'emoji'
-                text: modelData.isCustom ? "" : modelData.unicode
-            }
-
-            Image {
-                visible: modelData.isCustom
-                source: visible ? modelData.unicode : ""
-                anchors.fill: parent
-                anchors.margins: 2
-
-                sourceSize.width: width
-                sourceSize.height: height
-
-                Rectangle {
-                    anchors.fill: parent
-                    visible: parent.status === Image.Loading
-                    radius: height/2
-                    gradient: ShimmerGradient { }
-                }
+                text: modelData.unicode
             }
 
             onClicked: {
-                if (modelData.isCustom) {
-                    chosen(modelData.shortname)
-                } else {
-                    chosen(modelData.unicode)
-                }
+                chosen(modelData.unicode)
                 emojiModel.emojiUsed(modelData)
             }
         }

imports/NeoChat/Component/FancyEffectsContainer.qml

@@ -1,296 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Alexey Andreyev <aa13q@ya.ru>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import QtQuick.Particles 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-Item {
-    id: item
-    property bool enabled: false
-    property int effectInterval: Kirigami.Units.veryLongDuration*10;
-    property color darkSnowColor: "grey"
-    property bool isThemeDark: Kirigami.Theme.backgroundColor.hslLightness <= darkSnowColor.hslLightness
-
-    function showConfettiEffect() {
-        confettiTimer.start()
-    }
-
-    function showSnowEffect() {
-        snowTimer.start()
-    }
-
-    function showFireworksEffect() {
-        fireworksTimer.start()
-    }
-
-    // Confetti
-
-    Timer {
-        id: confettiTimer
-        interval: item.effectInterval;
-        running: false;
-        repeat: false;
-        triggeredOnStart: true;
-        onTriggered: {
-            if (item.enabled) {
-                confettiSystem.running = !confettiSystem.running
-            }
-        }
-    }
-
-    ParticleSystem {
-        id: confettiSystem
-        anchors.fill: parent
-
-        running: false
-        onRunningChanged: {
-            if (running) {
-                opacity = 1
-            } else {
-                opacity = 0
-            }
-        }
-
-        Behavior on opacity {
-            SequentialAnimation {
-                NumberAnimation { duration: Kirigami.Units.longDuration }
-            }
-        }
-
-        ImageParticle {
-            source: "qrc:/imports/NeoChat/Component/confetti.png"
-            entryEffect: ImageParticle.Scale
-            rotationVariation: 360
-            rotationVelocity: 90
-            color: Qt.hsla(Math.random(), 0.5, 0.6, 1)
-            colorVariation: 1
-        }
-
-        Emitter {
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-            }
-
-            sizeVariation: Kirigami.Units.iconSizes.small/2
-            lifeSpan: Kirigami.Units.veryLongDuration*10
-            size: Kirigami.Units.iconSizes.small
-
-            velocity: AngleDirection {
-                angle: 90
-                angleVariation: 42
-                magnitude: 500
-            }
-        }
-    }
-
-    // Snow
-
-    Timer {
-        id: snowTimer
-        interval: item.effectInterval;
-        running: false;
-        repeat: false;
-        triggeredOnStart: true;
-        onTriggered: {
-            if (item.enabled) {
-                snowSystem.running = !snowSystem.running
-            }
-        }
-    }
-
-    ParticleSystem {
-        id: snowSystem
-        anchors.fill: parent
-
-        running: false
-        onRunningChanged: {
-            if (running) {
-                opacity = 1
-            } else {
-                opacity = 0
-            }
-        }
-
-        Behavior on opacity {
-            SequentialAnimation {
-                NumberAnimation { duration: Kirigami.Units.longDuration }
-            }
-        }
-
-        ItemParticle {
-            delegate: Rectangle {
-                width: 10
-                height: width
-                radius: width
-                color: item.isThemeDark ? "white" : darkSnowColor
-                scale: Math.random()
-                opacity: Math.random()
-            }
-        }
-
-        Emitter {
-            anchors {
-                left: parent.left
-                right: parent.right
-                top: parent.top
-            }
-
-            sizeVariation: Kirigami.Units.iconSizes.medium
-            lifeSpan: Kirigami.Units.veryLongDuration*10
-            size: Kirigami.Units.iconSizes.large
-            emitRate: 42
-
-            velocity: AngleDirection {
-                angle: 90
-                angleVariation: 10
-                magnitude: 300
-            }
-        }
-    }
-
-    // Fireworks
-
-    Timer {
-        id: fireworksTimer
-        interval: item.effectInterval;
-        running: false;
-        repeat: false;
-        triggeredOnStart: true;
-        onTriggered: {
-            if (item.enabled) {
-                fireworksInternalTimer.running = !fireworksInternalTimer.running
-            }
-        }
-    }
-
-    Timer {
-        id: fireworksInternalTimer
-        interval: 300
-        triggeredOnStart: true
-        running: false
-        repeat: true
-        onTriggered: {
-            var x = Math.random() * parent.width
-            var y = Math.random() * parent.height
-            customEmit(x, y)
-            customEmit(x, y)
-            customEmit(x, y)
-        }
-    }
-
-    ParticleSystem {
-        id: fireworksSystem
-        anchors.fill: parent
-        running: fireworksInternalTimer.running
-        onRunningChanged: {
-            if (running) {
-                opacity = 1
-            } else {
-                opacity = 0
-            }
-        }
-
-        Behavior on opacity {
-            SequentialAnimation {
-                NumberAnimation { duration: Kirigami.Units.longDuration }
-            }
-        }
-    }
-
-    ImageParticle {
-        id: fireworksParticleA
-        system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
-        alphaVariation: item.isThemeDark ? 0.1 : 0.1
-        alpha: item.isThemeDark ? 0.5 : 1
-        groups: ["a"]
-        opacity: fireworksSystem.opacity
-        entryEffect: ImageParticle.Scale
-        rotationVariation: 360
-    }
-
-    ImageParticle {
-        system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
-        color: item.isThemeDark ? "white" : "gold"
-        alphaVariation: item.isThemeDark ? 0.1 : 0.1
-        alpha: item.isThemeDark ? 0.5 : 1
-        groups: ["light"]
-        opacity: fireworksSystem.opacity
-        entryEffect: ImageParticle.Scale
-        rotationVariation: 360
-    }
-
-    ImageParticle {
-        id: fireworksParticleB
-        system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
-        alphaVariation: item.isThemeDark ? 0.1 : 0.1
-        alpha: item.isThemeDark ? 0.5 : 1
-        groups: ["b"]
-        opacity: fireworksSystem.opacity
-        entryEffect: ImageParticle.Scale
-        rotationVariation: 360
-    }
-
-    Component {
-        id: emitterComp
-        Emitter {
-            id: container
-            property int life: 23
-            property real targetX: 0
-            property real targetY: 0
-            width: 1
-            height: 1
-            system: fireworksSystem
-            size: 16
-            endSize: 8
-            sizeVariation: 5
-            Timer {
-                interval: life
-                running: true
-                onTriggered: {
-                    container.destroy();
-                    var randomHue = Math.random()
-                    var lightness = item.isThemeDark ? 0.8 : 0.7
-                    fireworksParticleA.color = Qt.hsla(randomHue, 0.8, lightness, 1)
-                    fireworksParticleB.color = Qt.hsla(1-randomHue, 0.8, lightness, 1)
-                }
-            }
-            velocity: AngleDirection {angleVariation:360; magnitude: 200}
-        }
-    }
-
-    function customEmit(x,y) {
-        var currentSize = Math.round(Math.random() * 200) + 40
-        var currentLifeSpan = Math.round(Math.random() * 1000) + 100
-        for (var i=0; i<8; i++) {
-            var obj = emitterComp.createObject(parent);
-            obj.x = x
-            obj.y = y
-            obj.targetX = Math.random() * currentSize - currentSize/2 + obj.x
-            obj.targetY = Math.random() * currentSize - currentSize/2 + obj.y
-            obj.life = Math.round(Math.random() * 23) + 150
-            obj.emitRate = Math.round(Math.random() * 32) + 5
-            obj.lifeSpan = currentLifeSpan
-            const group = Math.round(Math.random() * 3);
-            switch (group) {
-                case 0:
-                    obj.group = "light";
-                    break;
-                case 1:
-                    obj.group = "a";
-                    break;
-                case 2:
-                    obj.group = "b";
-                    break;
-            }
-        }
-    }
-}

imports/NeoChat/Component/FullScreenImage.qml

@@ -1,19 +1,19 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick 2.12
+import QtQuick.Controls 2.12
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 ApplicationWindow {
     id: root
 
     property string filename
     property url localPath
-    property string blurhash: ""
-    property int imageWidth: -1
-    property int imageHeight: -1
 
     flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
     visibility: Qt.WindowFullScreen
@@ -31,30 +31,16 @@ ApplicationWindow {
         onClicked: root.destroy()
     }
 
-    BusyIndicator {
-        visible: image.status !== Image.Ready && root.blurhash === ""
-        anchors.centerIn: parent
-        running: visible
-    }
-
     AnimatedImage {
-	    id: image
         anchors.centerIn: parent
 
-        width: Math.min(root.imageWidth !== -1 ? root.imageWidth : sourceSize.width, root.width)
-        height: Math.min(root.imageHeight !== -1 ? root.imageWidth : sourceSize.height, root.height)
+        width: Math.min(sourceSize.width, root.width)
+        height: Math.min(sourceSize.height, root.height)
 
+        cache: false
         fillMode: Image.PreserveAspectFit
 
         source: localPath
-
-        Image {
-            anchors.centerIn: parent
-            width: image.width
-            height: image.height
-            source: root.blurhash !== "" ? ("image://blurhash/" + root.blurhash) : ""
-            visible: root.blurhash !== "" && parent.status !== Image.Ready
-        }
     }
 
     Button {

imports/NeoChat/Component/Login/Homeserver.qml

@@ -1,11 +1,14 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as QQC2
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
 
@@ -15,7 +18,7 @@ LoginStep {
     readonly property var homeserver: customHomeserver.visible ? customHomeserver.text : serverCombo.currentText
     property bool loading: false
 
-    title: i18nc("@title", "Select a Homeserver")
+    title: i18n("@title", "Select a Homeserver")
 
     action: Kirigami.Action {
         enabled: LoginHelper.homeserverReachable && !customHomeserver.visible || customHomeserver.acceptableInput

imports/NeoChat/Component/Login/Loading.qml

@@ -1,27 +1,23 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-3.0-only
-
+/**
+ * SPDX-FileCopyrightText: 2020 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 org.kde.kirigami 2.15 as Kirigami
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component 1.0
 
-Kirigami.PlaceholderMessage {
+import org.kde.kirigami 2.12 as Kirigami
+
+QQC2.BusyIndicator {
+
     property var showContinueButton: false
     property var showBackButton: false
     property string title: i18n("Loading")
 
     anchors.centerIn: parent
-
-    QQC2.Label {
-        text: i18n("Please wait. This might take a little while.")
-    }
-
-    QQC2.BusyIndicator {
-        Layout.alignment: Qt.AlignHCenter
-    }
 }

imports/NeoChat/Component/Login/Login.qml

@@ -1,12 +1,15 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component 1.0

imports/NeoChat/Component/Login/LoginMethod.qml

@@ -1,10 +1,13 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component.Login 1.0

imports/NeoChat/Component/Login/LoginRegister.qml

@@ -1,13 +1,17 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component.Login 1.0
 
 LoginStep {

imports/NeoChat/Component/Login/LoginStep.qml

@@ -1,4 +1,5 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+//
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick 2.14

imports/NeoChat/Component/Login/Password.qml

@@ -1,15 +1,19 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 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 QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component 1.0
 
+
 LoginStep {
     id: password
 

imports/NeoChat/Component/Login/Sso.qml

@@ -1,15 +1,19 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
 
+/**
+ * SPDX-FileCopyrightText: 2020 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 org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component 1.0
 
+import org.kde.kirigami 2.12 as Kirigami
+
 LoginStep {
     id: root
 
@@ -19,12 +23,10 @@ LoginStep {
     Kirigami.FormLayout {
         Connections {
             target: LoginHelper
-            function onSsoUrlChanged() {
+            onSsoUrlChanged: {
                 Qt.openUrlExternally(LoginHelper.ssoUrl)
             }
-            function onConnected() {
-                processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
-            }
+            onConnected: processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
         }
 
         QQC2.Button {

imports/NeoChat/Component/QuickSwitcher.qml

@@ -1,81 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.10
-import QtQuick.Controls 2.12 as QQC2
-import org.kde.kirigami 2.14 as Kirigami
-import org.kde.kitemmodels 1.0
-import org.kde.neochat 1.0
-
-QQC2.Popup {
-    id: _popup
-
-    onVisibleChanged: {
-        if (!visible) {
-            return
-        }
-        quickSearch.forceActiveFocus()
-        quickSearch.text = ""
-    }
-    anchors.centerIn: QQC2.Overlay.overlay
-    background: Kirigami.Card {}
-    height: 2 * Math.round(implicitHeight / 2)
-    padding: Kirigami.Units.largeSpacing * 2
-    contentItem: ColumnLayout {
-        spacing: Kirigami.Units.largeSpacing * 2
-
-        Kirigami.SearchField {
-            id: quickSearch
-
-            // TODO: get this broken property removed/disabled by default in Kirigami,
-            // we used to be able to expect that the text field wouldn't attempt to
-            // perform a mini-DDOS attack using signals.
-            autoAccept: false
-
-            Layout.preferredWidth: Kirigami.Units.gridUnit * 21 // 3 * 7 = 21, roughly 7 avatars on screen
-            Keys.onLeftPressed: cView.decrementCurrentIndex()
-            Keys.onRightPressed: cView.incrementCurrentIndex()
-            onAccepted: {
-                const item = cView.itemAtIndex(cView.currentIndex)
-
-                RoomManager.enterRoom(item.currentRoom)
-
-                _popup.close()
-            }
-        }
-        ListView {
-            id: cView
-
-            orientation: Qt.Horizontal
-            spacing: Kirigami.Units.largeSpacing
-
-            model: SortFilterRoomListModel {
-                id: sortFilterRoomListModel
-                sourceModel: RoomListModel {
-                    id: roomListModel
-                    connection: Controller.activeConnection
-                }
-                filterText: quickSearch.text
-                roomSortOrder: SortFilterRoomListModel.LastActivity
-            }
-
-            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
-            Layout.fillWidth: true
-
-            delegate: Kirigami.Avatar {
-                id: del
-
-                implicitHeight: Kirigami.Units.gridUnit * 3
-                implicitWidth: Kirigami.Units.gridUnit * 3
-
-                required property string avatar
-                required property var currentRoom
-
-                source: avatar != "" ? "image://mxc/" + avatar : ""
-            }
-        }
-    }
-    modal: true
-    focus: true
-}

imports/NeoChat/Component/ShimmerGradient.qml

@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-
-// Not to be confused with the Shimmer project.
-// I like their gradiented GTK themes though.
-
-import QtQuick 2.15
-import org.kde.kirigami 2.15 as Kirigami
-
-Gradient {
-    id: gradient
-
-    orientation: Gradient.Horizontal
-
-    property color color: Kirigami.Theme.textColor
-    property color translucent: Qt.rgba(color.r, color.g, color.b, 0.2)
-    property color bright: Qt.rgba(color.r, color.g, color.b, 0.3)
-    property real pos: 0.5
-    property real offset: 0.6
-
-    property SequentialAnimation ani: SequentialAnimation {
-        running: true
-        loops: Animation.Infinite
-        NumberAnimation {
-            from: -2.0
-            to: 2.0
-            duration: 700
-            target: gradient
-            properties: "pos"
-        }
-        PauseAnimation {
-            duration: 300
-        }
-    }
-
-    GradientStop { position: gradient.pos-gradient.offset; color: gradient.translucent }
-    GradientStop { position: gradient.pos; color: gradient.bright }
-    GradientStop { position: gradient.pos+gradient.offset; color: gradient.translucent }
-}

imports/NeoChat/Component/Timeline/AudioDelegate.qml

@@ -1,16 +1,19 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import Qt.labs.platform 1.1 as Platform
-import QtMultimedia 5.15
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.0
+import Qt.labs.platform 1.0 as Platform
+import QtMultimedia 5.12
+import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
+import NeoChat.Setting 1.0
+
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
@@ -26,6 +29,27 @@ Control {
         autoLoad: false
     }
 
+    Kirigami.Action {
+        id: saveFileAction
+        onTriggered: {
+            let contextMenu = fileDelegateContextMenu.createObject(root, {'room': currentRoom, 'author': author});
+            contextMenu.viewSource.connect(function() {
+                messagerSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+            })
+            contextMenu.downloadAndOpen.connect(downloadAndOpen)
+            contextMenu.saveFileAs.connect(saveFileAs)
+            contextMenu.reply.connect(function() {
+                roomPanelInput.replyModel = Object.assign({}, model)
+                roomPanelInput.isReply = true
+                roomPanelInput.focus()
+            })
+            contextMenu.redact.connect(function() {
+                currentRoom.redactEvent(eventId)
+            })
+            contextMenu.popup()
+        }
+    }
+
     contentItem: ColumnLayout {
         RowLayout {
             ToolButton {
@@ -45,8 +69,6 @@ Control {
         }
         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
@@ -55,8 +77,72 @@ Control {
             }
 
             Label {
-                text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
+                text: humanSize(audio.position) + "/" + humanSize(audio.duration)
             }
         }
     }
+
+    background: AutoMouseArea {
+        anchors.fill: parent
+
+        id: messageMouseArea
+
+        onSecondaryClicked: saveFileAction.trigger()
+
+        Component {
+            id: messagerSourceSheet
+
+            MessageSourceSheet {}
+        }
+
+        Component {
+            id: openFolderDialog
+
+            OpenFolderDialog {}
+        }
+
+        Component {
+            id: fileDelegateContextMenu
+
+            FileDelegateContextMenu {}
+        }
+    }
+
+    function saveFileAs() {
+        var folderDialog = openFolderDialog.createObject(ApplicationWindow.overlay)
+
+        folderDialog.chosen.connect(function(path) {
+            if (!path) return
+
+            currentRoom.downloadFile(eventId, path + "/" + currentRoom.fileNameToDownload(eventId))
+        })
+
+        folderDialog.open()
+    }
+
+    function downloadAndOpen() {
+        if (downloaded) {
+            openSavedFile()
+        } else {
+            openOnFinished = true
+            currentRoom.downloadFile(eventId, Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
+        }
+    }
+
+    function openSavedFile() {
+        if (Qt.openUrlExternally(progressInfo.localPath)) return;
+        if (Qt.openUrlExternally(progressInfo.localDir)) return;
+    }
+
+    function humanSize(duration) {
+        if (!duration) {
+            return i18n("Unknown duration")
+        }
+
+        if (duration > 1000 * 60 * 60) {
+            return new Date(duration).toLocaleTimeString(Qt.locale(), "hh:mm:ss")
+        }
+
+        return new Date(duration).toLocaleTimeString(Qt.locale(), "mm:ss")
+    }
 }

imports/NeoChat/Component/Timeline/EncryptedDelegate.qml

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.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
-}

imports/NeoChat/Component/Timeline/FileDelegate.qml

@@ -1,126 +1,143 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import Qt.labs.platform 1.1
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls.Material 2.12
+import QtGraphicalEffects 1.0
+import Qt.labs.platform 1.0
+import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
+import NeoChat.Setting 1.0
+
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
 
 RowLayout {
-    id: root
     property bool openOnFinished: false
     readonly property bool downloaded: progressInfo && progressInfo.completed
 
-    Layout.margins: Kirigami.Units.largeSpacing
+    id: root
 
-    spacing: Kirigami.Units.largeSpacing
+    spacing: 4
 
-    states: [
-        State {
-            name: "downloaded"
-            when: progressInfo.completed
+    onDownloadedChanged: if (downloaded && openOnFinished) openSavedFile()
 
-            PropertyChanges {
-                target: downloadButton
+    z: -5
 
-                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()
+    Control {
+        contentItem: RowLayout {
+            ToolButton {
+                icon.name: progressInfo.completed ? "document-open" : "document-save"
+                onClicked: progressInfo.completed ? openSavedFile() : saveFileAs()
             }
-        },
-        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"
+            ColumnLayout {
+                Kirigami.Heading {
+                    Layout.fillWidth: true
+                    level: 4
+                    text: display
+                    wrapMode: Label.Wrap
+                }
 
-                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()
+                Label {
+                    Layout.fillWidth: true
+                    text: !progressInfo.completed && progressInfo.active ? (humanSize(progressInfo.progress) + "/" + humanSize(progressInfo.total)) : humanSize(content.info ? content.info.size : 0)
+                    color: Kirigami.Theme.disabledTextColor
+                    wrapMode: Label.Wrap
+                }
             }
         }
-    ]
 
-    Kirigami.Icon {
-        id: ikon
-        source: model.fileMimetypeIcon
-        fallback: "unknown"
-    }
-    ColumnLayout {
-        Layout.alignment: Qt.AlignVCenter
-        Layout.fillWidth: true
+        background: Item {
+            MouseArea {
+                id: messageMouseArea
+                anchors.fill: parent
+                acceptedButtons: Qt.RightButton
+                onClicked: {
+                    var contextMenu = fileDelegateContextMenu.createObject(root, {'room': currentRoom, 'author': author});
+                    contextMenu.viewSource.connect(function() {
+                        messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+                    })
+                    contextMenu.downloadAndOpen.connect(downloadAndOpen)
+                    contextMenu.saveFileAs.connect(saveFileAs)
+                    contextMenu.reply.connect(function() {
+                        roomPanelInput.replyModel = Object.assign({}, model)
+                        roomPanelInput.isReply = true
+                        roomPanelInput.focus()
+                    })
+                    contextMenu.redact.connect(function() {
+                        currentRoom.redactEvent(eventId)
+                    })
+                    contextMenu.popup()
+                }
 
-        spacing: 0
+                Component {
+                    id: messageSourceSheet
 
-        QQC2.Label {
-            text: model.display
-            wrapMode: Text.Wrap
+                    MessageSourceSheet {}
+                }
 
-            Layout.fillWidth: true
-        }
-        QQC2.Label {
-            id: sizeLabel
+                Component {
+                    id: fileDialog
 
-            text: Controller.formatByteSize(content.info ? content.info.size : 0)
-            opacity: 0.7
+                    FileDialog {
+                        fileMode: FileDialog.SaveFile
+                        folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+                        onAccepted: {
+                            currentRoom.downloadFile(eventId, file)
+                        }
+                    }
+                }
 
-            Layout.fillWidth: true
-        }
-    }
+                Component {
+                    id: fileDelegateContextMenu
 
-    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)
+                    FileDelegateContextMenu {}
+                }
             }
         }
     }
 
     function saveFileAs() {
-        var dialog = fileDialog.createObject(QQC2.ApplicationWindow.overlay)
+        var dialog = fileDialog.createObject(ApplicationWindow.overlay)
         dialog.open()
         dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId)
     }
 
-    function openSavedFile() {
+    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 humanSize(bytes)
+    {
+        if (!bytes)
+            return i18nc("Unknown attachment size", "Unknown")
+        if (bytes < 4000)
+            return i18np("%1 byte", "%1 bytes", bytes)
+        bytes = Math.round(bytes / 100) / 10
+        if (bytes < 2000)
+            return i18nc("KB as in kilobytes", "%1 KB", bytes)
+        bytes = Math.round(bytes / 100) / 10
+        if (bytes < 2000)
+            return i18nc("MB as in megabytes", "%1 MB", bytes)
+        return i18nc("GB as in gigabytes", "%1 GB", Math.round(bytes / 100) / 10)
+    }
 }

imports/NeoChat/Component/Timeline/ImageDelegate.qml

@@ -1,13 +1,17 @@
-// SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import Qt.labs.platform 1.1
+/**
+ * SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.0
+import Qt.labs.platform 1.0
 
 import org.kde.neochat 1.0
+import NeoChat.Setting 1.0
+
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
@@ -15,7 +19,6 @@ import NeoChat.Menu.Timeline 1.0
 Image {
     id: img
 
-    property var content: model.content
     readonly property bool isAnimated: contentType === "image/gif"
 
     property bool openOnFinished: false
@@ -29,11 +32,8 @@ Image {
 
     source: "image://mxc/" + mediaId
 
-    Image {
-        anchors.fill: parent
-        source: content.info["xyz.amorgan.blurhash"] ? ("image://blurhash/" + content.info["xyz.amorgan.blurhash"]) : ""
-        visible: parent.status !== Image.Ready
-    }
+    sourceSize.width: info.w
+    sourceSize.height: info.h
 
     fillMode: Image.PreserveAspectFit
 
@@ -63,6 +63,66 @@ Image {
         }
     }
 
+    MouseArea {
+        id: messageMouseArea
+
+        enabled: !img.readonly
+
+        anchors.fill: parent
+
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+        onClicked: {
+            if(mouse.button === Qt.LeftButton) {
+                fullScreenImage.createObject(parent, {"filename": eventId, "localPath": currentRoom.urlToDownload(eventId)}).showFullScreen()
+            } else {
+                openContextMenu()
+            }
+        }
+
+        function openContextMenu() {
+            var contextMenu = imageDelegateContextMenu.createObject(root, {'room': currentRoom, 'author': author});
+            contextMenu.viewSource.connect(function() {
+                messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+            })
+            contextMenu.downloadAndOpen.connect(downloadAndOpen)
+            contextMenu.saveFileAs.connect(saveFileAs)
+            contextMenu.reply.connect(function() {
+                roomPanelInput.replyModel = Object.assign({}, model)
+                roomPanelInput.isReply = true
+                roomPanelInput.focus()
+            })
+            contextMenu.redact.connect(function() {
+                currentRoom.redactEvent(eventId)
+            })
+            contextMenu.popup()
+        }
+
+        Component {
+            id: messageSourceSheet
+
+            MessageSourceSheet {}
+        }
+
+        Component {
+            id: openFolderDialog
+
+            OpenFolderDialog {}
+        }
+
+        Component {
+            id: imageDelegateContextMenu
+
+            FileDelegateContextMenu {}
+        }
+
+        Component {
+            id: fullScreenImage
+
+            FullScreenImage {}
+        }
+    }
+
     function saveFileAs() {
         var dialog = fileDialog.createObject(ApplicationWindow.overlay)
         dialog.open()

imports/NeoChat/Component/Timeline/MessageDelegate.qml

@@ -0,0 +1,158 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.12
+
+import org.kde.kirigami 2.13 as Kirigami
+
+import org.kde.neochat 1.0
+import NeoChat.Setting 1.0
+import NeoChat.Component 1.0
+import NeoChat.Dialog 1.0
+
+RowLayout {
+    default property alias innerObject : column.children
+
+    readonly property bool sentByMe: author.isLocalUser
+    readonly property bool darkBackground: !sentByMe
+    readonly property bool replyVisible: reply ?? false
+    readonly property bool failed: marks == EventStatus.SendingFailed
+    readonly property color authorColor: eventType == "notice" ? Kirigami.Theme.activeTextColor : author.color
+    readonly property color replyAuthorColor: replyVisible ? reply.author.color : Kirigami.Theme.focusColor
+
+    property alias mouseArea: controlContainer.children
+    property bool isEmote: false
+
+    signal saveFileAs()
+    signal openExternally()
+    signal replyClicked(string eventID)
+    signal replyToMessageClicked(var replyUser, string replyContent, string eventID)
+
+    id: root
+
+    spacing: Kirigami.Units.smallSpacing
+    Layout.leftMargin: Kirigami.Units.largeSpacing
+    Layout.rightMargin: Kirigami.Units.smallSpacing
+    Layout.bottomMargin: 0
+    Layout.topMargin: showAuthor ? Kirigami.Units.smallSpacing : 0
+
+    Kirigami.Avatar {
+        Layout.minimumWidth: Kirigami.Units.gridUnit * 2
+        Layout.minimumHeight: Kirigami.Units.gridUnit * 2
+        Layout.maximumWidth: Kirigami.Units.gridUnit * 2
+        Layout.maximumHeight: Kirigami.Units.gridUnit * 2
+
+        Layout.alignment: Qt.AlignTop
+
+        visible: showAuthor && Config.showAvatarInTimeline
+        name: author.name ?? author.displayName
+        source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
+        color: author.color
+
+        Component {
+            id: userDetailDialog
+
+            UserDetailDialog {}
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {"room": currentRoom, "user": author.object, "displayName": author.displayName, "avatarMediaId": author.avatarMediaId, "avatarUrl": author.avatarUrl}).open()
+            cursorShape: Qt.PointingHandCursor
+        }
+    }
+
+    Item {
+        Layout.minimumWidth: Kirigami.Units.gridUnit * 2
+        Layout.preferredHeight: 1
+        visible: !showAuthor && Config.showAvatarInTimeline
+    }
+
+
+    QQC2.Control {
+        id: controlContainer
+        Layout.fillWidth: true
+        topPadding: 0
+        bottomPadding: 0
+        hoverEnabled: true
+        contentItem: ColumnLayout {
+            id: column
+            spacing: showAuthor ? Kirigami.Units.smallSpacing : 0
+
+            RowLayout {
+                id: rowLayout
+                Layout.fillWidth: true
+                QQC2.Label {
+                    Layout.fillWidth: true
+                    topInset: 0
+
+                    visible: showAuthor && !isEmote
+
+                    text: author.displayName
+                    font.weight: Font.Bold
+                    color: author.color
+                    wrapMode: Text.Wrap
+                }
+                QQC2.Label {
+                    visible: showAuthor && !isEmote
+                    text: time.toLocaleTimeString(Locale.ShortFormat)
+                    color: Kirigami.Theme.disabledTextColor
+                }
+            }
+            Loader {
+                id: replyLoader
+                source: 'qrc:imports/NeoChat/Component/Timeline/ReplyComponent.qml'
+                active: replyVisible
+            }
+            Connections {
+                target: replyLoader.item
+                function onClicked() {
+                    replyClicked(reply.eventId)
+                }
+            }
+        }
+        RowLayout {
+            z: 2
+            anchors.bottom: controlContainer.top
+            anchors.bottomMargin: -Kirigami.Units.gridUnit
+            anchors.right: controlContainer.right
+            spacing: 0
+            QQC2.Button {
+                QQC2.ToolTip.text: i18n("React")
+                QQC2.ToolTip.visible: hovered
+                visible: controlContainer.hovered
+                icon.name: "preferences-desktop-emoticons"
+                onClicked: emojiDialog.open();
+                EmojiDialog {
+                    id: emojiDialog
+                    onReact: currentRoom.toggleReaction(eventId, emoji)
+                }
+            }
+            QQC2.Button {
+                QQC2.ToolTip.text: i18n("Edit")
+                QQC2.ToolTip.visible: hovered
+                visible: controlContainer.hovered && author.id === Controller.activeConnection.localUserId && (model.eventType === "emote" || model.eventType === "message")
+                icon.name: "document-edit"
+                onClicked: chatTextInput.edit(message, model.formattedBody, eventId)
+            }
+            QQC2.Button {
+                QQC2.ToolTip.text: i18n("Reply")
+                QQC2.ToolTip.visible: hovered
+                visible: controlContainer.hovered
+                icon.name: "mail-replied-symbolic"
+                onClicked: replyToMessage(author, message, eventId)
+            }
+        }
+        background: Rectangle {
+            Kirigami.Theme.colorSet: Kirigami.Theme.Window
+            color: !model.isHighlighted ? Kirigami.Theme.backgroundColor : Kirigami.Theme.positiveBackgroundColor
+            opacity: controlContainer.hovered || model.isHighlighted ? 1 : 0
+        }
+    }
+}

imports/NeoChat/Component/Timeline/ReactionDelegate.qml

@@ -1,17 +1,21 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
 Flow {
+    visible: (reaction && reaction.length > 0) ?? false
+
     spacing: Kirigami.Units.largeSpacing
+
     Repeater {
-        model: reaction ?? null
+        model: reaction
 
         delegate: AbstractButton {
             width: Math.max(implicitWidth, height)
@@ -23,43 +27,35 @@ Flow {
 
             padding: Kirigami.Units.smallSpacing
 
-            background: Kirigami.ShadowedRectangle {
-                color: checked ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+            background: Rectangle {
                 radius: height / 2
-                shadow.size: Kirigami.Units.smallSpacing
-                shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                border.width: 1
+                Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                color: checked ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+		border.color: checked ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.textColor
+		border.width: 1
             }
 
-
             checkable: true
 
             checked: modelData.hasLocalUser
 
             onToggled: currentRoom.toggleReaction(eventId, modelData.reaction)
 
-            hoverEnabled: true
-
             ToolTip.visible: hovered
             ToolTip.text: {
                 var text = "";
 
-                for (var i = 0; i < modelData.authors.length && i < 3; i++) {
-                    if (i !== 0) {
-                        if (i < modelData.authors.length - 1) {
-                            text += ", "
-                        } else {
-                            text += i18nc("Separate the usernames of users", " and ")
-                        }
+                for (var i = 0; i < modelData.authors.length; i++) {
+                    if (i === modelData.authors.length - 1 && i !== 0) {
+                        text += i18nc("Separate the usernames of users", " and ")
+                    } else if (i !== 0) {
+                        text += ", "
                     }
+
                     text += modelData.authors[i].displayName
                 }
-                if (modelData.authors.length > 3) {
-                    text += i18ncp("%1 is the number of other users", " and %1 other", " and %1 others", modelData.authors.length - 3)
-                }
 
-                text = i18ncp("%2 is the users who reacted and %3 the emoji that was given", "%2 reacted with %3", "%2 reacted with %3", modelData.authors.length, text, modelData.reaction)
+                text = i18ncp("%1 is the users who reacted and %2 the emoji that was given", "%2 reacted with %3", "%2 reacted with %3", modelData.authors.length, text, modelData.reaction)
 
                 return text
             }

imports/NeoChat/Component/Timeline/ReplyComponent.qml

@@ -1,102 +1,56 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// 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 org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 import NeoChat.Component.Timeline 1.0
+import org.kde.neochat 1.0
 
-MouseArea {
-    id: replyButton
-    Layout.fillWidth: true
-    implicitHeight: replyName.implicitHeight + (loader.item ? loader.item.height : 0) + Kirigami.Units.largeSpacing
-    implicitWidth: Math.min(bubbleMaxWidth, Math.max((loader.item ? loader.item.width + Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing : 0), replyName.implicitWidth)) + Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 3
-    Component.onCompleted: {
-        parent.Layout.fillWidth = true;
-        parent.Layout.preferredWidth = Qt.binding(function() { return implicitWidth; })
-        parent.Layout.maximumWidth = Qt.binding(function() { return bubbleMaxWidth + Kirigami.Units.largeSpacing * 2; })
-    }
-    Rectangle {
-        id: replyLeftBorder
-        width: Kirigami.Units.smallSpacing
-        height: parent.height
-        x: Config.compactLayout ? Kirigami.Units.largeSpacing : 0
-        color: Kirigami.Theme.highlightColor
-    }
+QQC2.AbstractButton {
+    visible: replyVisible
+    Component.onCompleted: parent.Layout.fillWidth = true
 
-    Kirigami.Avatar {
-        id: replyAvatar
-        anchors.left: replyLeftBorder.right
-        anchors.leftMargin: Kirigami.Units.smallSpacing
-        width: visible ? Kirigami.Units.gridUnit : 0
-        height: Kirigami.Units.gridUnit
-        sourceSize.width: width
-        sourceSize.height: height
-        Layout.alignment: Qt.AlignTop
-        visible: Config.showAvatarInTimeline
-        source: reply.author.avatarMediaId ? ("image://mxc/" + reply.author.avatarMediaId) : ""
-        name: reply.author.name || ""
-        color: reply.author.color
-    }
+    contentItem: RowLayout {
+        Layout.fillWidth: true
 
-    QQC2.Label {
-        id: replyName
-        anchors {
-            left: replyAvatar.right
-            leftMargin: Kirigami.Units.smallSpacing
-            right: parent.right
-            rightMargin: Kirigami.Units.smallSpacing
+        Rectangle {
+            Layout.preferredWidth: Kirigami.Units.smallSpacing
+            Layout.fillHeight: true
+
+            color: Kirigami.Theme.highlightColor
         }
-        text: currentRoom.htmlSafeMemberName(reply.author.id)
-        color: reply.author.color
-        elide: Text.ElideRight
-    }
 
-    Loader {
-        id: loader
-        anchors.top: replyName.bottom
-        sourceComponent: {
-            switch (reply.type) {
-                case "image":
-                case "sticker":
-                    return imageComponent;
-                case "message":
-                    return textComponent;
-                // TODO support more types
-                default:
-                    return textComponent;
+        Kirigami.Avatar {
+            Layout.preferredWidth: Kirigami.Units.gridUnit
+            Layout.preferredHeight: Kirigami.Units.gridUnit
+            Layout.alignment: Qt.AlignTop
+            visible: Config.showAvatarInTimeline
+            source: replyVisible && reply.author.avatarMediaId ? ("image://mxc/" + reply.author.avatarMediaId) : ""
+            name: replyVisible ? reply.author.name : "H"
+            color: replyVisible ? reply.author.color : Kirigami.Theme.highlightColor
+        }
+
+        ColumnLayout {
+            id: replyLayout
+            Layout.fillWidth: true
+
+            QQC2.Label {
+                Layout.fillWidth: true
+                text: replyVisible ? reply.author.displayName : ""
+                color: replyVisible ? reply.author.color: null
+                elide: Text.ElideRight
             }
-        }
 
-        Component {
-            id: textComponent
             TextDelegate {
-                id: replyText
-                textMessage: reply.display
+                Layout.fillWidth: true
+                text: replyVisible ? ("<style>pre {white-space: pre-wrap} a{color: " + Kirigami.Theme.linkColor + ";} .user-pill{}</style>" + reply.display) : ""
                 textFormat: Text.RichText
-                width: Math.min(implicitWidth, bubbleMaxWidth - Kirigami.Units.largeSpacing * 3)
-                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
-            }
-        }
-
-        Component {
-            id: imageComponent
-            Image {
-                readonly property var content: reply.content
-                readonly property bool isThumbnail: !(content.info.thumbnail_info == null || content.thumbnailMediaId == null)
-                //    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
-                source: "image://mxc/" + mediaId
-
-                width: bubbleMaxWidth * 0.75 - Kirigami.Units.smallSpacing * 5 - replyAvatar.width
-                height: reply.content.info.h / reply.content.info.w * width
-                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
+                wrapMode: Text.WordWrap
             }
         }
     }

imports/NeoChat/Component/Timeline/SectionDelegate.qml

@@ -1,16 +1,16 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
 
-import QtQuick 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.13 as Kirigami
 
 Kirigami.Heading {
     level: 4
-    text: model.showSection ? section : ""
-    color: Kirigami.Theme.disabledTextColor
-    horizontalAlignment: Text.AlignHCenter
+    text: section
     verticalAlignment: Text.AlignVCenter
     topPadding: Kirigami.Units.largeSpacing * 2
     bottomPadding: Kirigami.Units.smallSpacing

imports/NeoChat/Component/Timeline/StateDelegate.qml

@@ -1,25 +1,31 @@
-// SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls.Material 2.12
+import org.kde.kirigami 2.13 as Kirigami
 
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
+import NeoChat.Setting 1.0
 
 RowLayout {
     id: row
 
+    Item {
+        Layout.minimumWidth: Kirigami.Units.iconSizes.medium
+        Layout.preferredHeight: 1
+    }
+
     Kirigami.Avatar {
-        id: icon
         Layout.preferredWidth: Kirigami.Units.iconSizes.small
         Layout.preferredHeight: Kirigami.Units.iconSizes.small
-        Layout.alignment: Qt.AlignTop
 
-        name: author.displayName
+        name: author.name
         source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
         color: author.color
 
@@ -37,11 +43,18 @@ RowLayout {
 
     Label {
         Layout.alignment: Qt.AlignVCenter
+        text: author.displayName
+        color: Kirigami.Theme.disabledTextColor
+    }
+
+    Label {
         Layout.fillWidth: true
-        Layout.preferredHeight: icon.height
-        wrapMode: Text.WordWrap
-        textFormat: Text.RichText
-        text: "<style>a {text-decoration: none;}</style><a href=\"https://matrix.to/#/" + author.id + "\" style='color: " + author.color + "'>" + currentRoom.htmlSafeMemberName(author.id) + "</a> " + display
-        onLinkActivated: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": currentRoom, "user": author.object, "displayName": author.displayName, "avatarMediaId": author.avatarMediaId, "avatarUrl": author.avatarUrl}).open()
+
+        text: display
+        color: Kirigami.Theme.disabledTextColor
+        font.weight: Font.Medium
+
+        wrapMode: Label.Wrap
+        onLinkActivated: Qt.openUrlExternally(link)
     }
 }

imports/NeoChat/Component/Timeline/TextDelegate.qml

@@ -1,23 +1,19 @@
-// SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.neochat 1.0
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.4 as Kirigami
 
 TextEdit {
     id: contentLabel
 
-    readonly property var isEmoji: /^(<span style='.*'>)?(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])+(<\/span>)?$/
-    readonly property var hasSpoiler: /data-mx-spoiler/g
+    readonly property var isEmoji: /^(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])+$/
 
     property bool isEmote: false
-    property string textMessage: model.display
-    property bool spoilerRevealed: !hasSpoiler.test(textMessage)
-    ListView.onReused: Qt.binding(() => !hasSpoiler.test(textMessage))
 
     text: "<style>
 table {
@@ -38,36 +34,24 @@ a{
     color: " + Kirigami.Theme.linkColor + ";
     text-decoration: none;
 }
-" + (!spoilerRevealed ? "
-[data-mx-spoiler] {
-    color: transparent;
-    background: " + Kirigami.Theme.textColor + ";
-}
-" : "") + "
-</style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + textMessage + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
+
+.user-pill{}
+</style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + display + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + i18n("(edited)") + "</span>") : "")
 
     color: Kirigami.Theme.textColor
-    font.pointSize: model.reply === undefined && isEmoji.test(model.display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+    font.pointSize: isEmoji.test(display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
     selectByMouse: !Kirigami.Settings.isMobile
     readOnly: true
-    wrapMode: Text.Wrap
+    wrapMode: Text.WordWrap
     textFormat: Text.RichText
 
-    Layout.fillWidth: true
-
-    onLinkActivated: RoomManager.openResource(link)
-    onHoveredLinkChanged: if (hoveredLink.length > 0) {
-        applicationWindow().hoverLinkIndicator.text = hoveredLink;
-    } else {
-        applicationWindow().hoverLinkIndicator.text = "";
+    onLinkActivated: {
+        applicationWindow().handleLink(link, currentRoom)
     }
 
-    HoverHandler {
-        cursorShape: (parent.hoveredLink || !spoilerRevealed) ? Qt.PointingHandCursor : Qt.IBeamCursor
-    }
-
-    TapHandler {
-        enabled: !parent.hoveredLink && !spoilerRevealed
-        onTapped: spoilerRevealed = true
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.NoButton
+        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
     }
 }

imports/NeoChat/Component/Timeline/TimelineContainer.qml

@@ -1,252 +1,38 @@
-// SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as Controls
+import QtQuick.Layouts 1.12
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.12
+import org.kde.kirigami 2.4 as Kirigami
 
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
-QQC2.ItemDelegate {
-    id: messageDelegate
+Item {
     default property alias innerObject : column.children
-    // readonly property bool failed: marks == EventStatus.SendingFailed
-    property bool isLoaded
 
-    property bool isEmote: false
-    property bool cardBackground: true
+    height: column.implicitHeight + (readMarker ? 2 * Kirigami.Units.smallSpacing : 0)
 
-    readonly property int bubbleMaxWidth: Config.compactLayout && !Config.showAvatarInTimeline ? width : (Config.compactLayout ? width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 6, Kirigami.Units.gridUnit * 20))
-
-    property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && model.author.isLocalUser && !applicationWindow().wideScreen
-
-    signal saveFileAs()
-    signal openExternally()
-    signal replyClicked(string eventID)
-
-    topPadding: 0
-    bottomPadding: 0
-    background: null
-    property Item hoverComponent
-
-    // show hover actions
-    onHoveredChanged: {
-        if (hovered && !Kirigami.Settings.isMobile) {
-            updateHoverComponent();
-        }
-    }
-
-    // updates the global hover component to point to this delegate, and update its position
-    function updateHoverComponent() {
-        if (hoverComponent) {
-            hoverComponent.bubble = bubble
-            hoverComponent.updateFunction = updateHoverComponent;
-            hoverComponent.event = model
-        }
-    }
-
-    height: sectionDelegate.height + Math.max(model.showAuthor ? avatar.height : 0, bubble.implicitHeight) + loader.height + (showAuthor ? Kirigami.Units.largeSpacing : 0)
-
-    SectionDelegate {
-        id: sectionDelegate
+    ColumnLayout {
+        id: column
         width: parent.width
-        anchors.left: avatar.left
-        anchors.leftMargin: Kirigami.Units.smallSpacing
-        visible: model.showSection
-        height: visible ? implicitHeight : 0
-    }
 
-    Kirigami.Avatar {
-        id: avatar
-        width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0
-        height: width
-        sourceSize.width: width
-        sourceSize.height: width
-        anchors {
-            top: sectionDelegate.bottom
-            topMargin: model.showAuthor ? Kirigami.Units.largeSpacing : 0
-            left: parent.left
-            leftMargin: Kirigami.Units.largeSpacing
-        }
+        SectionDelegate {
+            Layout.maximumWidth: parent.width
+            Layout.alignment: Qt.AlignHCenter
 
-        visible: model.showAuthor && Config.showAvatarInTimeline && !showUserMessageOnRight
-        name: model.author.name ?? model.author.displayName
-        source: visible && model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : ""
-        color: model.author.color
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                    room: currentRoom,
-                    user: author.object,
-                    displayName: author.displayName,
-                    avatarMediaId: author.avatarMediaId,
-                    avatarUrl: author.avatarUrl
-                }).open();
-            }
-            cursorShape: Qt.PointingHandCursor
+            visible: showSection
         }
     }
 
-    QQC2.Control {
-        id: bubble
-        topPadding: !Config.compactLayout ? Kirigami.Units.largeSpacing : 0
-        bottomPadding: !Config.compactLayout ? Kirigami.Units.largeSpacing : 0
-        leftPadding: Kirigami.Units.smallSpacing
-        rightPadding: Config.compactLayout ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
-        hoverEnabled: true
-
-        // state: Config.compactLayout ? "compactLayout" : "default"
-        state: showUserMessageOnRight ? "userMessageOnRight" : "userMessageOnLeft"
-
-        anchors {
-            top: avatar.top
-            leftMargin: Kirigami.Units.largeSpacing
-            rightMargin: showUserMessageOnRight ? Kirigami.Units.smallSpacing : Kirigami.Units.largeSpacing
-        }
-        // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably
-        width: Config.compactLayout ? messageDelegate.width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) + Kirigami.Units.largeSpacing * 2 : implicitWidth
-
-
-        // states for anchor animations on window resize
-        // as setting anchors to undefined did not work reliably
-        states: [
-            State {
-                name: "userMessageOnRight"
-                AnchorChanges {
-                    target: bubble
-                    anchors.left: undefined
-                    anchors.right: parent.right
-                }
-            },
-            State {
-                name: "userMessageOnLeft"
-                AnchorChanges {
-                    target: bubble
-                    anchors.left: avatar.right
-                    anchors.right: undefined
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic}
-            }
-        ]
-
-        contentItem: ColumnLayout {
-            id: column
-            spacing: 0
-            Item {
-                id: rowLayout
-                visible: model.showAuthor && !isEmote
-                Layout.fillWidth: true
-                Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
-                Layout.rightMargin: Kirigami.Units.largeSpacing
-                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing * 2
-                Layout.maximumWidth: bubbleMaxWidth
-                implicitHeight: visible ? nameLabel.implicitHeight : 0
-
-                QQC2.Label {
-                    id: nameLabel
-                    topInset: 0
-
-                    visible: model.showAuthor && !isEmote
-                    anchors.left: rowLayout.left
-                    anchors.right: timeLabel.left
-                    anchors.rightMargin: Kirigami.Units.smallSpacing
-
-                    text: visible ? author.displayName : ""
-                    textFormat: Text.PlainText
-                    font.weight: Font.Bold
-                    color: author.color
-                    wrapMode: Text.Wrap
-                    MouseArea {
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                                room: currentRoom,
-                                user: author.object,
-                                displayName: author.displayName,
-                                avatarMediaId: author.avatarMediaId,
-                                avatarUrl: author.avatarUrl
-                            }).open();
-                        }
-                    }
-                }
-                QQC2.Label {
-                    id: timeLabel
-                    anchors.right: rowLayout.right
-                    visible: model.showAuthor && !isEmote
-                    text: visible ? time.toLocaleTimeString(Locale.ShortFormat) : ""
-                    color: Kirigami.Theme.disabledTextColor
-                }
-            }
-            Loader {
-                id: replyLoader
-                active: model.reply !== undefined
-                source: 'qrc:imports/NeoChat/Component/Timeline/ReplyComponent.qml'
-                visible: active
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Config.compactLayout ? 0 : Kirigami.Units.smallSpacing
-
-                Connections {
-                    target: replyLoader.item
-                    function onClicked() {
-                        replyClicked(reply.eventId)
-                    }
-                }
-            }
-        }
-
-        background: Item {
-            Rectangle {
-                visible: messageDelegate.hovered
-                color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
-                radius: Kirigami.Units.smallSpacing
-                anchors.fill: parent
-            }
-            Kirigami.ShadowedRectangle {
-                visible: cardBackground && !Config.compactLayout
-                anchors.fill: parent
-                color: {
-                    if (model.author.isLocalUser) {
-                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
-                    } else if (model.isHighlighted) {
-                        return Kirigami.Theme.positiveBackgroundColor
-                    } else {
-                        return Kirigami.Theme.backgroundColor
-                    }
-                }
-                radius: Kirigami.Units.smallSpacing
-                shadow.size: Kirigami.Units.smallSpacing
-                shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                border.width: 1
-            }
-        }
-    }
-
-    Loader {
-        id: loader
-        anchors {
-            left: bubble.left
-            right: parent.right
-            top: bubble.bottom
-            topMargin: active && !Config.compactLayout ? Kirigami.Units.smallSpacing : 0
-        }
-        height: active ? item.implicitHeight : 0
-        //Layout.bottomMargin: readMarker ? Kirigami.Units.smallSpacing : 0
-        active: eventType !== "state" && eventType !== "notice" && reaction != undefined && reaction.length > 0
-        visible: active
-        sourceComponent: ReactionDelegate { }
+    Rectangle {
+        width: parent.width * 0.9
+        x: parent.width * 0.05
+        height: Kirigami.Units.smallSpacing
+        anchors.top: column.bottom
+        anchors.topMargin: Kirigami.Units.smallSpacing
+        visible: readMarker
+        color: Kirigami.Theme.positiveTextColor
     }
 }

imports/NeoChat/Component/Timeline/VideoDelegate.qml

@@ -1,16 +1,19 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import QtMultimedia 5.15
-import Qt.labs.platform 1.1 as Platform
-
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls.Material 2.12
+import QtGraphicalEffects 1.0
+import QtMultimedia 5.12
+import Qt.labs.platform 1.0 as Platform
 import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Menu.Timeline 1.0
@@ -18,6 +21,7 @@ import NeoChat.Menu.Timeline 1.0
 Video {
     id: vid
 
+    property bool openOnFinished: false
     property bool playOnFinished: false
     readonly property bool downloaded: progressInfo && progressInfo.completed
 
@@ -28,6 +32,10 @@ Video {
             vid.source = progressInfo.localPath
         }
 
+        if (downloaded && openOnFinished) {
+            openSavedFile()
+            openOnFinished = false
+        }
         if (downloaded && playOnFinished) {
             playSavedFile()
             playOnFinished = false
@@ -97,6 +105,36 @@ Video {
         }
     }
 
+    Control {
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 8
+        anchors.right: parent.right
+        anchors.rightMargin: 8
+
+        horizontalPadding: 8
+        verticalPadding: 4
+
+        contentItem: RowLayout {
+            Label {
+                text: Qt.formatTime(time)
+                color: "white"
+                font.pixelSize: 12
+            }
+
+            Label {
+                text: author.displayName
+                color: "white"
+                font.pixelSize: 12
+            }
+        }
+
+        background: Rectangle {
+            radius: height / 2
+            color: "black"
+            opacity: 0.3
+        }
+    }
+
     Rectangle {
         anchors.fill: parent
 
@@ -115,29 +153,100 @@ Video {
         }
     }
 
-    TapHandler {
-        acceptedButtons: Qt.LeftButton
-        onTapped: if (supportStreaming || progressInfo.completed) {
-            if (vid.playbackState == MediaPlayer.PlayingState) {
-                vid.pause()
+    AutoMouseArea {
+        anchors.fill: parent
+
+        id: messageMouseArea
+
+        onPrimaryClicked: {
+            if (supportStreaming || progressInfo.completed) {
+                if (vid.playbackState == MediaPlayer.PlayingState) {
+                    vid.pause()
+                } else {
+                    vid.play()
+                }
             } else {
-                vid.play()
+                downloadAndPlay()
             }
-        } else {
-            downloadAndPlay()
+        }
+
+        onSecondaryClicked: {
+            var contextMenu = imageDelegateContextMenu.createObject(vid, {'room': currentRoom, 'author': author})
+            contextMenu.viewSource.connect(function() {
+                messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+            })
+            contextMenu.downloadAndOpen.connect(downloadAndOpen)
+            contextMenu.saveFileAs.connect(saveFileAs)
+            contextMenu.reply.connect(function() {
+                roomPanelInput.replyModel = Object.assign({}, model)
+                roomPanelInput.isReply = true
+                roomPanelInput.focus()
+            })
+            contextMenu.redact.connect(function() {
+                currentRoom.redactEvent(eventId)
+            })
+            contextMenu.popup()
+        }
+
+        Component {
+            id: messageSourceSheet
+
+            MessageSourceSheet {}
+        }
+
+        Component {
+            id: openFolderDialog
+
+            OpenFolderDialog {}
+        }
+
+        Component {
+            id: imageDelegateContextMenu
+
+            FileDelegateContextMenu {}
         }
     }
 
-    function downloadAndPlay() {
-        if (downloaded) {
-            playSavedFile()
-        } else {
+    function saveFileAs() {
+        var folderDialog = openFolderDialog.createObject(ApplicationWindow.overlay)
+
+        folderDialog.chosen.connect(function(path) {
+            if (!path) return
+
+            currentRoom.downloadFile(eventId, path + "/" + currentRoom.fileNameToDownload(eventId))
+        })
+
+        folderDialog.open()
+    }
+
+    function downloadAndOpen()
+    {
+        if (downloaded) openSavedFile()
+        else
+        {
+            openOnFinished = true
+            currentRoom.downloadFile(eventId, Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
+        }
+    }
+
+    function downloadAndPlay()
+    {
+        if (downloaded) playSavedFile()
+        else
+        {
             playOnFinished = true
             currentRoom.downloadFile(eventId, Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
         }
     }
 
-    function playSavedFile() {
+    function openSavedFile()
+    {
+        if (Qt.openUrlExternally(progressInfo.localPath)) return;
+        if (Qt.openUrlExternally(progressInfo.localDir)) return;
+    }
+
+    function playSavedFile()
+    {
         vid.stop()
         vid.play()
     }

imports/NeoChat/Component/Timeline/qmldir

@@ -1,5 +1,6 @@
 module NeoChat.Component.Timeline
 TimelineContainer 1.0 TimelineContainer.qml
+MessageDelegate 1.0 MessageDelegate.qml
 TextDelegate 1.0 TextDelegate.qml
 StateDelegate 1.0 StateDelegate.qml
 SectionDelegate 1.0 SectionDelegate.qml
@@ -8,4 +9,3 @@ 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

imports/NeoChat/Component/TypingPane.qml

@@ -1,106 +0,0 @@
-/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
- * SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
- * SPDX-FileCopyrightText: 2021 Srevin Saju <srevinsaju@sugarlabs.org>
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import org.kde.kirigami 2.14 as Kirigami
-import org.kde.neochat 1.0
-
-Loader {
-    id: root
-    property string labelText: ""
-
-    active: visible
-    sourceComponent: Pane {
-        id: typingPane
-
-        leftPadding: Kirigami.Units.largeSpacing
-        rightPadding: Kirigami.Units.largeSpacing
-        topPadding: Kirigami.Units.smallSpacing
-        bottomPadding: Kirigami.Units.smallSpacing
-        spacing: Kirigami.Units.largeSpacing
-
-        FontMetrics {
-            id: fontMetrics
-        }
-
-        contentItem: RowLayout {
-            spacing: typingPane.spacing
-            Row {
-                id: dotRow
-                property int duration: 400
-                spacing: Kirigami.Units.smallSpacing
-                Repeater {
-                    model: 3
-                    delegate: Rectangle {
-                        id: dot
-                        color: Kirigami.Theme.textColor
-                        radius: height/2
-                        implicitWidth: fontMetrics.xHeight
-                        implicitHeight: fontMetrics.xHeight
-                        // rotating 45 degrees makes the dots look a bit smoother when scaled up
-                        rotation: 45
-                        opacity: 0.5
-                        scale: 1
-                        // FIXME: Sometimes the animation timings for each
-                        // dot drift slightly reletative to each other.
-                        // Not everyone can see this, but I'm pretty sure it's there.
-                        SequentialAnimation {
-                            running: true
-                            PauseAnimation { duration: dotRow.duration * index / 2 }
-                            SequentialAnimation {
-                                loops: Animation.Infinite
-                                ParallelAnimation {
-                                    // Animators unfortunately sync up instead of being
-                                    // staggered, so I'm using NumberAnimations instead.
-                                    NumberAnimation {
-                                        target: dot; property: "scale";
-                                        from: 1; to: 1.33
-                                        duration: dotRow.duration
-                                    }
-                                    NumberAnimation {
-                                        target: dot; property: "opacity"
-                                        from: 0.5; to: 1
-                                        duration: dotRow.duration
-                                    }
-                                }
-                                ParallelAnimation {
-                                    NumberAnimation {
-                                        target: dot; property: "scale"
-                                        from: 1.33; to: 1
-                                        duration: dotRow.duration
-                                    }
-                                    NumberAnimation {
-                                        target: dot; property: "opacity"
-                                        from: 1; to: 0.5
-                                        duration: dotRow.duration
-                                    }
-                                }
-                                PauseAnimation { duration: dotRow.duration }
-                            }
-                        }
-                    }
-                }
-            }
-            Label {
-                id: typingLabel
-                elide: Text.ElideRight
-                text: root.labelText
-            }
-        }
-
-        leftInset: !mirrored ? 0 : -background.radius
-        rightInset: mirrored ? 0 : -background.radius
-        bottomInset: -background.radius
-        background: Rectangle {
-            radius: 3
-            color: Kirigami.Theme.backgroundColor
-            border.color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, 0.2)
-            border.width: 1
-        }
-    }
-}

imports/NeoChat/Component/qmldir

@@ -1,7 +1,4 @@
 module NeoChat.Component
+AutoMouseArea 1.0 AutoMouseArea.qml
 FullScreenImage 1.0 FullScreenImage.qml
 ChatTextInput 1.0 ChatTextInput.qml
-FancyEffectsContainer 1.0 FancyEffectsContainer.qml
-TypingPane 1.0 TypingPane.qml
-QuickSwitcher 1.0 QuickSwitcher.qml
-ShimmerGradient 1.0 ShimmerGradient.qml

imports/NeoChat/Dialog/CreateRoomDialog.qml

@@ -1,13 +1,16 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+import NeoChat.Component 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.OverlaySheet {
     id: root
@@ -36,7 +39,7 @@ Kirigami.OverlaySheet {
 
             text: i18nc("@action:button", "Ok")
             onClicked: {
-                Controller.createRoom(roomNameField.text, roomTopicField.text);
+                roomManager.actionsHandler.createRoom(roomNameField.text, roomTopicField.text);
                 root.close();
                 root.destroy();
             }

imports/NeoChat/Dialog/EmojiDialog.qml

@@ -1,10 +1,11 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as QQC2
+import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component.Emoji 1.0
@@ -24,5 +25,6 @@ QQC2.Popup {
 
     contentItem: EmojiPicker {
         onChosen: react(emoji)
+        emojiModel: EmojiModel {}
     }
 }

imports/NeoChat/Dialog/OpenFileDialog.qml

@@ -1,7 +1,9 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
 import Qt.labs.platform 1.1
 
 FileDialog {

imports/NeoChat/Dialog/OpenFolderDialog.qml

@@ -0,0 +1,17 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import Qt.labs.platform 1.1
+
+FolderDialog {
+    signal chosen(string path)
+
+    id: root
+
+    title: i18n("Please choose a folder")
+
+    onAccepted: chosen(folder)
+}

imports/NeoChat/Dialog/RoomSettingsDialog.qml

@@ -1,13 +1,17 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+import NeoChat.Component 1.0
+import NeoChat.Setting 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.OverlaySheet {
     id: root
@@ -121,7 +125,7 @@ Kirigami.OverlaySheet {
 
                 RowLayout {
                     id: altAlias
-                    Kirigami.FormData.label: i18n("Other Aliases:")
+                    Kirigami.FormData.label: i18n("Alt Aliases")
                     Layout.fillWidth: true
 
                     visible: room.altAliases && room.altAliases.length
@@ -139,6 +143,7 @@ Kirigami.OverlaySheet {
 
                                 Label {
                                     text: modelData
+                                    color: Kirigami.Theme.disabledColor
                                 }
 
                                 ToolButton {

imports/NeoChat/Dialog/UserDetailDialog.qml

@@ -1,15 +1,18 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// 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 org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component 1.0
+import NeoChat.Setting 1.0
 
 Kirigami.OverlaySheet {
     id: root
@@ -29,7 +32,7 @@ Kirigami.OverlaySheet {
 
     header: Kirigami.Heading {
         id: heading
-        text: i18nc("@title:menu Account detail dialog", "Account detail")
+        text: i18nc("Account detail dialog", "Account detail - %1", displayName)
         elide: Text.ElideRight
         QQC2.ToolTip.visible: truncated && hovered
         QQC2.ToolTip.text: text
@@ -51,7 +54,6 @@ Kirigami.OverlaySheet {
 
                 name: displayName
                 source: avatarMediaId ? ("image://mxc/" + avatarMediaId) : ""
-                color: user.color
 
                 MouseArea {
                     anchors.fill: parent
@@ -74,7 +76,7 @@ Kirigami.OverlaySheet {
 
                     elide: Text.ElideRight
                     wrapMode: Text.NoWrap
-                    text: room.htmlSafeMemberName(user.id)
+                    text: displayName
                 }
 
                 QQC2.Label {
@@ -104,7 +106,7 @@ Kirigami.OverlaySheet {
             }
         }
         Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("kick") && room.containsUser(user.id)
+            visible: user !== room.localUser && room.canSendState("kick")
 
             action: Kirigami.Action {
                 text: i18n("Kick this user")
@@ -116,50 +118,24 @@ Kirigami.OverlaySheet {
             }
         }
         Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("ban") && !room.isUserBanned(user.id)
+            visible: user !== room.localUser && room.canSendState("ban")
 
             action: Kirigami.Action {
                 text: i18n("Ban this user")
                 icon.name: "im-ban-user"
                 icon.color: Kirigami.Theme.negativeTextColor
                 onTriggered: {
-                    room.ban(user.id)
+                    room.banMember(user.id)
                     root.close()
                 }
             }
         }
         Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("ban") && room.isUserBanned(user.id)
-
-            action: Kirigami.Action {
-                text: i18n("Unban this user")
-                icon.name: "im-irc"
-                icon.color: Kirigami.Theme.negativeTextColor
-                onTriggered: {
-                    room.unban(user.id)
-                    root.close()
-                }
-            }
-        }
-        Kirigami.BasicListItem {
-            visible: user === room.localUser || room.canSendState("redact")
-
-            action: Kirigami.Action {
-                text: i18n("Delete recent messages by this user")
-                icon.name: "delete"
-                icon.color: Kirigami.Theme.negativeTextColor
-                onTriggered: {
-                    room.deleteMessagesByUser(user.id)
-                }
-            }
-        }
-        Kirigami.BasicListItem {
-            visible: user !== room.localUser
             action: Kirigami.Action {
                 text: i18n("Open a private chat")
                 icon.name: "document-send"
                 onTriggered: {
-                    Controller.openOrCreateDirectChat(user);
+                    Controller.activeConnection.requestDirectChat(user)
                     root.close()
                 }
             }

imports/NeoChat/Dialog/qmldir

@@ -5,6 +5,7 @@ LoginDialog 1.0 LoginDialog.qml
 CreateRoomDialog 1.0 CreateRoomDialog.qml
 AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
 OpenFileDialog 1.0 OpenFileDialog.qml
+OpenFolderDialog 1.0 OpenFolderDialog.qml
 ImageClipboardDialog 1.0 ImageClipboardDialog.qml
 StartChatDialog 1.0 StartChatDialog.qml
 EmojiDialog 1.0 EmojiDialog.qml

imports/NeoChat/Menu/EditMenu.qml

@@ -1,90 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-import Qt.labs.platform 1.1 as Labs
-import QtQuick 2.15
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.10
-import org.kde.kirigami 2.15 as Kirigami
-
-Labs.Menu {
-    id: editMenu
-
-    required property Item field
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.canUndo
-        text: i18nc("text editing menu action", "Undo")
-        shortcut: StandardKey.Undo
-        onTriggered: {
-            editMenu.field.undo()
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.canRedo
-        text: i18nc("text editing menu action", "Redo")
-        shortcut: StandardKey.Redo
-        onTriggered: {
-            editMenu.field.undo()
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuSeparator {
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.selectedText
-        text: i18nc("text editing menu action", "Cut")
-        shortcut: StandardKey.Cut
-        onTriggered: {
-            editMenu.field.cut()
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.selectedText
-        text: i18nc("text editing menu action", "Copy")
-        shortcut: StandardKey.Copy
-        onTriggered: {
-            editMenu.field.copy()
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.canPaste
-        text: i18nc("text editing menu action", "Paste")
-        shortcut: StandardKey.Paste
-        onTriggered: {
-            editMenu.field.paste()
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null && editMenu.field.selectedText !== ""
-        text: i18nc("text editing menu action", "Delete")
-        shortcut: ""
-        onTriggered: {
-            editMenu.field.remove(editMenu.field.selectionStart, editMenu.field.selectionEnd)
-            editMenu.close()
-        }
-    }
-
-    Labs.MenuSeparator {
-    }
-
-    Labs.MenuItem {
-        enabled: editMenu.field !== null
-        text: i18nc("text editing menu action", "Select All")
-        shortcut: StandardKey.SelectAll
-        onTriggered: {
-            editMenu.field.selectAll()
-            editMenu.close()
-        }
-    }
-}

imports/NeoChat/Menu/GlobalMenu.qml

@@ -1,96 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-import Qt.labs.platform 1.1 as Labs
-
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.10
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Page 1.0
-import NeoChat.Panel 1.0
-
-Labs.MenuBar {
-    Labs.Menu {
-        title: i18nc("menu", "NeoChat")
-
-        // TODO: make about page its own thing so we can go to it instead of settings where it's currently at
-        // Labs.MenuItem {
-        //     text: i18nc("menu", "About NeoChat")
-        // }
-        Labs.MenuItem {
-            enabled: pageStack.layers.currentItem.title !== i18n("Settings")
-            text: i18nc("menu", "Preferences…")
-
-            shortcut: StandardKey.Preferences
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/SettingsPage.qml")
-        }
-        Labs.MenuItem {
-            text: i18nc("menu", "Quit NeoChat")
-
-            shortcut: StandardKey.Quit
-            onTriggered: Qt.quit()
-        }
-    }
-    Labs.Menu {
-        title: i18nc("menu", "File")
-
-        Labs.MenuItem {
-            text: i18nc("menu", "New Private Chat…")
-            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {"connection": Controller.activeConnection})
-        }
-        Labs.MenuItem {
-            text: i18nc("menu", "New Group…")
-            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
-            shortcut: StandardKey.New
-            onTriggered: {
-                const dialog = createRoomDialog.createObject(root.overlay)
-                dialog.open()
-            }
-        }
-        Labs.MenuItem {
-            text: i18nc("menu", "Browse Chats…")
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": Controller.activeConnection})
-        }
-    }
-    EditMenu {
-        title: i18nc("menu", "Edit")
-        field: (root.activeFocusItem instanceof TextEdit || root.activeFocusItem instanceof TextInput) ? root.activeFocusItem : null
-    }
-    Labs.Menu {
-        title: i18nc("menu", "View")
-
-        Labs.MenuItem {
-            text: i18nc("menu item that opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Open Quick Switcher")
-            shortcut: "Ctrl+K"
-            onTriggered: quickView.item.open()
-        }
-    }
-    Labs.Menu {
-        title: i18nc("menu", "Window")
-
-        // Labs.MenuItem {
-        //     text: settings.userWantsSidebars ? i18nc("menu", "Hide Sidebar") : i18nc("menu", "Show Sidebar")
-        //     onTriggered: settings.userWantsSidebars = !settings.userWantsSidebars
-        // }
-        Labs.MenuItem {
-            text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
-            onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
-        }
-    }
-    // TODO: offline help system (https://invent.kde.org/network/neochat/-/issues/411)
-    Labs.Menu {
-        title: i18nc("menu", "Help")
-
-        Labs.MenuItem {
-            text: i18nc("menu", "Matrix FAQ")
-            onTriggered: Qt.openUrlExternally("https://matrix.org/faq/")
-        }
-    }
-}

imports/NeoChat/Menu/RoomListContextMenu.qml

@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-import org.kde.neochat 1.0
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
 import NeoChat.Page 1.0
 
 /**
@@ -17,7 +17,7 @@ Menu {
 
     MenuItem {
         text: i18n("Open in new window")
-        onTriggered: RoomManager.openWindow(room);
+        onTriggered: roomManager.openWindow(room);
     }
 
     MenuSeparator {}
@@ -44,7 +44,7 @@ Menu {
 
     MenuItem {
         text: i18n("Leave Room")
-        onTriggered: RoomManager.leaveRoom(room)
+        onTriggered: room.forget()
     }
 
     onClosed: destroy()

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

@@ -1,85 +1,54 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import Qt.labs.platform 1.1
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
 import NeoChat.Dialog 1.0
-import NeoChat.Menu 1.0
 
-MessageDelegateContextMenu {
+Menu {
     id: root
 
-    required property var file
-    required property var progressInfo
+    required property var room
+    required property var author
 
-    property list<Kirigami.Action> actions: [
-        Kirigami.Action {
-            text: i18n("Open Externally")
-            icon.name: "document-open"
-            onTriggered: {
-                if (file.downloaded) {
-                    if (!Qt.openUrlExternally(progressInfo.localPath)) {
-                        Qt.openUrlExternally(progressInfo.localDir);
-                    }
-                } else {
-                    file.onDownloadedChanged.connect(function() {
-                        if (!Qt.openUrlExternally(progressInfo.localPath)) {
-                            Qt.openUrlExternally(progressInfo.localDir);
-                        }
-                    });
-                    currentRoom.downloadFile(eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + eventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(eventId))
-                }
-            }
-        },
-        Kirigami.Action {
-            text: i18n("Save As")
-            icon.name: "document-save"
-            onTriggered: {
-                var dialog = saveAsDialog.createObject(ApplicationWindow.overlay)
-                dialog.open()
-                dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId)
-            }
-        },
-        Kirigami.Action {
-            text: i18n("Reply")
-            icon.name: "mail-replied-symbolic"
-            onTriggered: {
-                ChatBoxHelper.replyToMessage(eventId, message, author);
-            }
-        },
-        Kirigami.Action {
-            visible: author.id === currentRoom.localUser.id || currentRoom.canSendState("redact")
-            text: i18n("Remove")
-            icon.name: "edit-delete-remove"
-            icon.color: "red"
-            onTriggered: {
-                currentRoom.redactEvent(eventId);
-            }
-        },
-        Kirigami.Action {
-            text: i18n("View Source")
-            icon.name: "code-context"
-            onTriggered: {
-                messageSourceSheet.createObject(root, {'sourceText': root.source}).open();
-            }
-        }
-    ]
-    Component {
-        id: saveAsDialog
-        FileDialog {
-            fileMode: FileDialog.SaveFile
-            folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
-            onAccepted: {
-                if (!currentFile) {
-                    return;
-                }
-                currentRoom.downloadFile(eventId, currentFile)
-            }
-        }
+    signal viewSource()
+    signal downloadAndOpen()
+    signal saveFileAs()
+    signal reply()
+    signal redact()
+
+    MenuItem {
+        text: i18n("View Source")
+
+        onTriggered: viewSource()
     }
+
+    MenuItem {
+        text: i18n("Open Externally")
+
+        onTriggered: downloadAndOpen()
+    }
+
+    MenuItem {
+        text: i18n("Save As")
+
+        onTriggered: saveFileAs()
+    }
+
+    MenuItem {
+        text: i18n("Reply")
+
+        onTriggered: reply()
+    }
+
+    MenuItem {
+        visible: room.canSendState("redact") || room.localUser.id === author.id
+        text: i18n("Redact")
+        onTriggered: redact()
+    }
+
+    onClosed: destroy()
 }

imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -1,212 +1,121 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
-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.neochat 1.0
 import NeoChat.Dialog 1.0
+import org.kde.neochat 1.0
 
-Loader {
-    id: loadRoot
+Kirigami.OverlaySheet {
+    id: root
 
     required property var author
     required property string message
     required property string eventId
-    property string eventType: ""
-    property string formattedBody: ""
-    required property string source
-    property string selectedText: ""
 
-    property list<Kirigami.Action> actions: [
-        Kirigami.Action {
-            text: i18n("Edit")
-            icon.name: "document-edit"
-            onTriggered: ChatBoxHelper.edit(message, formattedBody, eventId);
-            visible: eventType.length > 0 && author.id === Controller.activeConnection.localUserId && (eventType === "emote" || eventType === "message")
-        },
-        Kirigami.Action {
-            text: i18n("Reply")
-            icon.name: "mail-replied-symbolic"
-            onTriggered: ChatBoxHelper.replyToMessage(eventId, message, author);
-        },
-        Kirigami.Action {
-            visible: author.id === currentRoom.localUser.id || currentRoom.canSendState("redact")
-            text: i18n("Remove")
-            icon.name: "edit-delete-remove"
-            icon.color: "red"
-            onTriggered: currentRoom.redactEvent(eventId);
-        },
-        Kirigami.Action {
-            text: i18n("Copy")
-            icon.name: "edit-copy"
-            onTriggered: Clipboard.saveText(message)
-        },
-        Kirigami.Action {
-            text: i18n("View Source")
-            icon.name: "code-context"
-            onTriggered: {
-                messageSourceSheet.createObject(page, {'sourceText': loadRoot.source}).open();
+    signal viewSource()
+    signal reply(var author, string message)
+    signal remove()
+
+    parent: applicationWindow().overlay
+
+    leftPadding: 0
+    rightPadding: 0
+
+    ColumnLayout {
+        spacing: 0
+        RowLayout {
+            id: headerLayout
+            Layout.fillWidth: true
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: 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
             }
-        }
-    ]
-
-    Component {
-        id: regularMenu
-
-        QQC2.Menu {
-            Repeater {
-                model: loadRoot.actions
-                QQC2.MenuItem {
-                    visible: modelData.visible
-                    action: modelData
-                    onClicked: loadRoot.item.close();
-                }
-            }
-            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
-                onIsVisibleChanged: webshortcutmenu.parent.visible = isVisible
-                Instantiator {
-                    model: WebShortcutModel {
-                        id: webshortcutmodel
-                        selectedText: loadRoot.selectedText
-                        onOpenUrl: RoomManager.visitNonMatrix(url)
-                    }
-                    delegate: QQC2.MenuItem {
-                        text: model.display
-                        icon.name: model.decoration
-                        onTriggered: webshortcutmodel.trigger(model.edit)
-                    }
-                    onObjectAdded: webshortcutmenu.insertItem(0, object)
-                }
-                QQC2.MenuSeparator {}
-                QQC2.MenuItem {
-                    text: i18n("Configure Web Shortcuts...")
-                    icon.name: "configure"
-                    onTriggered: webshortcutmodel.configureWebShortcuts()
-                }
-            }
-        }
-    }
-    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
+                Kirigami.Heading {
+                    level: 3
                     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
-                        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);
-                        }
-                    }
+                    text: author.displayName
+                    wrapMode: Text.WordWrap
                 }
-                Kirigami.Separator {
+                QQC2.Label {
+                    text: message
                     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
+                    wrapMode: Text.WordWrap
 
-                            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: {
-                            modelData.triggered()
-                            loadRoot.item.close();
-                        }
-                        implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0
+                    onLinkActivated: {
+                        applicationWindow().handleLink(link, currentRoom)
                     }
                 }
             }
         }
-    }
+        Row {
+            spacing: 0
+            Repeater {
+                model: ["👍", "👎️", "😄", "🎉", "🚀", "👀"]
+                delegate: QQC2.ItemDelegate {
+                    width: 32
+                    height: 32
 
-    asynchronous: true
-    sourceComponent: Kirigami.Settings.isMobile ? mobileMenu : regularMenu
+                    contentItem: QQC2.Label {
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
 
-    function open() {
-        active = true;
-    }
+                        font.pixelSize: 16
+                        font.family: "emoji"
+                        text: modelData
 
-    onStatusChanged: if (status == Loader.Ready) {
-        if (Kirigami.Settings.isMobile) {
-            item.open();
-        } else {
-            item.popup();
+                    }
+
+                    onClicked: {
+                        currentRoom.toggleReaction(eventId, modelData)
+                        root.close();
+                    }
+                }
+            }
+        }
+        Kirigami.BasicListItem {
+            action: Kirigami.Action {
+                text: i18n("Reply")
+                icon.name: "mail-replied-symbolic"
+                onTriggered: reply(author, message)
+            }
+        }
+        Kirigami.BasicListItem {
+            visible: author.id === currentRoom.localUser.id || currentRoom.canSendState("redact")
+            action: Kirigami.Action {
+                text: i18n("Remove")
+                icon.name: "edit-delete-remove"
+                icon.color: "red"
+                onTriggered: remove()
+            }
+        }
+        Kirigami.BasicListItem {
+            action: Kirigami.Action {
+                text: i18n("Copy")
+                icon.name: "edit-copy"
+                onTriggered: Clipboard.saveText(message)
+            }
+        }
+        Kirigami.BasicListItem {
+            action: Kirigami.Action {
+                text: i18n("View Source")
+                icon.name: "code-context"
+                onTriggered: viewSource()
+            }
         }
     }
 }
-

imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-import org.kde.syntaxhighlighting 1.0
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 Kirigami.OverlaySheet {
 
@@ -17,16 +18,9 @@ Kirigami.OverlaySheet {
     }
 
     TextArea {
-        id: sourceTextArea
         text: sourceText
         readOnly: true
         wrapMode: Text.WordWrap
-
-        SyntaxHighlighter {
-            textEdit: sourceTextArea
-            repository: Repository
-            definition: "JSON"
-        }
     }
 }
 

imports/NeoChat/Menu/qmldir

@@ -1,4 +1,2 @@
 module NeoChat.Menu
 RoomListContextMenu 1.0 RoomListContextMenu.qml
-GlobalMenu 1.0 GlobalMenu.qml
-EditMenu 1.0 EditMenu.qml

imports/NeoChat/Page/AccountsPage.qml

@@ -1,109 +1,63 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 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"
-        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
-        visible: !pageSettingStack.wideMode
-    }
-
-    Connections {
-        target: pageSettingStack
-        function onWideModeChanged() {
-            scroll.background.visible = pageSettingStack.wideMode
-        }
-    }
-
-    Controls.ScrollView {
-        id: scroll
-        Component.onCompleted: background.visible = pageSettingStack.wideMode
-
-        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()
-                    }
-                }
-                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()
-                        }
-                    }
-                ]
+    ListView {
+        model: AccountListModel { }
+        delegate: Kirigami.SwipeListItem {
+            leftPadding: 0
+            rightPadding: 0
+            action: Kirigami.Action {
+                onTriggered: Controller.activeConnection = model.connection
             }
-        }
-    }
+            Kirigami.BasicListItem {
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
 
-    footer: Column {
-        height: visible ? implicitHeight : 0
-        Kirigami.ActionToolBar {
-            alignment: Qt.AlignRight
-            visible: pageSettingStack.wideMode
-            rightPadding: Kirigami.Units.smallSpacing
-            width: parent.width
-            flat: false
+                text: model.user.displayName
+                subtitle: model.user.id
+                icon: model.connection.user.avatarMediaId ? "image://mxc/" + model.connection.user.avatarMediaId : "im-user"
+
+                onClicked: {
+                    Controller.activeConnection = model.connection
+                    pageStack.layers.pop()
+                }
+            }
             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 {
-            width: parent.width
-            height: Kirigami.Units.smallSpacing
-        }
     }
+
     Connections {
         target: Controller
         function onConnectionAdded() {
@@ -120,12 +74,10 @@ Kirigami.Page {
         }
     }
 
-    Component {
-        id: openFileDialog
-
-        OpenFileDialog {
-            folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
-        }
+    actions.main: Kirigami.Action {
+        text: i18n("Add an account")
+        iconName: "list-add-user"
+        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
     }
 
     Kirigami.OverlaySheet {
@@ -138,47 +90,10 @@ Kirigami.Page {
         }
 
         Kirigami.FormLayout {
-            RowLayout {
-                Kirigami.Avatar {
-                    id: avatar
-                    source: userEditSheet.connection && userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
-
-                    MouseArea {
-                        id: mouseArea
-                        anchors.fill: parent
-                        property var fileDialog: null;
-                        onClicked: {
-                            if (fileDialog != null) {
-                                return;
-                            }
-
-                            fileDialog = openFileDialog.createObject(Controls.ApplicationWindow.Overlay)
-
-                            fileDialog.chosen.connect(function(receivedSource) {
-                                mouseArea.fileDialog = null;
-                                if (!receivedSource) {
-                                    return;
-                                }
-                                parent.source = receivedSource;
-                            });
-                            fileDialog.onRejected.connect(function() {
-                                mouseArea.fileDialog = null;
-                            });
-                            fileDialog.open();
-                        }
-                    }
-                }
-                Controls.Button {
-                    visible: avatar.source.length !== 0
-                    icon.name: "edit-clear"
-
-                    onClicked: avatar.source = ""
-                }
-                Kirigami.FormData.label: i18n("Avatar:")
-            }
+            anchors.top: passwordsMessage.bottom
             Controls.TextField {
                 id: name
-                text: userEditSheet.connection ? userEditSheet.connection.localUser.displayName : ""
+                text: userEditSheet.connection.localUser.displayName
                 Kirigami.FormData.label: i18n("Name:")
             }
             Controls.TextField {
@@ -198,37 +113,23 @@ Kirigami.Page {
                 echoMode: TextInput.Password
             }
 
-            RowLayout {
-                Controls.Button {
-                    text: i18n("Save")
-                    onClicked: {
-                        if(!Controller.setAvatar(userEditSheet.connection, avatar.source))
-                            showPassiveNotification("The Avatar could not be set")
-                        if(userEditSheet.connection.localUser.displayName !== name.text)
-                            userEditSheet.connection.localUser.rename(name.text)
-                        if(currentPassword.text !== "" && newPassword.text !== "" && confirmPassword.text !== "") {
-                            if(newPassword.text === confirmPassword.text) {
-                                Controller.changePassword(userEditSheet.connection, currentPassword.text, newPassword.text)
-                            } else {
-                                showPassiveNotification(i18n("Passwords do not match"))
-                                return
-                            }
+            Controls.Button {
+                text: i18n("Save")
+                onClicked: {
+                    if(userEditSheet.connection.localUser.displayName !== name.text)
+                        userEditSheet.connection.localUser.rename(name.text)
+                    if(currentPassword.text !== "" && newPassword.text !== "" && confirmPassword.text !== "") {
+                        if(newPassword.text === confirmPassword.text) {
+                            Controller.changePassword(userEditSheet.connection, currentPassword.text, newPassword.text)
+                        } else {
+                            showPassiveNotification(i18n("Passwords do not match"))
+                            return
                         }
-                        userEditSheet.close()
-                        currentPassword.text = ""
-                        newPassword.text = ""
-                        confirmPassword.text = ""
-                    }
-                }
-                Controls.Button {
-                    text: i18n("Cancel")
-                    onClicked: {
-                        userEditSheet.close()
-                        avatar.source = userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
-                        currentPassword.text = ""
-                        newPassword.text = ""
-                        confirmPassword.text = ""
                     }
+                    userEditSheet.close()
+                    currentPassword.text = ""
+                    newPassword.text = ""
+                    confirmPassword.text = ""
                 }
             }
         }

imports/NeoChat/Page/DevicesPage.qml

@@ -1,79 +1,54 @@
-// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-LicenseIdentifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 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
         }
-    }
+        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
-        anchors.fill: parent
-        ListView {
-            clip: true
-            model: DevicesModel {
-                id: devices
+                text: model.displayName
+                subtitle: model.id
+                icon: "network-connect"
             }
-
-            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"
-                }
-                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/Page/ImageEditorPage.qml

@@ -1,14 +1,16 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: BSD-2-Clause
+/*
+ * SPDX-FileCopyrightText: (C) 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import Qt.labs.platform 1.1 as Platform
-
-import org.kde.kirigami 2.15 as Kirigami
+import QtQuick 2.10
+import QtQuick.Controls 2.1 as QQC2
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.12 as Kirigami
 import org.kde.kquickimageeditor 1.0 as KQuickImageEditor
+import QtGraphicalEffects 1.12
+import Qt.labs.platform 1.0 as Platform
 
 Kirigami.Page {
     id: rootEditorView
@@ -21,14 +23,14 @@ Kirigami.Page {
     title: i18n("Edit")
     leftPadding: 0
     rightPadding: 0
-    topPadding: 0
-    bottomPadding: 0
+
+    
 
     function crop() {
         const ratioX = editImage.paintedWidth / editImage.nativeWidth;
         const ratioY = editImage.paintedHeight / editImage.nativeHeight;
         rootEditorView.resizing = false
-        imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
+        imageDoc.crop(resizeRectangle.insideX / ratioX, resizeRectangle.insideY / ratioY, resizeRectangle.insideWidth / ratioX, resizeRectangle.insideHeight / ratioY);
     }
 
     actions {
@@ -58,11 +60,8 @@ Kirigami.Page {
 
 
 
-    KQuickImageEditor.ImageItem {
+    contentItem: KQuickImageEditor.ImageItem {
         id: editImage
-        // Assigning this to the contentItem and setting the padding causes weird positioning issues
-        anchors.fill: parent
-        anchors.margins: Kirigami.Units.gridUnit
         fillMode: KQuickImageEditor.ImageItem.PreserveAspectFit
         image: imageDoc.image
 
@@ -79,41 +78,12 @@ Kirigami.Page {
         Shortcut {
             sequence: StandardKey.SaveAs
             onActivated: saveAsAction.trigger();
-        }
+        }    anchors.fill: parent
 
         KQuickImageEditor.ImageDocument {
             id: imageDoc
             path: rootEditorView.imagePath
         }
-
-        KQuickImageEditor.SelectionTool {
-            id: selectionTool
-            visible: rootEditorView.resizing
-            width: editImage.paintedWidth
-            height: editImage.paintedHeight
-            x: editImage.horizontalPadding
-            y: editImage.verticalPadding
-            KQuickImageEditor.CropBackground {
-                anchors.fill: parent
-                z: -1
-                insideX: selectionTool.selectionX
-                insideY: selectionTool.selectionY
-                insideWidth: selectionTool.selectionWidth
-                insideHeight: selectionTool.selectionHeight
-            }
-            Connections {
-                target: selectionTool.selectionArea
-                function onDoubleClicked() {
-                    rootEditorView.crop()
-                }
-            }
-        }
-        onImageChanged: {
-            selectionTool.selectionX = 0
-            selectionTool.selectionY = 0
-            selectionTool.selectionWidth = Qt.binding(() => selectionTool.width)
-            selectionTool.selectionHeight = Qt.binding(() => selectionTool.height)
-        }
     }
 
     header: QQC2.ToolBar {
@@ -124,18 +94,7 @@ Kirigami.Page {
                 Kirigami.Action {
                     iconName: rootEditorView.resizing ? "dialog-cancel" : "transform-crop"
                     text: rootEditorView.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop");
-                    onTriggered: {
-                        resizeRectangle.width = editImage.paintedWidth
-                        resizeRectangle.height = editImage.paintedHeight
-                        resizeRectangle.x = editImage.horizontalPadding
-                        resizeRectangle.y = editImage.verticalPadding
-                        resizeRectangle.insideX = 100
-                        resizeRectangle.insideY = 100
-                        resizeRectangle.insideWidth = 100
-                        resizeRectangle.insideHeight = 100
-
-                        rootEditorView.resizing = !rootEditorView.resizing;
-                    }
+                    onTriggered: rootEditorView.resizing = !rootEditorView.resizing;
                 },
                 Kirigami.Action {
                     iconName: "dialog-ok"
@@ -177,4 +136,40 @@ Kirigami.Page {
         showCloseButton: true
         visible: false
     }
+
+    KQuickImageEditor.ResizeRectangle {
+        id: resizeRectangle
+
+        visible: rootEditorView.resizing
+
+        width: editImage.paintedWidth
+        height: editImage.paintedHeight
+        x: 0
+        y: editImage.verticalPadding
+
+        insideX: 100
+        insideY: 100
+        insideWidth: 100
+        insideHeight: 100
+
+        onAcceptSize: rootEditorView.crop();
+
+        //resizeHandle: KQuickImageEditor.BasicResizeHandle { }
+
+        /*Rectangle {
+            radius: 2
+            width: Kirigami.Units.gridUnit * 8
+            height: Kirigami.Units.gridUnit * 3
+            anchors.centerIn: parent
+            Kirigami.Theme.colorSet: Kirigami.Theme.View
+            color: Kirigami.Theme.backgroundColor
+            QQC2.Label {
+                anchors.centerIn: parent
+                text: "x: " + (resizeRectangle.x - rootEditorView.contentItem.width + editImage.paintedWidth)
+                    + " y: " +  (resizeRectangle.y - rootEditorView.contentItem.height + editImage.paintedHeight)
+                    + "\nwidth: " + resizeRectangle.width
+                    + " height: " + resizeRectangle.height
+            }
+        }*/
+    }
 }

imports/NeoChat/Page/InviteUserPage.qml

@@ -1,11 +1,12 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.14 as Kirigami
 
 import org.kde.neochat 1.0
 

imports/NeoChat/Page/JoinRoomPage.qml

@@ -1,14 +1,19 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component 1.0
+import NeoChat.Setting 1.0
+
+import org.kde.neochat 1.0
 
 Kirigami.ScrollablePage {
     id: root
@@ -19,19 +24,18 @@ Kirigami.ScrollablePage {
 
     title: i18n("Explore Rooms")
 
-    Component.onCompleted: identifierField.forceActiveFocus()
-
     header: Control {
         padding: Kirigami.Units.largeSpacing
         contentItem: RowLayout {
             Kirigami.SearchField {
-                id: identifierField
                 property bool isRoomAlias: text.match(/#(.+):(.+)/g)
                 property var room: isRoomAlias ? connection.roomByAlias(text) : null
                 property bool isJoined: room != null
 
                 Layout.fillWidth: true
 
+                id: identifierField
+
                 placeholderText: i18n("Find a room...")
             }
 
@@ -45,7 +49,7 @@ Kirigami.ScrollablePage {
 
                 onClicked: {
                     if (!identifierField.isJoined) {
-                        Controller.joinRoom(identifierField.text);
+                        roomManager.actionsHandler.joinRoom(identifierField.text);
                         // When joining the room, the room will be opened
                     }
                     applicationWindow().pageStack.layers.pop();
@@ -98,17 +102,17 @@ Kirigami.ScrollablePage {
             width: publicRoomsListView.width
             onClicked: {
                 if (!isJoined) {
-                    Controller.joinRoom(roomID)
+                    roomManager.actionsHandler.joinRoom(connection, roomID)
                     justJoined = true;
                 } else {
-                    RoomManager.enterRoom(connection.room(roomID))
+                    roomManager.enterRoom(connection.room(roomID))
                 }
                 applicationWindow().pageStack.layers.pop();
             }
             contentItem: RowLayout {
                 Kirigami.Avatar {
-                    Layout.preferredWidth: Kirigami.Units.gridUnit * 2
-                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.normal
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.normal
 
                     source: model.avatar ? ("image://mxc/" + model.avatar) : ""
                     name: name

imports/NeoChat/Page/LoadingPage.qml

@@ -1,8 +1,10 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick.Controls 2.12 as QQC2
+/**
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.12 as QQC2
 
 Kirigami.Page {
     title: i18n("Loading")

imports/NeoChat/Page/RoomListPage.qml

@@ -1,55 +1,25 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Layouts 1.12
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml.Models 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.13 as Kirigami
 import org.kde.kitemmodels 1.0
-
 import org.kde.neochat 1.0
+
 import NeoChat.Component 1.0
 import NeoChat.Menu 1.0
 
 Kirigami.ScrollablePage {
     id: page
 
-    title: i18n("Rooms")
-
     property var enteredRoom
-    property bool collapsedMode: Config.roomListPageWidth === applicationWindow().collapsedPageWidth && applicationWindow().shouldUseSidebars
-
-    onCollapsedModeChanged: if (collapsedMode) {
-        sortFilterRoomListModel.filterText = "";
-        if (page.contentItem && page.contentItem.flickableItem && page.contentItem.flickableItem.QQC2.ScrollBar.vertical) {
-            page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = false;
-        }
-    } else {
-        page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = true;
-    }
-
-    // HACK: the scrollbar is created with a 0 timer, so we need to set the visible flag
-    // after it has been created
-    Timer {
-        running: true
-        interval: 200 
-        onTriggered: page.contentItem.flickableItem.QQC2.ScrollBar.vertical.visible = !collapsedMode;
-    }
-
-    Connections {
-        target: RoomManager
-        function onCurrentRoomChanged() {
-            itemSelection.setCurrentIndex(roomListModel.index(roomListModel.indexForRoom(RoomManager.currentRoom), 0), ItemSelectionModel.SelectCurrent)
-        }
-    }
-
-    actions.main: Kirigami.Action {
-        text: i18n("New room")
-        icon.name: "list-add"
-    }
+    required property var activeConnection
 
     function goToNextRoom() {
         do {
@@ -65,56 +35,19 @@ Kirigami.ScrollablePage {
         listView.currentItem.action.trigger();
     }
 
-    titleDelegate: collapsedMode ? empty : searchField
+    title: i18n("Rooms")
 
-    Component {
-        id: empty
-        Item {}
+    titleDelegate: Kirigami.SearchField {
+        Layout.topMargin: Kirigami.Units.smallSpacing
+        Layout.bottomMargin: Kirigami.Units.smallSpacing
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+        onTextChanged: sortFilterRoomListModel.filterText = text
+        KeyNavigation.tab: listView
     }
 
-    Component {
-        id: searchField
-        Kirigami.SearchField {
-            Layout.margins: Kirigami.Units.smallSpacing
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            onTextChanged: sortFilterRoomListModel.filterText = text
-            KeyNavigation.tab: listView
-        }
-    }
-
-    header: QQC2.ItemDelegate {
-        visible: page.collapsedMode
-        action: Kirigami.Action {
-            id: enterRoomAction
-            onTriggered: quickView.item.open();
-        }
-        topPadding: Kirigami.Units.largeSpacing
-        leftPadding: Kirigami.Units.largeSpacing
-        rightPadding: Kirigami.Units.largeSpacing
-        bottomPadding: Kirigami.Units.largeSpacing
-        width: visible ? page.width : 0
-        height: visible ? Kirigami.Units.gridUnit * 2 : 0
-
-        Kirigami.Icon {
-            anchors.centerIn: parent
-            width: 22
-            height: 22
-            source: "search"
-        }
-        Kirigami.Separator {
-            width: parent.width
-            anchors.bottom: parent.bottom
-        }
-    }
-
-
     ListView {
         id: listView
-
-        activeFocusOnTab: true
-        clip: accountList.count > 1
-
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
             width: parent.width - (Kirigami.Units.largeSpacing * 4)
@@ -123,38 +56,21 @@ Kirigami.ScrollablePage {
             helpfulAction: Kirigami.Action {
                 icon.name: sortFilterRoomListModel.filterText.length > 0 ? "search" : "list-add"
                 text: sortFilterRoomListModel.filterText.length > 0 ? i18n("Search in room directory") : i18n("Explore rooms")
-                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {
-                    connection: Controller.activeConnection,
-                    keyword: sortFilterRoomListModel.filterText
-                })
+                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": activeConnection, "keyword": sortFilterRoomListModel.filterText})
             }
         }
-
-
-        ItemSelectionModel {
-            id: itemSelection
-            model: roomListModel
-            onCurrentChanged: {
-                listView.currentIndex = sortFilterRoomListModel.mapFromSource(current).row
-            }
-        }
-
-        model: SortFilterRoomListModel {
+        model:  SortFilterRoomListModel {
             id: sortFilterRoomListModel
             sourceModel: RoomListModel {
                 id: roomListModel
-                connection: Controller.activeConnection
+                connection: page.activeConnection
             }
             roomSortOrder: Config.mergeRoomList ? SortFilterRoomListModel.LastActivity : SortFilterRoomListModel.Categories
-            onLayoutChanged: {
-                listView.currentIndex = sortFilterRoomListModel.mapFromSource(itemSelection.currentIndex).row
-            }
         }
 
         section.property: sortFilterRoomListModel.filterText.length === 0 && !Config.mergeRoomList ? "category" : null
         section.delegate: Kirigami.ListSectionHeader {
             id: sectionHeader
-            height: implicitHeight
             action: Kirigami.Action {
                 onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
             }
@@ -165,160 +81,98 @@ Kirigami.ScrollablePage {
                     level: 3
                     text: roomListModel.categoryName(section)
                     Layout.fillWidth: true
-                    elide: Text.ElideRight
-                    visible: !page.collapsedMode
                 }
                 Kirigami.Icon {
-                    source: page.collapsedMode ? roomListModel.categoryIconName(section) : (roomListModel.categoryVisible(section) ? "go-up" : "go-down")
+                    source: roomListModel.categoryVisible(section) ? "go-up" : "go-down"
                     implicitHeight: Kirigami.Units.iconSizes.small
                     implicitWidth: Kirigami.Units.iconSizes.small
-                    Layout.alignment: Qt.AlignHCenter
                 }
             }
         }
 
-        reuseItems: true
-        currentIndex: -1 // we don't want any room highlighted by default
+        delegate: Kirigami.BasicListItem {
+            id: roomListItem
+            visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList
+            focus: true
+            icon: undefined
+            action: Kirigami.Action {
+                id: enterRoomAction
+                onTriggered: {
+                    var roomItem = roomManager.enterRoom(currentRoom)
+                    roomListItem.KeyNavigation.right = roomItem
+                    roomItem.focus = true;
+                }
+            }
 
-        delegate: page.collapsedMode ? collapsedModeListComponent : normalModeListComponent
+            label: name ?? ""
+            subtitle: {
+                let txt = (lastEvent == "" ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm," ")
+                if (txt.length) {
+                    return txt
+                }
+                return " "
+            }
 
-        Component {
-            id: collapsedModeListComponent
+            leading: Kirigami.Avatar {
+                source: avatar ? "image://mxc/" + avatar : ""
+                name: model.name || i18n("No Name")
+                implicitWidth: height
+            }
 
-            QQC2.ItemDelegate {
-                action: Kirigami.Action {
-                    id: enterRoomAction
-                    onTriggered: {
-                        RoomManager.enterRoom(currentRoom);
+            trailing: RowLayout {
+                QQC2.Label {
+                    text: notificationCount
+                    visible: notificationCount > 0
+                    padding: Kirigami.Units.smallSpacing
+                    color: highlightCount > 0 ? "white" : Kirigami.Theme.textColor
+                    Layout.minimumWidth: height
+                    horizontalAlignment: Text.AlignHCenter
+                    background: Rectangle {
+                        Kirigami.Theme.colorSet: Kirigami.Theme.Button
+                        color: highlightCount > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                        radius: height / 2
                     }
                 }
-                Keys.onEnterPressed: enterRoomAction.trigger()
-                Keys.onReturnPressed: enterRoomAction.trigger()
-                topPadding: Kirigami.Units.largeSpacing
-                leftPadding: Kirigami.Units.largeSpacing
-                rightPadding: Kirigami.Units.largeSpacing
-                bottomPadding: Kirigami.Units.largeSpacing
-                width: ListView.view.width
-                height: ListView.view.width
+                QQC2.Button {
+                    id: configButton
+                    visible: roomListItem.hovered || Kirigami.Settings.isMobile
+                    Accessible.name: i18n("Configure room")
 
-                contentItem: Kirigami.Avatar {
-                    source: avatar ? "image://mxc/" + avatar : ""
-                    name: model.name || i18n("No Name")
-                    sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                    sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                }
-
-                QQC2.ToolTip {
-                    enabled: text.length !== 0
-                    text: name ?? ""
+                    action: Kirigami.Action {
+                        id: optionAction
+                        icon.name: "configure"
+                        onTriggered: {
+                            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.popup()
+                        }
+                    }
                 }
             }
         }
-
         Component {
             id: roomListContextMenu
             RoomListContextMenu {}
         }
-
-        Component {
-            id: normalModeListComponent
-            Kirigami.BasicListItem {
-                id: roomListItem
-                visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList
-                topPadding: Kirigami.Units.largeSpacing
-                bottomPadding: Kirigami.Units.largeSpacing
-                highlighted: listView.currentIndex === index
-                focus: true
-                icon: undefined
-                action: Kirigami.Action {
-                    id: enterRoomAction
-                    onTriggered: {
-                        RoomManager.enterRoom(currentRoom);
-                    }
-                }
-                Keys.onEnterPressed: enterRoomAction.trigger()
-                Keys.onReturnPressed: enterRoomAction.trigger()
-                bold: unreadCount > 0
-                label: name ?? ""
-                subtitle: {
-                    let txt = (lastEvent.length === 0 ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm, " ")
-                    if (txt.length) {
-                        return txt
-                    }
-                    return " "
-                }
-
-                leading: Kirigami.Avatar {
-                    source: avatar ? "image://mxc/" + avatar : ""
-                    name: model.name || i18n("No Name")
-                    implicitWidth: visible ? height : 0
-                    visible: Config.showAvatarInTimeline
-                    sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                    sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                }
-
-                trailing: RowLayout {
-                    QQC2.Label {
-                        text: notificationCount
-                        visible: notificationCount > 0
-                        padding: Kirigami.Units.smallSpacing
-                        color: highlightCount > 0 ? "white" : Kirigami.Theme.textColor
-                        Layout.minimumWidth: height
-                        horizontalAlignment: Text.AlignHCenter
-                        background: Rectangle {
-                            Kirigami.Theme.colorSet: Kirigami.Theme.Button
-                            color: highlightCount > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
-                            radius: height / 2
-                        }
-                    }
-                    QQC2.Button {
-                        id: configButton
-                        visible: roomListItem.hovered || Kirigami.Settings.isMobile
-                        Accessible.name: i18n("Configure room")
-                        flat: true
-
-                        action: Kirigami.Action {
-                            id: optionAction
-                            icon.name: "configure"
-                            onTriggered: {
-                                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.popup()
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
 
-    footer: QQC2.ToolBar {
-        visible: accountList.count > 1 && !collapsedMode
-        height: visible ? implicitHeight : 0
-        leftPadding: 0
-        rightPadding: 0
-        topPadding: 0
-        bottomPadding: 0
-        contentItem: RowLayout {
-            spacing: 0
-            Repeater {
-                id: accountList
-                model: AccountListModel {
-                    id: accountListModel
-                }
-                delegate: Kirigami.BasicListItem {
-                    checkable: true
-                    checked: Controller.activeConnection && Controller.activeConnection.localUser.id === model.user.id
-                    onClicked: Controller.activeConnection = model.connection
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    text: model.user.id
-                }
+    footer: RowLayout {
+        visible: accountListTab.count > 1
+        height: visible ? accountListTab.implicitHeight : 0
+        Repeater {
+            id: accountListTab
+            model: AccountListModel { }
+            delegate: QQC2.TabButton {
+                checkable: true
+                checked: Controller.activeConnection.user.id === model.connection.user.id
+                onClicked: Controller.activeConnection = model.connection
+                Layout.fillWidth: true
+                text: model.user.id
             }
         }
     }

imports/NeoChat/Page/RoomWindow.qml

@@ -1,11 +1,13 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
+/**
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12 as QQC2
+import QtQuick.Window 2.2
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.14 as Kirigami
 
 Kirigami.ApplicationWindow {
     id: window

imports/NeoChat/Page/SettingsPage.qml

@@ -1,88 +1,74 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: LGPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as QQC2
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Settings 1.0
 
 Kirigami.ScrollablePage {
     title: i18n("Settings")
-    bottomPadding: 0
-    leftPadding: 0
-    rightPadding: 0
-    topPadding: 0
 
-    onBackRequested: {
-        if (pageSettingStack.depth > 1 && !pageSettingStack.wideMode && pageSettingStack.currentIndex !== 0) {
-            event.accepted = true;
-            pageSettingStack.pop();
+    Kirigami.FormLayout {
+        QQC2.CheckBox {
+            Kirigami.FormData.label: i18n("General settings:")
+            text: i18n("Close to system tray")
+            checked: Config.systemTray
+            onToggled: {
+                Config.systemTray = checked
+                Config.save()
+            }
         }
-    }
-
-    Kirigami.PageRow {
-        id: pageSettingStack
-        anchors.fill: parent
-        columnView.columnWidth: Kirigami.Units.gridUnit * 12
-        initialPage: Kirigami.ScrollablePage {
-            bottomPadding: 0
-            leftPadding: 0
-            rightPadding: 0
-            topPadding: 0
-            Kirigami.Theme.colorSet: Kirigami.Theme.View
-            ListView {
-                Component.onCompleted: if (pageSettingStack.wideMode) {
-                    actions[0].trigger();
-                }
-                property list<Kirigami.Action> actions: [
-                    Kirigami.Action {
-                        text: i18n("General")
-                        icon.name: "org.kde.neochat"
-                        onTriggered: pageSettingStack.push("qrc:/imports/NeoChat/Settings/GeneralSettingsPage.qml")
-                    },
-                    Kirigami.Action {
-                        text: i18n("Appearance")
-                        icon.name: "preferences-desktop-theme-global"
-                        onTriggered: pageSettingStack.push("qrc:/imports/NeoChat/Settings/AppearanceSettingsPage.qml")
-                    },
-                    Kirigami.Action {
-                        text: i18n("Accounts")
-                        icon.name: "preferences-system-users"
-                        onTriggered: pageSettingStack.push("qrc:/imports/NeoChat/Page/AccountsPage.qml")
-                    },
-                    Kirigami.Action {
-                        text: i18n("Custom Emoji")
-                        icon.name: "preferences-desktop-emoticons"
-                        onTriggered: pageSettingStack.push("qrc:/imports/NeoChat/Settings/Emoticons.qml")
-                    },
-                    Kirigami.Action {
-                        text: i18n("Devices")
-                        iconName: "network-connect"
-                        onTriggered: pageSettingStack.push("qrc:/imports/NeoChat/Page/DevicesPage.qml")
-                    },
-                    Kirigami.Action {
-                        text: i18n("About NeoChat")
-                        icon.name: "help-about"
-                        onTriggered: pageSettingStack.push(aboutPage)
-                    }
-                ]
-                model: actions
-                delegate: Kirigami.BasicListItem {
-                    action: modelData
-                }
+        QQC2.CheckBox {
+            // TODO: When there are enough notification and timeline event
+            // settings, make 2 separate groups with FormData labels.
+            Kirigami.FormData.label: i18n("Notifications and events:")
+            text: i18n("Show notifications")
+            checked: Config.showNotifications
+            onToggled: {
+                Config.showNotifications = checked
+                Config.save()
+            }
+        }
+        QQC2.CheckBox {
+            text: i18n("Show leave and join events")
+            checked: Config.showLeaveJoinEvent
+            onToggled: {
+                Config.showLeaveJoinEvent = checked
+                Config.save()
+            }
+        }
+        QQC2.RadioButton {
+            Kirigami.FormData.label: i18n("Rooms and private chats:")
+            text: i18n("Separated")
+            checked: !Config.mergeRoomList
+            onToggled: {
+                Config.mergeRoomList = false
+                Config.save()
+            }
+        }
+        QQC2.RadioButton {
+            text: i18n("Intermixed")
+            checked: Config.mergeRoomList
+            onToggled: {
+                Config.mergeRoomList = true
+                Config.save()
+            }
+        }
+        QQC2.CheckBox {
+            Kirigami.FormData.label: i18n("Timeline:")
+            text: i18n("Show User Avatar")
+            checked: Config.showAvatarInTimeline
+            onToggled: {
+                Config.showAvatarInTimeline = checked
+                Config.save()
             }
         }
     }
-
-    Component {
-        id: aboutPage
-        Kirigami.AboutPage {
-            aboutData: Controller.aboutData
-        }
-    }
 }

imports/NeoChat/Page/StartChatPage.qml

@@ -1,15 +1,18 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import org.kde.kirigami 2.14 as Kirigami
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
+import NeoChat.Component 1.0
+import NeoChat.Setting 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.ScrollablePage {
     id: root

imports/NeoChat/Page/WelcomePage.qml

@@ -1,13 +1,17 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
+
 import NeoChat.Component.Login 1.0
 
 Kirigami.ScrollablePage {
@@ -30,7 +34,7 @@ Kirigami.ScrollablePage {
 
     Connections {
         target: LoginHelper
-        function onErrorOccured(message) {
+        onErrorOccured: {
             headerMessage.text = message;
             headerMessage.visible = true;
             headerMessage.type = Kirigami.MessageType.Error;

imports/NeoChat/Panel/RoomDrawer.qml

@@ -1,22 +1,26 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Layouts 1.12
 
-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.kirigami 2.13 as Kirigami
 import org.kde.kitemmodels 1.0
 
-import org.kde.neochat 1.0
 import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
+import NeoChat.Setting 1.0
 
+import org.kde.neochat 1.0
 
 Kirigami.OverlayDrawer {
     id: roomDrawer
-    readonly property var room: RoomManager.currentRoom
+    property var room
 
     enabled: true
 
@@ -26,222 +30,214 @@ Kirigami.OverlayDrawer {
     leftPadding: 0
     rightPadding: 0
     Kirigami.Theme.colorSet: Kirigami.Theme.View
-    contentItem: Loader {
-        active: roomDrawer.drawerOpen
-        sourceComponent: ColumnLayout {
-            id: columnLayout
-            anchors.fill: parent
-            spacing: 0
-            Kirigami.AbstractApplicationHeader {
-                Layout.fillWidth: true
-                topPadding: Kirigami.Units.smallSpacing / 2;
-                bottomPadding: Kirigami.Units.smallSpacing / 2;
-                rightPadding: Kirigami.Units.smallSpacing
-                leftPadding: Kirigami.Units.smallSpacing
+    contentItem: ColumnLayout {
+        id: columnLayout
+        spacing: 0
+        Kirigami.AbstractApplicationHeader {
+            Layout.fillWidth: true
+            topPadding: Kirigami.Units.smallSpacing / 2;
+            bottomPadding: Kirigami.Units.smallSpacing / 2;
+            rightPadding: Kirigami.Units.smallSpacing
+            leftPadding: Kirigami.Units.smallSpacing
 
-                RowLayout {
-                    anchors.fill: parent
-                    spacing: 0
+            RowLayout {
+                anchors.fill: parent
+                spacing: 0
 
-                    ToolButton {
-                        icon.name: "list-add-user"
-                        text: i18n("Invite")
-                        onClicked: {
-                            applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {"room": room})
+                ToolButton {
+                    icon.name: "list-add-user"
+                    text: i18n("Invite")
+                    onClicked: {
+                        applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {"room": room})
+                        roomDrawer.close();
+                    }
+                }
+                Item {
+                    // HACK otherwise rating item is not right aligned
+                    Layout.fillWidth: true
+                }
+
+                ToolButton {
+                    Layout.alignment: Qt.AlignRight
+                    icon.name: room.isFavourite ? "rating" : "rating-unrated"
+                    checkable: true
+                    checked: room.isFavourite
+                    onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+                    ToolTip {
+                        text: room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
+                    }
+                }
+                ToolButton {
+                    Layout.alignment: Qt.AlignRight
+                    icon.name: 'settings-configure'
+                    onClicked: {
+                        roomSettingDialog.createObject(ApplicationWindow.overlay, {"room": room}).open()
+                        if (!wideScreen) {
                             roomDrawer.close();
                         }
                     }
-                    Item {
-                        // HACK otherwise rating item is not right aligned
-                        Layout.fillWidth: true
-                    }
 
-                    ToolButton {
-                        Layout.alignment: Qt.AlignRight
-                        icon.name: room && room.isFavourite ? "rating" : "rating-unrated"
-                        checkable: true
-                        checked: room && room.isFavourite
-                        onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
-                        ToolTip {
-                            text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
-                        }
-                    }
-                    ToolButton {
-                        Layout.alignment: Qt.AlignRight
-                        icon.name: 'settings-configure'
-                        onClicked: {
-                            roomSettingDialog.createObject(ApplicationWindow.overlay, {"room": room}).open()
-                            if (!wideScreen) {
-                                roomDrawer.close();
-                            }
-                        }
-
-                        ToolTip {
-                            text: i18n("Room settings")
-                        }
+                    ToolTip {
+                        text: i18n("Room settings")
                     }
                 }
             }
+        }
 
-            Control {
+        Control {
+            Layout.fillWidth: true
+            bottomPadding: Kirigami.Units.largeSpacing
+            contentItem: ColumnLayout {
+                id: infoLayout
                 Layout.fillWidth: true
-                padding: Kirigami.Units.largeSpacing
-                contentItem: ColumnLayout {
-                    id: infoLayout
+                Kirigami.Heading {
+                    text: i18n("Room information")
+                    level: 3
+                }
+                RowLayout {
                     Layout.fillWidth: true
-                    Kirigami.Heading {
-                        text: i18n("Room information")
-                        level: 3
+                    Layout.margins: Kirigami.Units.largeSpacing
+
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Kirigami.Avatar {
+                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
+
+                        name: room ? room.name : i18n("No name")
+                        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
                     }
-                    RowLayout {
+
+                    ColumnLayout {
                         Layout.fillWidth: true
-                        Layout.margins: Kirigami.Units.largeSpacing
+                        Layout.alignment: Qt.AlignVCenter
+                        spacing: 0
 
-                        spacing: Kirigami.Units.largeSpacing
-
-                        Kirigami.Avatar {
-                            Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
-                            Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
-
-                            name: room ? room.name : i18n("No name")
-                            source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
-                        }
-
-                        ColumnLayout {
+                        Kirigami.Heading {
+                            Layout.maximumWidth: Kirigami.Units.gridUnit * 9
                             Layout.fillWidth: true
-                            Layout.alignment: Qt.AlignVCenter
-                            spacing: 0
-
-                            Kirigami.Heading {
-                                Layout.maximumWidth: Kirigami.Units.gridUnit * 9
-                                Layout.fillWidth: true
-                                level: 1
-                                font.bold: true
-                                wrapMode: Label.Wrap
-                                text: room ? room.displayName : i18n("No name")
-                            }
-                            Label {
-                                Layout.fillWidth: true
-                                text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
-                            }
+                            level: 1
+                            font.bold: true
+                            wrapMode: Label.Wrap
+                            text: room ? room.displayName : i18n("No name")
                         }
-                    }
-
-                    TextEdit {
-                        Layout.maximumWidth: Kirigami.Units.gridUnit * 13
-                        Layout.preferredWidth: Kirigami.Units.gridUnit * 13
-                        Layout.fillWidth: true
-                        text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
-                        readonly property var replaceLinks: /\(https:\/\/[^ ]*\)/
-                        textFormat: TextEdit.MarkdownText
-                        wrapMode: Text.WordWrap
-                        selectByMouse: true
-                        color: Kirigami.Theme.textColor
-                        onLinkActivated: Qt.openUrlExternally(link)
-                        readOnly: true
-                        MouseArea {
-                            anchors.fill: parent
-                            acceptedButtons: Qt.NoButton
-                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+                        Label {
+                            Layout.fillWidth: true
+                            text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
                         }
                     }
                 }
-            }
 
-            Kirigami.ListSectionHeader {
-                label: i18n("Members")
-                activeFocusOnTab: false
-                Label {
-                    Layout.alignment: Qt.AlignRight
-                    text: room ? i18np("%1 Member", "%1 Members", room.totalMemberCount) : i18n("No Member Count")
+                TextEdit {
+                    Layout.maximumWidth: Kirigami.Units.gridUnit * 13
+                    Layout.preferredWidth: Kirigami.Units.gridUnit * 13
+                    Layout.fillWidth: true
+                    text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
+                    readonly property var replaceLinks: /\(https:\/\/[^ ]*\)/
+                    textFormat: TextEdit.MarkdownText
+                    wrapMode: Text.WordWrap
+                    selectByMouse: true
+                    color: Kirigami.Theme.textColor
+                    onLinkActivated: Qt.openUrlExternally(link)
+                    readOnly: true
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+                    }
                 }
             }
+        }
 
-            Pane {
-                padding: Kirigami.Units.smallSpacing
-                implicitWidth: parent.width
-                z: 2
-                contentItem: Kirigami.SearchField {
-                    id: userListSearchField
-                    onAccepted: sortedMessageEventModel.filterString = text;
-                }
+        Kirigami.ListSectionHeader {
+            label: i18n("Members")
+            Label {
+                Layout.alignment: Qt.AlignRight
+                text: room ? i18np("%1 Member", "%1 Members", room.totalMemberCount) : i18n("No Member Count")
             }
+        }
 
-            ScrollView {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
+        ScrollView {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
 
-                ListView {
-                    id: userListView
-                    clip: true
-                    headerPositioning: ListView.OverlayHeader
-                    boundsBehavior: Flickable.DragOverBounds
-                    activeFocusOnTab: true
+            ListView {
+                id: userListView
+                clip: true
+                headerPositioning: ListView.OverlayHeader
+                boundsBehavior: Flickable.DragOverBounds
 
-                    model: KSortFilterProxyModel {
-                        id: sortedMessageEventModel
+                header: Pane {
+                    padding: Kirigami.Units.smallSpacing
+                    implicitWidth: parent.width
+                    z: 2
+                    contentItem: Kirigami.SearchField {
+                        id: userListSearchField
+                        onTextChanged: sortedMessageEventModel.filterString = text;
+                    }
+                }
 
-                        sourceModel: UserListModel {
-                            room: roomDrawer.room
-                        }
+                model: KSortFilterProxyModel {
+                    id: sortedMessageEventModel
 
-                        sortRole: "perm"
-                        filterRole: "name"
+                    sourceModel: UserListModel {
+                        room: roomDrawer.room
                     }
 
-                    delegate: Kirigami.AbstractListItem {
-                        width: userListView.width
-                        implicitHeight: Kirigami.Units.gridUnit * 2
-                        z: 1
+                    sortRole: "perm"
+                    filterRole: "name"
+                }
 
-                        contentItem: RowLayout {
-                            Kirigami.Avatar {
-                                Layout.preferredWidth: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                Layout.preferredHeight: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                visible: Config.showAvatarInRoomDrawer
-                                sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                source: avatar ? ("image://mxc/" + avatar) : ""
-                                name: name
-                            }
+                delegate: Kirigami.AbstractListItem {
+                    width: userListView.width
+                    implicitHeight: Kirigami.Units.gridUnit * 2
+                    z: 1
 
-                            Label {
-                                Layout.fillWidth: true
+                    contentItem: RowLayout {
+                        Kirigami.Avatar {
+                            Layout.preferredWidth: height
+                            Layout.fillHeight: true
 
-                                text: name
-                                textFormat: Text.PlainText
-                                elide: Text.ElideRight
-                                wrapMode: Text.NoWrap
-                            }
+                            source: avatar ? ("image://mxc/" + avatar) : ""
+                            name: name
+                        }
 
-                            Label {
-                                visible: perm != UserType.Member
+                        Label {
+                            Layout.fillWidth: true
 
-                                text: {
-                                    if (perm == UserType.Owner) {
-                                        return i18n("Owner")
-                                    }
-                                    if (perm == UserType.Admin) {
-                                        return i18n("Admin")
-                                    }
-                                    if (perm == UserType.Moderator) {
-                                        return i18n("Mod")
-                                    }
-                                    if (perm == UserType.Muted) {
-                                        return i18n("Muted")
-                                    }
-                                    return ""
+                            text: name
+                            textFormat: Text.PlainText
+                            elide: Text.ElideRight
+                            wrapMode: Text.NoWrap
+                        }
+
+                        Label {
+                            visible: perm != UserType.Member
+
+                            text: {
+                                if (perm == UserType.Owner) {
+                                    return i18n("Owner")
                                 }
-                                color: Kirigami.Theme.disabledTextColor
-                                font.pixelSize: 12
-                                textFormat: Text.PlainText
-                                wrapMode: Text.NoWrap
+                                if (perm == UserType.Admin) {
+                                    return i18n("Admin")
+                                }
+                                if (perm == UserType.Moderator) {
+                                    return i18n("Mod")
+                                }
+                                if (perm == UserType.Muted) {
+                                    return i18n("Muted")
+                                }
+                                return ""
                             }
+                            color: Kirigami.Theme.disabledTextColor
+                            font.pixelSize: 12
+                            textFormat: Text.PlainText
+                            wrapMode: Text.NoWrap
                         }
+                    }
 
-                        action: Kirigami.Action {
-                            onTriggered: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": room, "user": user, "displayName": name, "avatarMediaId": avatar}).open()
-                        }
+                    action: Kirigami.Action {
+                        onTriggered: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": room, "user": user, "displayName": name, "avatarMediaId": avatar}).open()
                     }
                 }
             }

imports/NeoChat/Setting/Palette.qml

@@ -0,0 +1,19 @@
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+pragma Singleton
+import QtQuick 2.12
+import QtQuick.Controls.Material 2.12
+
+QtObject {
+    readonly property int theme: MSettings.darkTheme ? Material.Dark : Material.Light
+
+    readonly property color primary: "#344955"
+    readonly property color accent: "#4286F5"
+    readonly property color foreground: MSettings.darkTheme ? "#FFFFFF" : "#1D333E"
+    readonly property color background: MSettings.darkTheme ? "#303030" : "#FFFFFF"
+    readonly property color lighter: MSettings.darkTheme ? "#FFFFFF" : "#5B7480"
+    readonly property color banner: MSettings.darkTheme ? "#404040" : "#F2F3F4"
+}

imports/NeoChat/Setting/Setting.qml

@@ -0,0 +1,18 @@
+/**
+ * SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+pragma Singleton
+import QtQuick 2.12
+import Qt.labs.settings 1.0
+
+Settings {
+    property bool showNotification: true
+
+    property bool showTray: true
+
+    property bool darkTheme
+
+    property string fontFamily: "Roboto,Noto Sans,Noto Color Emoji"
+}

imports/NeoChat/Setting/qmldir

@@ -0,0 +1,3 @@
+module NeoChat.Setting
+singleton MSettings 1.0 Setting.qml
+singleton MPalette 1.0 Palette.qml

imports/NeoChat/Settings/AppearanceSettingsPage.qml

@@ -1,254 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-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.neochat 1.0
-import NeoChat.Settings 1.0
-
-Kirigami.ScrollablePage {
-    ColumnLayout {
-        RowLayout {
-            Layout.alignment: Qt.AlignCenter
-            spacing: Kirigami.Units.gridUnit * 2
-            QQC2.ButtonGroup { id: themeGroup }
-            ThemeRadioButton {
-                innerObject: [
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#4a5bcc"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        QQC2.Control {
-                            Layout.fillWidth: true
-                            contentItem: ColumnLayout {
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    font.weight: Font.Bold
-                                    font.pixelSize: 7
-                                    text: "Paul Müller"
-                                    color: "#4a5bcc"
-                                    wrapMode: Text.Wrap
-                                }
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
-                                    wrapMode: Text.Wrap
-                                    font.pixelSize: 7
-                                }
-                            }
-                            background: Kirigami.ShadowedRectangle {
-                                color: Kirigami.Theme.backgroundColor
-                                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
-                            }
-                        }
-                    },
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#9f244b"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        QQC2.Control {
-                            Layout.fillWidth: true
-                            contentItem: ColumnLayout {
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    font.weight: Font.Bold
-                                    font.pixelSize: 7
-                                    text: "Jean Paul"
-                                    color: "#9f244b"
-                                    wrapMode: Text.Wrap
-                                }
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta , quis sem suscipit tincidunt."
-                                    wrapMode: Text.Wrap
-                                    font.pixelSize: 7
-                                }
-                            }
-                            background: Kirigami.ShadowedRectangle {
-                                color: Kirigami.Theme.backgroundColor
-                                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
-                            }
-                        }
-                    }
-                ]
-
-                text: i18n("Bubbles")
-                checked: !Config.compactLayout
-                QQC2.ButtonGroup.group: themeGroup
-                enabled: !Config.isCompactLayoutImmutable
-
-                onToggled: {
-                    Config.compactLayout = !checked;
-                    Config.save();
-                }
-            }
-            ThemeRadioButton {
-                innerObject: [
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#4a5bcc"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        ColumnLayout {
-                            Layout.fillWidth: true
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                font.weight: Font.Bold
-                                font.pixelSize: 7
-                                text: "Paul Müller"
-                                color: "#4a5bcc"
-                                wrapMode: Text.Wrap
-                            }
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                text: "Lorem ipsum dolor sit amet, consectetur elit. Vivamus facilisis porta mauris, finibus sem suscipit tincidunt."
-                                wrapMode: Text.Wrap
-                                font.pixelSize: 7
-                            }
-                        }
-                    },
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#9f244b"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        ColumnLayout {
-                            Layout.fillWidth: true
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                font.weight: Font.Bold
-                                font.pixelSize: 7
-                                text: "Jean Paul"
-                                color: "#9f244b"
-                                wrapMode: Text.Wrap
-                            }
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
-                                wrapMode: Text.Wrap
-                                font.pixelSize: 7
-                            }
-                        }
-                    }
-                ]
-                text: i18n("Compact")
-                checked: Config.compactLayout
-                QQC2.ButtonGroup.group: themeGroup
-                enabled: !Config.isCompactLayoutImmutable
-
-                onToggled: {
-                    Config.compactLayout = checked;
-                    Config.save();
-                }
-            }
-        }
-        Kirigami.FormLayout {
-            QQC2.CheckBox {
-                Kirigami.FormData.label: "Show Avatar:"
-                text: i18n("In Chat")
-                checked: Config.showAvatarInTimeline
-                onToggled: {
-                    Config.showAvatarInTimeline = checked
-                    Config.save()
-                }
-                enabled: !Config.isShowAvatarInTimelineImmutable
-            }
-            QQC2.CheckBox {
-                text: i18n("In Sidebar")
-                checked: Config.showAvatarInRoomDrawer
-                enabled: !Config.isShowAvatarInRoomDrawerImmutable
-                onToggled: {
-                    Config.showAvatarInRoomDrawer = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show Fancy Effects")
-                checked: Config.showFancyEffects
-                enabled: !Config.isShowFancyEffectsImmutable
-                onToggled: {
-                    Config.showFancyEffects = checked;
-                    Config.save();
-                }
-            }
-            Loader {
-                visible: item !== null
-                Kirigami.FormData.label: item ? i18n("Theme:") : ""
-                source: "qrc:/imports/NeoChat/Settings/ColorScheme.qml"
-            }
-            QQC2.CheckBox {
-                visible: Controller.hasWindowSystem
-                text: i18n("Use transparent chat page")
-                enabled: !Config.compactLayout && !Config.isBlurImmutable
-                checked: Config.blur
-                onToggled: {
-                    Config.blur = checked;
-                    Config.save();
-                }
-            }
-            RowLayout {
-                visible: Controller.hasWindowSystem && Config.blur
-                enabled: !Config.isTransparancyImmutable
-                Kirigami.FormData.label: i18n("Transparency:")
-                QQC2.Slider {
-                    enabled: !Config.compactLayout && Config.blur
-                    from: 0
-                    to: 1
-                    stepSize: 0.05
-                    value: Config.transparency
-                    onMoved: {
-                        Config.transparency = value;
-                        Config.save();
-                    }
-
-                    HoverHandler { id: sliderHover }
-                    QQC2.ToolTip.visible: sliderHover.hovered && !enabled
-                    QQC2.ToolTip.text: i18n("Only enabled if the transparent chat page is enabled.")
-                }
-                QQC2.Label {
-                    text: Math.round(Config.transparency * 100) + "%"
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show your messages on the right")
-                checked: Config.showLocalMessagesOnRight
-                enabled: !Config.isShowLocalMessagesOnRightImmutable
-                onToggled: {
-                    Config.showLocalMessagesOnRight = checked
-                    Config.save()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/ColorScheme.qml

@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-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.neochat 1.0
-import NeoChat.Settings 1.0
-
-QQC2.ComboBox {
-    textRole: "display"
-    model: ColorSchemer.model
-    Component.onCompleted: currentIndex = ColorSchemer.indexForScheme(Config.colorScheme);
-    onActivated: {
-        ColorSchemer.apply(currentIndex);
-        Config.colorScheme = ColorSchemer.nameForIndex(currentIndex);
-        Config.save();
-    }
-}

imports/NeoChat/Settings/Emoticons.qml

@@ -1,155 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-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.neochat 1.0
-import NeoChat.Settings 1.0
-
-import NeoChat.Component 1.0 as Components
-import NeoChat.Dialog 1.0
-
-Kirigami.Page {
-
-    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
-
-    ColumnLayout {
-        id: column
-        anchors.fill: parent
-
-        Connections {
-            target: pageSettingStack
-            function onWideModeChanged() {
-                scroll.background.visible = pageSettingStack.wideMode
-            }
-        }
-
-        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)
-                    }
-                }
-            }
-        }
-
-        Loader {
-            active: pageSettingStack.wideMode
-            sourceComponent: addEmojiComponent
-            Layout.fillWidth: true
-        }
-    }
-
-    footer: QQC2.ToolBar {
-        id: toolbar
-        width: parent.width
-        visible: !pageSettingStack.wideMode
-        height: visible ? implicitHeight : 0
-        contentItem: Loader {
-            active: !pageSettingStack.wideMode
-            sourceComponent: addEmojiComponent
-        }
-    }
-
-    Component {
-        id: openFileDialog
-
-        OpenFileDialog {
-            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

@@ -1,78 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-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.neochat 1.0
-
-Kirigami.ScrollablePage {
-    ColumnLayout {
-        Kirigami.FormLayout {
-            QQC2.CheckBox {
-                Kirigami.FormData.label: i18n("General settings:")
-                text: i18n("Close to system tray")
-                checked: Config.systemTray
-                visible: Controller.supportSystemTray
-                enabled: !Config.isSystemTrayImmutable
-                onToggled: {
-                    Config.systemTray = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                // TODO: When there are enough notification and timeline event
-                // settings, make 2 separate groups with FormData labels.
-                Kirigami.FormData.label: i18n("Notifications and events:")
-                text: i18n("Show notifications")
-                checked: Config.showNotifications
-                enabled: !Config.isShowNotificationsImmutable
-                onToggled: {
-                    Config.showNotifications = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show leave and join events")
-                checked: Config.showLeaveJoinEvent
-                enabled: !Config.isShowLeaveJoinEventImmutable
-                onToggled: {
-                    Config.showLeaveJoinEvent = checked
-                    Config.save()
-                }
-            }
-            QQC2.RadioButton {
-                Kirigami.FormData.label: i18n("Rooms and private chats:")
-                text: i18n("Separated")
-                checked: !Config.mergeRoomList
-                enabled: !Config.isMergeRoomListImmutable
-                onToggled: {
-                    Config.mergeRoomList = false
-                    Config.save()
-                }
-            }
-            QQC2.RadioButton {
-                text: i18n("Intermixed")
-                checked: Config.mergeRoomList
-                enabled: !Config.isMergeRoomListImmutable
-                onToggled: {
-                    Config.mergeRoomList = true
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Use s/text/replacement syntax to edit your last message")
-                checked: Config.allowQuickEdit
-                enabled: !Config.isAllowQuickEditImmutable
-                onToggled: {
-                    Config.allowQuickEdit = checked
-                    Config.save()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/ThemeRadioButton.qml

@@ -1,65 +0,0 @@
-// Copyright 2021 Marco Martin <mart@kde.org>
-// Copyright 2018 Furkan Tokac <furkantokac34@gmail.com>
-// Copyright 2019 Nate Graham <nate@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-QQC2.RadioButton {
-    id: delegate
-
-    implicitWidth: contentItem.implicitWidth
-    implicitHeight: contentItem.implicitHeight
-
-    property alias innerObject: contentLayout.children
-
-    contentItem: ColumnLayout {
-        Kirigami.ShadowedRectangle {
-            implicitWidth: implicitHeight * 1.6
-            implicitHeight: Kirigami.Units.gridUnit * 6
-            radius: Kirigami.Units.smallSpacing
-            Kirigami.Theme.inherit: false
-            Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-            shadow.xOffset: 0
-            shadow.yOffset: 2
-            shadow.size: 10
-            shadow.color: Qt.rgba(0, 0, 0, 0.3)
-
-            color: {
-                if (delegate.checked) {
-                    return Kirigami.Theme.highlightColor;
-                } else if (delegate.hovered) {
-                    // Match appearance of hovered list items
-                    return Qt.rgba(Kirigami.Theme.highlightColor.r,
-                                Kirigami.Theme.highlightColor.g,
-                                Kirigami.Theme.highlightColor.b,
-                                0.5);
-                } else {
-                    return Kirigami.Theme.backgroundColor;
-                }
-            }
-            ColumnLayout {
-                id: contentLayout
-                anchors.fill: parent
-                anchors.margins: Kirigami.Units.smallSpacing
-                clip: true
-            }
-        }
-
-        QQC2.Label {
-            id: label
-            Layout.fillWidth: true
-            text: delegate.text
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-
-    indicator: Item {}
-    background: Item {}
-}
-
-

imports/NeoChat/Settings/qmldir

@@ -1,2 +0,0 @@
-module NeoChat.Settings
-ThemeRadioButton 1.0 ThemeRadioButton.qml

neochat.notifyrc

@@ -1,59 +1,48 @@
 [Global]
 IconName=org.kde.neochat
-Name=NeoChat
-Name[az]=NeoChat
-Name[ca]=NeoChat
-Name[ca@valencia]=NeoChat
-Name[cs]=NeoChat
-Name[de]=NeoChat
-Name[en_GB]=NeoChat
-Name[es]=NeoChat
-Name[eu]=NeoChat
-Name[fi]=NeoChat
-Name[fr]=NeoChat
-Name[hu]=NeoChat
+Name=Neochat
+Name[ca]=Neochat
+Name[ca@valencia]=Neochat
+Name[cs]=Neochat
+Name[da]=Neochat
+Name[de]=Neochat
+Name[en_GB]=Neochat
+Name[es]=Neochat
+Name[eu]=Neochat
+Name[fi]=Neochat
+Name[fr]=Neochat
+Name[hu]=Neochat
 Name[ia]=Neochat
-Name[it]=NeoChat
-Name[ko]=NeoChat
-Name[lt]=NeoChat
-Name[nl]=NeoChat
-Name[nn]=NeoChat
-Name[pa]=ਨਿਓ-ਚੈਟ
-Name[pl]=NeoChat
-Name[pt]=NeoChat
-Name[pt_BR]=NeoChat
-Name[ro]=NeoChat
-Name[sk]=NeoChat
-Name[sl]=NeoChat
-Name[sv]=NeoChat
-Name[ta]=நியோச்சாட்
-Name[uk]=NeoChat
-Name[x-test]=xxNeoChatxx
-Name[zh_CN]=NeoChat
+Name[it]=Neochat
+Name[nl]=Neochat
+Name[nn]=Neochat
+Name[pl]=Neochat
+Name[pt]=Neochat
+Name[pt_BR]=Neochat
+Name[ro]=Neochat
+Name[sk]=Neochat
+Name[sl]=Neochat
+Name[sv]=Neochat
+Name[uk]=Neochat
+Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
-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
+Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
+Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
 Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
 Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
-Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
-Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
+Comment[ia]=Un cliente per matrix, le protocollo de communication decentralisate
 Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato
-Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트
-Comment[lt]=Matrix decentralizuoto bendravimo protokolo kliento programa
 Comment[nl]=Een client voor matrix, het gedecentraliseerde communicatieprotocol
 Comment[nn]=Klient for Matrix, den desentraliserte lynmeldings­protokollen.
-Comment[pa]=ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewania się
-Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
 Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
-Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
 Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
@@ -63,7 +52,6 @@ Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 
 [Event/message]
 Name=New message
-Name[az]=Yeni ismarıc
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
@@ -76,11 +64,8 @@ Name[fr]=Nouveau message
 Name[hu]=Új üzenet
 Name[ia]=Nove message
 Name[it]=Nuovo messaggio
-Name[ko]=새 메시지
-Name[lt]=Nauja žinutė
 Name[nl]=Nieuw bericht
 Name[nn]=Ny melding
-Name[pa]=ਨਵਾਂ ਸੁਨੇਹਾ
 Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
@@ -88,12 +73,10 @@ Name[ro]=Mesaj nou
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
-Name[ta]=புதிய செய்தி
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
 Comment=There is a new message
-Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
 Comment[de]=Es ist eine neue Nachricht vorhanden
@@ -103,13 +86,10 @@ Comment[eu]=Mezu berri bat dago
 Comment[fi]=Saapui uusi viesti
 Comment[fr]=Il y a un nouveau message
 Comment[hu]=Új üzenet érkezett
-Comment[ia]=Il ha un nove message
+Comment[ia]=Isto es un nove message
 Comment[it]=È presente un nuovo messaggio
-Comment[ko]=새 메시지가 있음
-Comment[lt]=Yra nauja žinutė
 Comment[nl]=Er is een nieuw bericht
 Comment[nn]=Du har ei ny melding
-Comment[pa]=ਨਵਾਂ ਸੁਨੇਹਾ ਹੈ
 Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
@@ -117,7 +97,6 @@ Comment[ro]=Este un mesaj nou
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
-Comment[ta]=ஒரு புதிய செய்தி உள்ளது
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息

org.kde.neochat.appdata.xml

@@ -1,45 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  - SPDX-License-Identifier: CC0-1.0
-  - SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
- -->
 <component type="desktop">
   <id>org.kde.neochat</id>
   <provides>
     <binary>neochat</binary>
   </provides>
-  <name>NeoChat</name>
-  <name xml:lang="az">NeoChat</name>
-  <name xml:lang="ca">NeoChat</name>
-  <name xml:lang="ca-valencia">NeoChat</name>
-  <name xml:lang="cs">NeoChat</name>
-  <name xml:lang="de">NeoChat</name>
-  <name xml:lang="en-GB">NeoChat</name>
-  <name xml:lang="es">NeoChat</name>
-  <name xml:lang="eu">NeoChat</name>
-  <name xml:lang="fi">NeoChat</name>
-  <name xml:lang="fr">NeoChat</name>
-  <name xml:lang="hu">NeoChat</name>
+  <name>Neochat</name>
+  <name xml:lang="ca">Neochat</name>
+  <name xml:lang="ca-valencia">Neochat</name>
+  <name xml:lang="cs">Neochat</name>
+  <name xml:lang="da">Neochat</name>
+  <name xml:lang="de">Neochat</name>
+  <name xml:lang="en-GB">Neochat</name>
+  <name xml:lang="es">Neochat</name>
+  <name xml:lang="eu">Neochat</name>
+  <name xml:lang="fi">Neochat</name>
+  <name xml:lang="fr">Neochat</name>
+  <name xml:lang="hu">Neochat</name>
   <name xml:lang="ia">Neochat</name>
-  <name xml:lang="id">NeoChat</name>
-  <name xml:lang="it">NeoChat</name>
-  <name xml:lang="ko">NeoChat</name>
-  <name xml:lang="nl">NeoChat</name>
-  <name xml:lang="nn">NeoChat</name>
-  <name xml:lang="pa">ਨਿਓ-ਚੈਟ</name>
-  <name xml:lang="pl">NeoChat</name>
-  <name xml:lang="pt">NeoChat</name>
-  <name xml:lang="pt-BR">NeoChat</name>
-  <name xml:lang="sk">NeoChat</name>
-  <name xml:lang="sl">NeoChat</name>
-  <name xml:lang="sv">NeoChat</name>
-  <name xml:lang="ta">நியோச்சாட்</name>
-  <name xml:lang="uk">NeoChat</name>
-  <name xml:lang="x-test">xxNeoChatxx</name>
-  <name xml:lang="zh-CN">NeoChat</name>
+  <name xml:lang="id">Neochat</name>
+  <name xml:lang="it">Neochat</name>
+  <name xml:lang="nl">Neochat</name>
+  <name xml:lang="nn">Neochat</name>
+  <name xml:lang="pl">Neochat</name>
+  <name xml:lang="pt">Neochat</name>
+  <name xml:lang="pt-BR">Neochat</name>
+  <name xml:lang="sk">Neochat</name>
+  <name xml:lang="sl">Neochat</name>
+  <name xml:lang="sv">Neochat</name>
+  <name xml:lang="uk">Neochat</name>
+  <name xml:lang="x-test">xxNeochatxx</name>
   <summary>A client for matrix, the decentralized communication protocol</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>
   <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
@@ -50,13 +40,11 @@
   <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
   <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
-  <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
+  <summary xml:lang="ia">Un cliente per matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
   <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
-  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
   <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
   <summary xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen</summary>
-  <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
   <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
   <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
   <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
@@ -65,88 +53,38 @@
   <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
   <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
   <summary xml:lang="x-test">xxA client for matrix, the decentralized communication protocolxx</summary>
-  <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="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>
-    <p xml:lang="de">NeoChat ist ein Matrix-Client. Er ermöglicht Ihnen das Senden von Textnachrichten, Videos und Audiodateien an Ihre Familie, Kollegen und Freunde unter Verwendung des Matrix-Protokolls.</p>
-    <p xml:lang="en-GB">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="es">NeoChat es un cliente para Matrix. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos usando el protocolo Matrix.</p>
-    <p xml:lang="eu">NeoChat Matrix bezero bat da. Familiari, lankideei eta lagunei testu-mezuak, bideoak eta audio-fitxategiak bidaltzeko aukera ematen du, Matrix protokoloa erabiliz.</p>
-    <p xml:lang="fi">NeoChat on Matrix-asiakas. Sillä voi lähettää perheelle, tuttaville ja kavereille tekstiviestejä sekä video- ja äänitiedostoja Matrix-yhteyskäytännöllä.</p>
-    <p xml:lang="fr">NeoChat est un client Matrix. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis en utilisant le protocole Matrix.</p>
-    <p xml:lang="hu">A NeoChat egy Matrix kliens. Szöveges üzeneteket, videókat ésaudio fájlokat küldhet családjának, kollégáinak és barátainak a Matrix protokoll használatával.</p>
-    <p xml:lang="ia">NeoChat es un cliente de Matrix. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante le protocollo de Matrix.</p>
-    <p xml:lang="it">NeoChat è un client Matrix. Ti consente di inviare messaggi di testo, file video e audio a familiari, colleghi e amici utilizzando il protocollo Matrix.</p>
-    <p xml:lang="ko">NeoChat은 Matrix 클라이언트입니다. Matrix 프로토콜을 사용하여 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다.</p>
-    <p xml:lang="nl">NeoChat is een Matrix-client. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden met het Matrix-protocol.</p>
-    <p xml:lang="pl">NeoChat jest programem do Matrisa. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół poprzez protokół Matriksa.</p>
-    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix.</p>
-    <p xml:lang="pt-BR">O NeoChat é um cliente Matrix. Ele permite a você enviar mensagens de texto, arquivos de vídeo e áudio para seus familiares, colegas e amigos usando o protocolo Matrix.</p>
-    <p xml:lang="sk">NeoChat je Matrix klient. Umožňuje vám posielať textové správy, videá a zvukové súbory rodine, kolegom a priateľom pomocou protokolu Matrix.</p>
-    <p xml:lang="sl">NeoChat je odjemalec Matrixa. Dovoljuje vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, kolegom in prijateljem z uporabo protokola Matrix.</p>
-    <p xml:lang="sv">NeoChat är en Matrix-klient. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner med användning av Matrix-protokollet.</p>
-    <p xml:lang="uk">NeoChat — клієнт мережі обміну повідомленнями Matrix. За допомогою цієї програми ви зможете надсилати текстові повідомлення, відео та звукові файли вашій родині, колегам та друзям за допомогою протоколу Matrix.</p>
-    <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="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>
-    <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
-    <p xml:lang="en-GB">Matrix is a decentralised 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="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="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>
-    <p xml:lang="ko">Matrix는 사용자에게 제어권을 돌려 주는 분산 통신 프로토콜입니다. NeoChat은 암호화된 대화 및 영상 통화를 제외한 프로토콜의 대부분 기능을 구현합니다.</p>
-    <p xml:lang="nl">Matrix is een gedecentraliseerd communicatieprotocol, dat de gebruiker de controle teruggeeft. Op dit moment implementeert NeoChat grote delen van het protocol met de uitzondering van versleutelde chats en video-chat.</p>
-    <p xml:lang="pl">Matrix jest protokołem rozproszonego porozumiewania się oddający użytkownikowi jego władzę. Obecnie NeoChat obsługuje dużą część protokołu poza szyfrowanymi rozmowami tekstowymi i z obrazem.</p>
-    <p xml:lang="pt">O Matrix é um protocolo de comunicações descentralizado, colocando de novo o utilizador no poder. De momento, o NeoChat implementa uma boa parte do protocolo, com a excepção das conversas encriptadas e as conversas de vídeo.</p>
-    <p xml:lang="pt-BR">O Matrix é um protocolo de comunicação descentralizado, colocando o usuário de volta no controle. Atualmente o NeoChat implementa grande parte do protocolo com a exceção de bate-papos criptografados e bate-papo por vídeo.</p>
-    <p xml:lang="sk">Matrix je decentralizovaný komunikačný protokol, ktorý používateľovi vracia kontrolu. V súčasnosti NeoChat implementuje veľkú časť protokolu s výnimkou šifrovaných chatov a videohovorov.</p>
-    <p xml:lang="sl">Matrix je decentraliziran komunikacijski protokol, kjer ima uporabnik uporabnik kontrolo rabe. Trenutno ima NeoChat izveden velik del protokola z izjemo šifriranih klepetov in video klepetov.</p>
-    <p xml:lang="sv">Matrix är ett decentraliserat kommunikationsprotokoll, som ger tillbaka kontrollen till användaren. För närvarande implementerar NeoChat en stor del av protokollet, med undantag för krypterad chatt och videochatt.</p>
-    <p xml:lang="uk">Matrix — протокол децентралізованого спілкування, який передає контроль над даними користувачеві. У поточній версії NeoChat реалізовано більшу частину протоколу, окрім зашифрованого спілкування та відеоспілкування.</p>
-    <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="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 el mòbils i a l'escriptori, proporcionant un 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="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>
-    <p xml:lang="eu">NeoChat mugikorretan eta mahaigainean dabil, erabiltzaile esperientzia koherentea eskainiz.</p>
-    <p xml:lang="fi">NeoChat toimii sekä mobiili- että työpöytäalustoilla tarjoten yhdenmukaisen käyttökokemuksen.</p>
-    <p xml:lang="fr">NeoChat fonctionne aussi bien sur les mobiles que sur les ordinateurs de bureau, tout en offrant une expérience utilisateur cohérente.</p>
-    <p xml:lang="hu">A NeoChat mobilon és asztali számítógépen is működik, egységes felhasználói élményt nyújtva.</p>
-    <p xml:lang="ia">NeoChat functiona sia sur mobile que ur scriptorio durante que forni un experientia de usator consistente.</p>
-    <p xml:lang="it">NeoChat funziona sia su dispositivi mobili che desktop, fornendo un'esperienza utente coerente.</p>
-    <p xml:lang="ko">NeoChat은 모바일과 데스크톱 모두에서 일관된 사용자 경험을 제공합니다.</p>
-    <p xml:lang="nl">NeoChat werkt zowel op de mobiel en het bureaublad met het leveren van een consistente gebruikerservaring.</p>
-    <p xml:lang="pl">NeoChat działa zarówno na urządzeniach przenośnych jak i biurkowych, zapewniając spójne wrażenia użytkownika</p>
-    <p xml:lang="pt">O NeoChat funciona tanto em dispositivos móveis como no computador, fornecendo uma experiência de utilizador consistente.</p>
-    <p xml:lang="pt-BR">O NeoChat funciona tanto no celular como no computador enquanto fornece uma experiência consistente ao usuário.</p>
-    <p xml:lang="sk">NeoChat funguje na mobilných aj stolových počítačoch a poskytuje konzistentný používateľský zážitok.</p>
-    <p xml:lang="sl">NeoChat deluje tako na mobilnih kot na namiznih platformah z zagotavljanjem konsistentne uporabniške izkušnje.</p>
-    <p xml:lang="sv">NeoChat fungerar både på mobil och skrivbord och tillhandahåller en konsekvent användarupplevelse.</p>
-    <p xml:lang="uk">NeoChat працює на мобільних пристроях та звичайних комп'ютерах, маючи однорідний інтерфейс на усіх підтримуваних пристроях.</p>
-    <p xml:lang="x-test">xxNeoChat works both on mobile and desktop while providing a consistent user experience.xx</p>
-    <p xml:lang="zh-CN">NeoChat 在移动设备和桌面上均可用，并提供一致的用户体验。</p>
+    <p>A client for matrix, the decentralized communication protocol.</p>
+    <p xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
+    <p xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat.</p>
+    <p xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix.</p>
+    <p xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll.</p>
+    <p xml:lang="en-GB">A client for matrix, the decentralised communication protocol.</p>
+    <p xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado.</p>
+    <p xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat.</p>
+    <p xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle.</p>
+    <p xml:lang="fr">Un client « Matrix », le protocole décentralisé de communications.</p>
+    <p xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz.</p>
+    <p xml:lang="ia">Un cliente per matrix, le protocollo de communication decentralisate.</p>
+    <p xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi.</p>
+    <p xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato.</p>
+    <p xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol.</p>
+    <p xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen.</p>
+    <p xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się.</p>
+    <p xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado.</p>
+    <p xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado.</p>
+    <p xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol.</p>
+    <p xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol.</p>
+    <p xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet.</p>
+    <p xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними.</p>
+    <p xml:lang="x-test">xxA client for matrix, the decentralized communication protocol.xx</p>
   </description>
-  <url type="homepage">https://apps.kde.org/neochat/</url>
-  <url type="bugtracker">https://invent.kde.org/network/neochat/-/issues</url>
+  <url type="homepage">https://kde.org</url>
+  <url type="bugtracker">https://bugs.kde.org</url>
   <categories>
     <category>Network</category>
   </categories>
   <developer_name>The KDE Community</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>
   <developer_name xml:lang="cs">Komunita KDE</developer_name>
@@ -160,10 +98,8 @@
   <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
-  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
   <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
   <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
-  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
   <developer_name xml:lang="pl">Społeczność KDE</developer_name>
   <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
   <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
@@ -172,30 +108,21 @@
   <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
   <developer_name xml:lang="uk">Спільнота KDE</developer_name>
   <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
-  <developer_name xml:lang="zh-CN">KDE 社区</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <value key="KDE::matrix">#neochat:kde.org</value>
   <screenshots>
-    <screenshot type="default">
-      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
-    </screenshot>
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
     </screenshot>
+    <screenshot>
+      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
+    </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <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>
-        <p>It's now possible to send custom reactions by replying to a comment with /react &lt;message&gt;.</p>
-        <p>NeoChat now supports opening Matrix URIs from your browser.</p>
-      </description>
-      <url>https://carlschwan.eu/2021/06/01/neochat-1.2/</url>
-    </release>
     <release urgency="critical" version="1.1.1" date="2021-02-23"/>
     <release version="1.1.0" date="2021-02-22">
       <description>
@@ -205,7 +132,7 @@
         <p>We added a few commands to NeoChat (/shrug, /lenny, /join, /ignore, ...).</p>
         <p>We improved the Plasma integration a bit. Now the number of unread messages is displayed in the Plasma Taskbar.</p>
       </description>
-      <url>https://carlschwan.eu/2021/02/22/neochat-1.1/</url>
+      <url>https://carlschwan.eu/2020/02/22/neochat-1.1/</url>
     </release>
     <release version="1.0.1" date="2021-01-13">
       <description>

org.kde.neochat.desktop

@@ -1,40 +1,33 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 [Desktop Entry]
-Name=NeoChat
-Name[az]=NeoChat
-Name[ca]=NeoChat
-Name[ca@valencia]=NeoChat
-Name[cs]=NeoChat
-Name[de]=NeoChat
-Name[en_GB]=NeoChat
-Name[es]=NeoChat
-Name[eu]=NeoChat
-Name[fi]=NeoChat
-Name[fr]=NeoChat
-Name[hu]=NeoChat
+Name=Neochat
+Name[ca]=Neochat
+Name[ca@valencia]=Neochat
+Name[cs]=Neochat
+Name[da]=Neochat
+Name[de]=Neochat
+Name[en_GB]=Neochat
+Name[es]=Neochat
+Name[eu]=Neochat
+Name[fi]=Neochat
+Name[fr]=Neochat
+Name[hu]=Neochat
 Name[ia]=Neochat
-Name[it]=NeoChat
-Name[ko]=NeoChat
-Name[lt]=NeoChat
-Name[nl]=NeoChat
-Name[nn]=NeoChat
-Name[pa]=ਨਿਓ-ਚੈਟ
-Name[pl]=NeoChat
-Name[pt]=NeoChat
-Name[pt_BR]=NeoChat
-Name[ro]=NeoChat
-Name[sk]=NeoChat
-Name[sl]=NeoChat
-Name[sv]=NeoChat
-Name[ta]=நியோச்சாட்
-Name[uk]=NeoChat
-Name[x-test]=xxNeoChatxx
-Name[zh_CN]=NeoChat
+Name[it]=Neochat
+Name[nl]=Neochat
+Name[nn]=Neochat
+Name[pl]=Neochat
+Name[pt]=Neochat
+Name[pt_BR]=Neochat
+Name[ro]=Neochat
+Name[sk]=Neochat
+Name[sl]=Neochat
+Name[sv]=Neochat
+Name[uk]=Neochat
+Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 GenericName=Matrix Client
-GenericName[az]=Matrix Müştərisi
-GenericName[ca]=Client de Matrix
-GenericName[ca@valencia]=Client de Matrix
+GenericName[ca]=Client del Matrix
+GenericName[ca@valencia]=Client del Matrix
 GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
 GenericName[en_GB]=Matrix Client
@@ -43,13 +36,10 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[hu]=Matrix kliens
-GenericName[ia]=Cliente de Matrice
+GenericName[ia]=Cliente de Matrix
 GenericName[it]=Client Matrix
-GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
-GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
 GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
@@ -57,12 +47,10 @@ GenericName[ro]=Client Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
-GenericName[ta]=Matrix வாங்கி
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 Comment=Client for the Matrix protocol
-Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
@@ -74,11 +62,8 @@ Comment[fr]=Client pour le protocole « Matrix »
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[it]=Client per il protocollo Matrix
-Comment[ko]=Matrix 프로토콜용 클라이언트
-Comment[lt]=Matrix protokolo kliento programa
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Lynmeldings­klient for Matrix-protokollen
-Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
@@ -86,12 +71,10 @@ Comment[ro]=Client pentru protocolul Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
-Comment[ta]=Matrix நெறிமுறைக்கான வாங்கி
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
 Comment[zh_CN]=为 Matrix 协议打造的客户端
-MimeType=x-scheme-handler/matrix;
-Exec=neochat %u
+Exec=neochat
 Terminal=false
 Icon=org.kde.neochat
 Type=Application

qml/main.qml

@@ -1,18 +1,21 @@
-// SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
+/**
+ * SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.14
+import QtQuick.Controls 2.14 as QQC2
+import QtQuick.Window 2.2
+import QtQuick.Layouts 1.14
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
 import NeoChat.Component 1.0
+import NeoChat.Panel 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Page 1.0
-import NeoChat.Panel 1.0
 
 Kirigami.ApplicationWindow {
     id: root
@@ -27,13 +30,6 @@ Kirigami.ApplicationWindow {
     onClosing: Controller.saveWindowGeometry(root)
 
     pageStack.initialPage: LoadingPage {}
-    pageStack.globalToolBar.canContainHandles: true
-
-    property bool roomListLoaded: false
-
-    property RoomPage roomPage: RoomPage {
-        KeyNavigation.left: pageStack.get(0)
-    }
 
     Connections {
         target: root.quitAction
@@ -42,11 +38,6 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Loader {
-        active: !Kirigami.Settings.isMobile
-        source: Qt.resolvedUrl("qrc:/imports/NeoChat/Menu/GlobalMenu.qml")
-    }
-
     // This timer allows to batch update the window size change to reduce
     // the io load and also work around the fact that x/y/width/height are
     // changed when loading the page and overwrite the saved geometry from
@@ -62,75 +53,86 @@ Kirigami.ApplicationWindow {
     onXChanged: saveWindowGeometryTimer.restart()
     onYChanged: saveWindowGeometryTimer.restart()
 
-    Shortcut {
-        sequence: "Ctrl+K"
-        onActivated: {
-            quickView.item.open()
-        }
-    }
+    /**
+     * Manage opening and close rooms
+     * TODO this should probably be moved to C++
+     */
+    QtObject {
+        id: roomManager
 
-    Loader {
-        id: quickView
-
-        active: !Kirigami.Settings.isMobile
-        sourceComponent: QuickSwitcher { }
-    }
-
-    Connections {
-        target: RoomManager
-
-        function onPushRoom(room, event) {
-            pageStack.push(root.roomPage);
-            root.roomPage.forceActiveFocus();
-            if (event.length > 0) {
-                roomPage.goToEvent(event);
+        property var actionsHandler: ActionsHandler {
+            room: roomManager.currentRoom
+            connection: Controller.activeConnection
+            onRoomJoined: {
+                roomManager.enterRoom(Controller.activeConnection.room(roomName))
             }
         }
 
-        function onReplaceRoom(room, event) {
-            const roomItem = pageStack.get(pageStack.depth - 1);
-            pageStack.currentIndex = pageStack.depth - 1;
-            root.roomPage.forceActiveFocus();
-            if (event.length > 0) {
-                roomItem.goToEvent(event);
+        property var currentRoom: null
+        property alias pageStack: root.pageStack
+        property var roomList: null
+        property Item roomItem: null
+
+        readonly property bool hasOpenRoom: currentRoom !== null
+
+        signal leaveRoom(string room);
+        signal openRoom(string room);
+
+        function roomByAliasOrId(aliasOrId) {
+            return Controller.activeConnection.room(aliasOrId)
+        }
+
+        function openRoomAndEvent(room, event) {
+            enterRoom(room)
+            roomItem.goToEvent(event)
+        }
+
+        function loadInitialRoom() {
+            if (Config.openRoom) {
+                const room = Controller.activeConnection.room(Config.openRoom);
+                currentRoom = room;
+                roomItem = pageStack.push("qrc:/imports/NeoChat/Page/RoomPage.qml", { 'currentRoom': room, });
+                connectRoomToSignal(roomItem);
+            } else {
+                // TODO create welcome page
             }
         }
 
-        function goToEvent(event) {
-            if (event.length > 0) {
-                roomItem.goToEvent(event);
+        function enterRoom(room) {
+            if (currentRoom != null) {
+                roomItem.currentRoom = room;
+                pageStack.currentIndex = pageStack.depth - 1;
+            } else {
+                roomItem = pageStack.push("qrc:/imports/NeoChat/Page/RoomPage.qml", { 'currentRoom': room, });
             }
-            roomItem.forceActiveFocus();
+            currentRoom = room;
+            Config.openRoom = room.id;
+            Config.save();
+            connectRoomToSignal(roomItem);
+            return roomItem;
         }
 
-        function onPushWelcomePage() {
-            // TODO
+        function getBack() {
+            pageStack.replace("qrc:/imports/NeoChat/Page/RoomPage.qml", { 'currentRoom': currentRoom, });
         }
 
-        function onOpenRoomInNewWindow(room) {
+        function openWindow(room) {
             const secondayWindow = roomWindow.createObject(applicationWindow(), {currentRoom: room});
-            secondayWindow.width = root.width - pageStack.get(0).width;
+            secondayWindow.width = root.width - roomList.width;
             secondayWindow.show();
         }
 
-        function onShowUserDetail(user) {
-            const roomItem = pageStack.get(pageStack.depth - 1);
-            roomItem.showUserDetail(user);
-        }
-
-        function onAskDirectChatConfirmation(user) {
-            askDirectChatConfirmationComponent.createObject(QQC2.ApplicationWindow.overlay, {
-                user: user,
-            }).open();
-        }
-
-        function onWarning(title, message) {
-            if (RoomManager.currentRoom) {
-                const roomItem = pageStack.get(pageStack.depth - 1);
-                roomItem.warning(title, message);
-            } else {
-                showPassiveNotification(i18n("Warning: %1", message));
+        function connectRoomToSignal(item) {
+            if (!roomList) {
+                console.log("Should not happen: no room list page but room page");
             }
+            item.switchRoomUp.connect(function() {
+                roomList.goToNextRoom();
+            });
+
+            item.switchRoomDown.connect(function() {
+                roomList.goToPreviousRoom();
+            });
         }
     }
 
@@ -146,7 +148,6 @@ Kirigami.ApplicationWindow {
         root.show()
         root.raise()
         root.requestActivate()
-        Controller.raiseWindow(root)
     }
 
     contextDrawer: RoomDrawer {
@@ -156,124 +157,143 @@ Kirigami.ApplicationWindow {
         modal: !root.wideScreen || !enabled
         onEnabledChanged: drawerOpen = enabled && !modal
         onModalChanged: drawerOpen = !modal
-        enabled: RoomManager.hasOpenRoom && pageStack.layers.depth < 2 && pageStack.depth < 3
+        enabled: roomManager.hasOpenRoom && pageStack.layers.depth < 2 && pageStack.depth < 3
+        room: roomManager.currentRoom
         handleVisible: enabled && pageStack.layers.depth < 2 && pageStack.depth < 3
     }
 
-    readonly property int defaultPageWidth: Kirigami.Units.gridUnit * 17
-    readonly property int minPageWidth: Kirigami.Units.gridUnit * 10
-    readonly property int collapsedPageWidth: Kirigami.Units.gridUnit * 3 - Kirigami.Units.smallSpacing * 3
-    readonly property bool shouldUseSidebars: RoomManager.hasOpenRoom && (Config.roomListPageWidth > minPageWidth ? root.width >= Kirigami.Units.gridUnit * 35 : root.width > Kirigami.Units.gridUnit * 27) && roomListLoaded
-    readonly property int pageWidth: {
-        if (Config.roomListPageWidth === -1) {
-            return defaultPageWidth;
-        } else if (Config.roomListPageWidth < minPageWidth) {
-            return collapsedPageWidth;
-        } else {
-            return Config.roomListPageWidth;
+    globalDrawer: Kirigami.GlobalDrawer {
+        property bool hasLayer
+        contentItem.implicitWidth: columnWidth
+        isMenu: true
+        actions: [
+            Kirigami.Action {
+                text: i18n("Explore rooms")
+                icon.name: "compass"
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": Controller.activeConnection})
+                enabled: pageStack.layers.currentItem.title !== i18n("Explore Rooms") && Controller.accountCount > 0
+            },
+            Kirigami.Action {
+                text: i18n("Start a Chat")
+                icon.name: "irc-join-channel"
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {"connection": Controller.activeConnection})
+                enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
+            },
+            Kirigami.Action {
+                text: i18n("Create a Room")
+                icon.name: "irc-join-channel"
+                onTriggered: {
+                    let dialog = createRoomDialog.createObject(root.overlay);
+                    dialog.open();
+                }
+                shortcut: StandardKey.New
+                enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
+            },
+            Kirigami.Action {
+                text: i18n("Accounts")
+                icon.name: "im-user"
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/AccountsPage.qml")
+                enabled: pageStack.layers.currentItem.title !== i18n("Accounts") && Controller.accountCount > 0
+
+            },
+            Kirigami.Action {
+                text: i18n("Devices")
+                iconName: "network-connect"
+                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/DevicesPage.qml")
+                enabled: pageStack.layers.currentItem.title !== i18n("Devices") && Controller.accountCount > 0
+            },
+            Kirigami.Action {
+                text: i18n("Settings")
+                icon.name: "settings-configure"
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/SettingsPage.qml")
+                enabled: pageStack.layers.currentItem.title !== i18n("Settings")
+                shortcut: StandardKey.Preferences
+            },
+            Kirigami.Action {
+                text: i18n("About Neochat")
+                icon.name: "help-about"
+                onTriggered: pushReplaceLayer(aboutPage)
+                enabled: pageStack.layers.currentItem.title !== i18n("About")
+            },
+            Kirigami.Action {
+                text: i18n("Logout")
+                icon.name: "list-remove-user"
+                enabled: Controller.accountCount > 0
+                onTriggered: Controller.logout(Controller.activeConnection, true)
+            },
+            Kirigami.Action {
+                text: i18n("Quit")
+                icon.name: "gtk-quit"
+                shortcut: StandardKey.Quit
+                onTriggered: Qt.quit()
+            }
+        ]
+    }
+
+    Component {
+        id: aboutPage
+        Kirigami.AboutPage {
+            aboutData: Controller.aboutData
         }
     }
 
-    pageStack.defaultColumnWidth: pageWidth
-    pageStack.columnView.columnResizeMode: shouldUseSidebars ? Kirigami.ColumnView.FixedColumns : Kirigami.ColumnView.SingleColumn
-
-    MouseArea {
-        visible: root.pageStack.wideMode
-        z: 500
-
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-
-        x: root.pageStack.defaultColumnWidth - (width / 2)
-        width: 2
-
-        property int _lastX: -1
-        enabled: !Kirigami.Settings.isMobile
-
-        cursorShape: !Kirigami.Settings.isMobile ? Qt.SplitHCursor : undefined
-
-        onPressed: _lastX = mouseX
-        onReleased: Config.save();
-
-        onPositionChanged: {
-            if (_lastX == -1) {
-                return;
-            }
-
-            if (mouse.x > _lastX) {
-                // we moved to the right
-                if (Config.roomListPageWidth === root.collapsedPageWidth && root.pageWidth + (mouse.x - _lastX) >= root.minPageWidth) {
-                    // Here we get back directly to a more wide mode.
-                    Config.roomListPageWidth = root.minPageWidth;
-                    if (root.width < Kirigami.Units.gridUnit * 35) {
-                        root.width = Kirigami.Units.gridUnit * 35;
-                    }
-                } else if (Config.roomListPageWidth !== root.collapsedPageWidth) {
-                    // Increase page width
-                    Config.roomListPageWidth = Math.min(root.defaultPageWidth, root.pageWidth + (mouse.x - _lastX));
-                }
-            } else if (mouse.x < _lastX) {
-                const tmpWidth = root.pageWidth - (_lastX - mouse.x);
-
-                if (tmpWidth < root.minPageWidth) {
-                    Config.roomListPageWidth = root.collapsedPageWidth;
-                } else {
-                    Config.roomListPageWidth = tmpWidth;
-                }
-            }
+    Component {
+        id: roomListComponent
+        RoomListPage {
+            id: roomList
+            activeConnection: Controller.activeConnection
         }
     }
-
-    Component.onCompleted: Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
     Connections {
-        target: Config
-        function onBlurChanged() {
-            Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
+        target: LoginHelper
+        function onInitialSyncFinished() {
+            roomManager.roomList = pageStack.replace(roomListComponent);
         }
-        function onCompactLayoutChanged() {
-            Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
-        }
-    }
-
-    // blur effect
-    color: Config.blur && !Config.compactLayout ? "transparent" : Kirigami.Theme.backgroundColor
-    
-    // we need to apply the translucency effect separately on top of the color
-    background: Rectangle {
-        color: Config.blur && !Config.compactLayout ? Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 1 - Config.transparency) : "transparent"
     }
 
     Connections {
         target: Controller
 
         function onInitiated() {
+            if (roomManager.hasOpenRoom) {
+                return;
+            }
             if (Controller.accountCount === 0) {
                 pageStack.replace("qrc:/imports/NeoChat/Page/WelcomePage.qml", {});
-            } else if (!roomListLoaded) {
-                pageStack.replace(roomListComponent, {
-                    activeConnection: Controller.activeConnection
-                });
-                roomListLoaded = true;
-                RoomManager.loadInitialRoom();
+            } else {
+                roomManager.roomList = pageStack.replace(roomListComponent, {'activeConnection': Controller.activeConnection});
+                roomManager.loadInitialRoom();
             }
         }
 
+        function onBusyChanged() {
+            if(!Controller.busy && roomManager.roomList === null) {
+                roomManager.roomList = pageStack.replace(roomListComponent);
+            }
+        }
+
+        function onRoomJoined(roomId) {
+            const room = Controller.activeConnection.room(roomId);
+            return roomManager.enterRoom(room);
+        }
+
         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(error + ": " + detail)
         }
 
         function onShowWindow() {
             root.showWindow()
-            root.raise()
+        }
+
+        function onOpenRoom(room) {
+            roomManager.enterRoom(room)
         }
 
         function onUserConsentRequired(url) {
@@ -284,8 +304,8 @@ Kirigami.ApplicationWindow {
 
     Connections {
         target: Controller.activeConnection
-        function onDirectChatAvailable(directChat) {
-            RoomManager.enterRoom(Controller.activeConnection.room(directChat.id));
+        onDirectChatAvailable: {
+            roomManager.enterRoom(Controller.activeConnection.room(directChat.id));
         }
     }
 
@@ -322,116 +342,36 @@ Kirigami.ApplicationWindow {
         RoomWindow {}
     }
 
+    function handleLink(link, currentRoom) {
+        if (link.startsWith("https://matrix.to/")) {
+            var content = link.replace("https://matrix.to/#/", "").replace(/\?.*/, "")
+            if(content.match("^[#!]")) {
+                if(content.includes("/")) {
+                    var result = content.match("([!#].*:.*)/(\\$.*)")
+                    if(!result) {
+                        return
+                    }
+                    if(result[1] == currentRoom.id) {
+                        roomManager.roomItem.goToEvent(result[2])
+                    } else {
+                        roomManager.openRoomAndEvent(roomManager.roomByAliasOrId(result[1]), result[2])
+                    }
+                } else {
+                    roomManager.enterRoom(roomManager.roomByAliasOrId(content))
+                }
+            } else if(content.match("^@")) {
+                let dialog = userDialog.createObject(root.overlay, {room: currentRoom, user: currentRoom.user(content)})
+                dialog.open()
+                console.log(dialog.user)
+            }
+        } else {
+            Qt.openUrlExternally(link)
+        }
+    }
+
     Component {
         id: userDialog
-        UserDetailDialog {}
-    }
-
-    Component {
-        id: askDirectChatConfirmationComponent
-
-        Kirigami.OverlaySheet {
-            id: askDirectChatConfirmation
-            required property var user;
-
-            parent: QQC2.ApplicationWindow.overlay
-            header: Kirigami.Heading {
-                text: i18n("Start a chat")
-            }
-            contentItem: QQC2.Label {
-                text: i18n("Do you want to start a chat with %1?", user.displayName)
-                wrapMode: Text.WordWrap
-            }
-            footer: QQC2.DialogButtonBox {
-                standardButtons: QQC2.DialogButtonBox.Ok | QQC2.DialogButtonBox.Cancel
-                onAccepted: {
-                    user.requestDirectChat();
-                    askDirectChatConfirmation.close();
-                }
-                onRejected: askDirectChatConfirmation.close();
-            }
+        UserDetailDialog {
         }
     }
-
-    property Item hoverLinkIndicator: QQC2.Control {
-        parent: overlay.parent
-        property alias text: linkText.text
-        opacity: text.length > 0 ? 1 : 0
-
-        z: 20
-        x: 0
-        y: parent.height - implicitHeight
-        contentItem: QQC2.Label {
-            id: linkText
-        }
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        background: Rectangle {
-             color: Kirigami.Theme.backgroundColor
-        }
-    }
-
-    Component {
-        id: settingsPageComponent
-        SettingsPage {}
-    }
-
-    Component {
-        id: roomListComponent
-        RoomListPage {
-            id: roomList
-
-            Connections {
-                target: root.roomPage
-                function onSwitchRoomUp() {
-                    roomList.goToNextRoom();
-                }
-                function onSwitchRoomDown() {
-                    roomList.goToPreviousRoom();
-                }
-            }
-        }
-    }
-
-    footer: Kirigami.NavigationTabBar {
-        actions: [
-            Kirigami.Action {
-                icon.name: "globe"
-                text: "Spaces"
-                checked: fooPage.visble
-                onTriggered: {
-                    console.warn("foo")
-                }
-            },
-            Kirigami.Action {
-                icon.name: "dialog-messages"
-                text: "Rooms"
-                checked: fooPage.visble
-                onTriggered: {
-                    while (pageStack.depth > 0) {
-                        pageStack.pop();
-                    }
-                    pageStack.push(roomListComponent);
-                }
-            },
-            Kirigami.Action {
-                icon.name: "document-open-recent-symbolic"
-                text: "Recent"
-                checked: fooPage.visble
-                onTriggered: {
-                    console.warn("foo")
-                }
-            },
-            Kirigami.Action {
-                icon.name: "settings-configure"
-                text: "Settings"
-                checked: fooPage.visble
-                onTriggered: {
-                    while (pageStack.depth > 0) {
-                        pageStack.pop();
-                    }
-                    pageStack.push(settingsPageComponent);
-                }
-            }
-        ]
-    }
 }

res.qrc

@@ -15,25 +15,13 @@
         <file>imports/NeoChat/Page/DevicesPage.qml</file>
         <file>imports/NeoChat/Page/WelcomePage.qml</file>
         <file>imports/NeoChat/Component/qmldir</file>
+        <file>imports/NeoChat/Component/ChatTextInput.qml</file>
+        <file>imports/NeoChat/Component/AutoMouseArea.qml</file>
         <file>imports/NeoChat/Component/FullScreenImage.qml</file>
-        <file>imports/NeoChat/Component/FancyEffectsContainer.qml</file>
-        <file>imports/NeoChat/Component/TypingPane.qml</file>
-        <file>imports/NeoChat/Component/ShimmerGradient.qml</file>
-        <file>imports/NeoChat/Component/QuickSwitcher.qml</file>
-        <file>imports/NeoChat/Component/ChatBox</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBox.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBar.qml</file>
-        <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/MessageDelegate.qml</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>
@@ -44,7 +32,6 @@
         <file>imports/NeoChat/Component/Timeline/AudioDelegate.qml</file>
         <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/Login/qmldir</file>
         <file>imports/NeoChat/Component/Login/LoginStep.qml</file>
         <file>imports/NeoChat/Component/Login/Login.qml</file>
@@ -54,6 +41,9 @@
         <file>imports/NeoChat/Component/Login/Homeserver.qml</file>
         <file>imports/NeoChat/Component/Login/LoginMethod.qml</file>
         <file>imports/NeoChat/Component/Login/Sso.qml</file>
+        <file>imports/NeoChat/Setting/Setting.qml</file>
+        <file>imports/NeoChat/Setting/qmldir</file>
+        <file>imports/NeoChat/Setting/Palette.qml</file>
         <file>imports/NeoChat/Panel/qmldir</file>
         <file>imports/NeoChat/Panel/RoomDrawer.qml</file>
         <file>imports/NeoChat/Dialog/qmldir</file>
@@ -62,22 +52,13 @@
         <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
         <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
         <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
+        <file>imports/NeoChat/Dialog/OpenFolderDialog.qml</file>
         <file>imports/NeoChat/Menu/qmldir</file>
-        <file>imports/NeoChat/Menu/GlobalMenu.qml</file>
-        <file>imports/NeoChat/Menu/EditMenu.qml</file>
         <file>imports/NeoChat/Menu/Timeline/qmldir</file>
         <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>
         <file>imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml</file>
         <file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
         <file>imports/NeoChat/Menu/RoomListContextMenu.qml</file>
         <file>qtquickcontrols2.conf</file>
-        <file>imports/NeoChat/Component/glowdot.png</file>
-        <file>imports/NeoChat/Component/confetti.png</file>
-        <file>imports/NeoChat/Settings/ThemeRadioButton.qml</file>
-        <file>imports/NeoChat/Settings/ColorScheme.qml</file>
-        <file>imports/NeoChat/Settings/GeneralSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/Emoticons.qml</file>
-        <file>imports/NeoChat/Settings/AppearanceSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/qmldir</file>
     </qresource>
 </RCC>