GIT_SILENT Sync po/docbooks with svn

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"

.flatpak-manifest.json

@@ -110,7 +110,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "dev",
+                    "branch": "0.8.x",
                     "disable-submodules": true
                 }
             ],

.kde-ci.yml

@@ -40,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ '@all' ]
+  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "05")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

org.kde.neochat.appdata.xml

@@ -54,6 +54,7 @@
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
+  <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
@@ -79,12 +80,15 @@
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
     <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
-    <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d’envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
+    <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
+    <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
@@ -93,6 +97,7 @@
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -109,7 +114,7 @@
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
-    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
@@ -118,6 +123,7 @@
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
@@ -145,6 +151,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
     <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
     <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
@@ -202,10 +209,11 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
+      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -230,6 +238,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
@@ -275,6 +284,7 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
@@ -291,6 +301,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -302,11 +313,14 @@
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
       <caption>Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
       <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
       <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
+      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
@@ -316,6 +330,7 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -334,6 +349,7 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
@@ -350,6 +366,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -365,6 +382,7 @@
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
+      <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
       <caption xml:lang="eu">Saio-hasteko pantaila</caption>
@@ -381,6 +399,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
       <caption xml:lang="sv">Inloggningsfönster</caption>
       <caption xml:lang="ta">நுழைவுத் திரை</caption>
@@ -394,6 +413,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
+    <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>
     <release version="24.02.0" date="2024-02-28">

po/ca/docs/neochat/man-neochat.1.docbook

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></term>
   <listitem>
     <para
->L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:exemple.org o matrix:r/root:exemple.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
+>L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:example.org o matrix:r/root:example.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
   </listitem>
   </varlistentry>
 </variablelist>

src/CMakeLists.txt

@@ -204,7 +204,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/InviteUserPage.qml
         qml/ImageEditorPage.qml
         qml/NeochatMaximizeComponent.qml
-        qml/FancyEffectsContainer.qml
         qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/HoverActions.qml
@@ -281,9 +280,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
         qml/EditStateDialog.qml
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
 )
 
 add_subdirectory(settings)
@@ -372,12 +368,14 @@ endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
 
     if (TARGET KUnifiedPush)
         target_sources(neochat PRIVATE fakerunner.cpp)
     endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)

src/controller.cpp

@@ -19,7 +19,6 @@
 #include <signal.h>
 
 #include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
 #include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/eventstats.h>

src/controller.h

@@ -117,7 +117,7 @@ private:
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
-    QMap<QString, QPointer<Quotient::Connection>> m_connectionsLoading;
+    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
 
 private Q_SLOTS:

src/devtools/DebugOptions.qml

@@ -15,6 +15,12 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         Layout.topMargin: Kirigami.Units.largeSpacing
 
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check", "Show hidden events in the timeline")
+            checked: Config.showAllEvents
+
+            onToggled: Config.showAllEvents = checked
+        }
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")
@@ -23,5 +29,14 @@ FormCard.FormCardPage {
 
             onToggled: Config.alwaysVerifyDevice = checked
         }
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check", "Show focus in window header")
+            checked: Config.windowTitleFocus
+
+            onToggled: {
+                Config.windowTitleFocus = checked;
+                Config.save();
+            }
+        }
     }
 }

src/devtools/RoomData.qml

@@ -25,9 +25,10 @@ ColumnLayout {
             text: i18n("Room")
             textRole: "escapedDisplayName"
             valueRole: "roomId"
-            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.DisplayNameRole)
+            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.EscapedDisplayNameRole)
             model: RoomManager.roomListModel
             currentIndex: 0
+            displayMode: FormCard.FormComboBoxDelegate.Page
             Component.onCompleted: currentIndex = RoomManager.roomListModel.rowForRoom(root.room)
             onCurrentValueChanged: root.room = RoomManager.roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }

src/enums/neochatroomtype.h

@@ -21,7 +21,6 @@ public:
      * @brief Defines the room list categories a room can be assigned.
      */
     enum Types {
-        Search = 0, /**< So we can show a search delegate if needed, e.g. collapsed mode. */
         Invited, /**< The user has been invited to the room. */
         Favorite, /**< The room is set as a favourite. */
         Direct, /**< The room is a direct chat. */
@@ -68,8 +67,6 @@ public:
             return i18n("Low priority");
         case NeoChatRoomType::Space:
             return i18n("Spaces");
-        case NeoChatRoomType::Search:
-            return i18n("Search");
         default:
             return {};
         }
@@ -89,8 +86,6 @@ public:
             return QStringLiteral("object-order-lower");
         case NeoChatRoomType::Space:
             return QStringLiteral("group");
-        case NeoChatRoomType::Search:
-            return QStringLiteral("search");
         default:
             return QStringLiteral("tools-report-bug");
         }

src/eventhandler.cpp

@@ -1038,7 +1038,11 @@ QString EventHandler::getReadMarkersString() const
     QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
     for (const auto &userId : userIds) {
         auto user = m_room->user(userId);
-        readMarkersString += user->displayname(m_room) + i18nc("list separator", ", ");
+        auto displayName = user->displayname(m_room);
+        if (displayName.isEmpty()) {
+            displayName = userId;
+        }
+        readMarkersString += displayName + i18nc("list separator", ", ");
     }
     readMarkersString.chop(2);
     return readMarkersString;

src/login.cpp

@@ -4,7 +4,6 @@
 #include "login.h"
 
 #include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
 #include <Quotient/qt_connection_util.h>
 
 #include "controller.h"
@@ -54,7 +53,7 @@ void LoginHelper::init()
             m_connection = new NeoChatConnection();
         }
         m_connection->resolveServer(m_matrixId);
-        connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
+        connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
             setHomeserverReachable(true);
             m_testing = false;
             Q_EMIT testingChanged();
@@ -100,7 +99,7 @@ void LoginHelper::init()
         Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
+    connectSingleShot(m_connection.get(), &Connection::syncDone, this, [this]() {
         Q_EMIT loaded();
     });
 }
@@ -182,7 +181,7 @@ QUrl LoginHelper::ssoUrl() const
 void LoginHelper::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
-    connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
+    connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
         SsoSession *session = m_connection->prepareForSso(m_deviceName);
         m_ssoUrl = session->ssoUrl();
         Q_EMIT ssoUrlChanged();

src/login.h

@@ -146,7 +146,7 @@ private:
     QString m_deviceName;
     bool m_supportsSso = false;
     bool m_supportsPassword = false;
-    NeoChatConnection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
     QUrl m_ssoUrl;
     bool m_testing = false;
     bool m_isLoggingIn = false;

src/matriximageprovider.cpp

@@ -14,8 +14,6 @@
 
 #include "neochatconnection.h"
 
-#include <Quotient/connection.h>
-
 using namespace Quotient;
 
 ThumbnailResponse::ThumbnailResponse(QString id, QSize size, NeoChatConnection *connection)

src/matriximageprovider.h

@@ -35,7 +35,7 @@ private:
     QSize requestedSize;
     const QString localFile;
     Quotient::MediaThumbnailJob *job = nullptr;
-    NeoChatConnection *m_connection;
+    QPointer<NeoChatConnection> m_connection;
 
     QImage image;
     QString errorStr;
@@ -75,6 +75,6 @@ public:
     QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override;
 
 private:
-    NeoChatConnection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
     MatrixImageProvider() = default;
 };

src/models/accountemoticonmodel.cpp

@@ -10,6 +10,8 @@
 #include <Quotient/events/eventcontent.h>
 #include <qcoro/qcorosignal.h>
 
+#include "neochatconnection.h"
+
 using namespace Quotient;
 
 AccountEmoticonModel::AccountEmoticonModel(QObject *parent)
@@ -77,12 +79,12 @@ QHash<int, QByteArray> AccountEmoticonModel::roleNames() const
     };
 }
 
-Connection *AccountEmoticonModel::connection() const
+NeoChatConnection *AccountEmoticonModel::connection() const
 {
     return m_connection;
 }
 
-void AccountEmoticonModel::setConnection(Connection *connection)
+void AccountEmoticonModel::setConnection(NeoChatConnection *connection)
 {
     if (m_connection) {
         disconnect(m_connection, nullptr, this, nullptr);

src/models/accountemoticonmodel.h

@@ -12,7 +12,7 @@
 #include <QPointer>
 #include <QQmlEngine>
 
-#include <Quotient/connection.h>
+class NeoChatConnection;
 
 /**
  * @class AccountEmoticonModel
@@ -29,7 +29,7 @@ class AccountEmoticonModel : public QAbstractListModel
     /**
      * @brief The connection to get emoticons from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
 public:
     enum Roles {
@@ -63,8 +63,8 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *connection);
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
 
     /**
      * @brief Deletes the emoticon at the given index.
@@ -96,7 +96,7 @@ Q_SIGNALS:
 
 private:
     std::optional<Quotient::ImagePackEventContent> m_images;
-    QPointer<Quotient::Connection> m_connection;
+    QPointer<NeoChatConnection> m_connection;
     QCoro::Task<void> doSetEmoticonImage(int index, QUrl source);
     QCoro::Task<void> doAddEmoticon(QUrl source, QString shortcode, QString description, QString type);
 

src/models/actionsmodel.cpp

@@ -4,6 +4,7 @@
 #include "actionsmodel.h"
 
 #include "chatbarcache.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include <Quotient/events/roommemberevent.h>
@@ -260,7 +261,7 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
-            auto connection = room->connection();
+            auto connection = dynamic_cast<NeoChatConnection *>(room->connection());
             const auto knownServer = roomName.mid(roomName.indexOf(":"_ls) + 1);
             if (parts.length() >= 2) {
                 RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});

src/models/customemojimodel.h

@@ -110,7 +110,7 @@ Q_SIGNALS:
 private:
     explicit CustomEmojiModel(QObject *parent = nullptr);
     QList<CustomEmoji> m_emojis;
-    NeoChatConnection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
 
     void fetchEmojis();
 };

src/models/customemojimodel_p.h

@@ -5,7 +5,8 @@
 
 #include "customemojimodel.h"
 #include <QRegularExpression>
-#include <connection.h>
+
+class NeoChatConnection;
 
 struct CustomEmoji {
     QString name; // with :semicolons:
@@ -14,6 +15,6 @@ struct CustomEmoji {
 };
 
 struct CustomEmojiModel::Private {
-    Quotient::Connection *conn = nullptr;
+    QPointer<NeoChatConnection> connection;
     QList<CustomEmoji> emojies;
 };

src/models/devicesmodel.cpp

@@ -11,9 +11,10 @@
 #include <KLocalizedString>
 
 #include <Quotient/csapi/device_management.h>
-#include <Quotient/connection.h>
 #include <Quotient/user.h>
 
+#include "neochatconnection.h"
+
 using namespace Quotient;
 
 DevicesModel::DevicesModel(QObject *parent)
@@ -152,12 +153,12 @@ void DevicesModel::setName(const QString &deviceId, const QString &name)
     });
 }
 
-Connection *DevicesModel::connection() const
+NeoChatConnection *DevicesModel::connection() const
 {
     return m_connection;
 }
 
-void DevicesModel::setConnection(Connection *connection)
+void DevicesModel::setConnection(NeoChatConnection *connection)
 {
     if (m_connection) {
         disconnect(m_connection, nullptr, this, nullptr);

src/models/devicesmodel.h

@@ -9,10 +9,7 @@
 
 #include <Quotient/csapi/definitions/client_device.h>
 
-namespace Quotient
-{
-class Connection;
-}
+class NeoChatConnection;
 
 /**
  * @class DevicesModel
@@ -31,7 +28,7 @@ class DevicesModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting its devices from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
 
 public:
     /**
@@ -88,9 +85,8 @@ public:
 
     explicit DevicesModel(QObject *parent = nullptr);
 
-
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *connection);
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
 
 Q_SIGNALS:
     void connectionChanged();
@@ -99,5 +95,5 @@ Q_SIGNALS:
 private:
     void fetchDevices();
     QList<Quotient::Device> m_devices;
-    QPointer<Quotient::Connection> m_connection;
+    QPointer<NeoChatConnection> m_connection;
 };

src/models/messagecontentmodel.cpp

@@ -246,70 +246,86 @@ void MessageContentModel::updateComponents(bool isEditing)
     if (eventCast<const Quotient::RoomMessageEvent>(m_event)
         && eventCast<const Quotient::RoomMessageEvent>(m_event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
         m_components += MessageComponent{MessageComponentType::Verification, QString(), {}};
-    } else {
-        EventHandler eventHandler(m_room, m_event);
-        if (eventHandler.hasReply()) {
-            if (m_room->findInTimeline(eventHandler.getReplyId()) == m_room->historyEdge()) {
-                m_components += MessageComponent{MessageComponentType::ReplyLoad, QString(), {}};
-                m_room->loadReply(m_event->id(), eventHandler.getReplyId());
-            } else {
-                m_components += MessageComponent{MessageComponentType::Reply, QString(), {}};
-            }
-        }
+        endResetModel();
+        return;
+    }
 
-        if (isEditing) {
-            m_components += MessageComponent{MessageComponentType::Edit, QString(), {}};
-        } else if (m_event->isRedacted()) {
-            m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
+    if (m_event->isRedacted()) {
+        m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
+        endResetModel();
+        return;
+    }
+
+    EventHandler eventHandler(m_room, m_event);
+    if (eventHandler.hasReply()) {
+        if (m_room->findInTimeline(eventHandler.getReplyId()) == m_room->historyEdge()) {
+            m_components += MessageComponent{MessageComponentType::ReplyLoad, QString(), {}};
+            m_room->loadReply(m_event->id(), eventHandler.getReplyId());
         } else {
-            if (eventHandler.messageComponentType() == MessageComponentType::Text) {
-                const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
-                auto body = EventHandler::rawMessageBody(*event);
-                m_components.append(TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced()));
-            } else if (eventHandler.messageComponentType() == MessageComponentType::File) {
-                m_components += MessageComponent{MessageComponentType::File, QString(), {}};
-                if (m_emptyItinerary) {
-                    auto fileTransferInfo = fileInfo();
-
-#ifndef Q_OS_ANDROID
-                    KSyntaxHighlighting::Repository repository;
-                    const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
-                    if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
-                        QFile file(fileTransferInfo.localPath.path());
-                        file.open(QIODevice::ReadOnly);
-                        m_components += MessageComponent{MessageComponentType::Code,
-                                                         QString::fromStdString(file.readAll().toStdString()),
-                                                         {{QStringLiteral("class"), definitionForFile.name()}}};
-                    }
-#endif
-
-                    if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
-                        QImageReader reader(fileTransferInfo.localPath.path());
-                        m_components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
-                    }
-                } else {
-                    updateItineraryModel();
-                    if (m_itineraryModel != nullptr) {
-                        m_components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
-                    }
-                }
-            } else {
-                m_components += MessageComponent{eventHandler.messageComponentType(), QString(), {}};
-            }
+            m_components += MessageComponent{MessageComponentType::Reply, QString(), {}};
         }
+    }
 
-        if (m_linkPreviewer != nullptr) {
-            if (m_linkPreviewer->loaded()) {
-                m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
-            } else {
-                m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
-            }
+    if (isEditing) {
+        m_components += MessageComponent{MessageComponentType::Edit, QString(), {}};
+    } else {
+        m_components.append(componentsForType(eventHandler.messageComponentType()));
+    }
+
+    if (m_linkPreviewer != nullptr) {
+        if (m_linkPreviewer->loaded()) {
+            m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
+        } else {
+            m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
         }
     }
 
     endResetModel();
 }
 
+QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentType::Type type)
+{
+    switch (type) {
+    case MessageComponentType::Text: {
+        const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+        auto body = EventHandler::rawMessageBody(*event);
+        return TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
+    }
+    case MessageComponentType::File: {
+        QList<MessageComponent> components;
+        components += MessageComponent{MessageComponentType::File, QString(), {}};
+        if (m_emptyItinerary) {
+            auto fileTransferInfo = fileInfo();
+
+#ifndef Q_OS_ANDROID
+            KSyntaxHighlighting::Repository repository;
+            const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
+            if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
+                QFile file(fileTransferInfo.localPath.path());
+                file.open(QIODevice::ReadOnly);
+                components += MessageComponent{MessageComponentType::Code,
+                                               QString::fromStdString(file.readAll().toStdString()),
+                                               {{QStringLiteral("class"), definitionForFile.name()}}};
+            }
+#endif
+
+            if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
+                QImageReader reader(fileTransferInfo.localPath.path());
+                components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
+            }
+        } else {
+            updateItineraryModel();
+            if (m_itineraryModel != nullptr) {
+                components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
+            }
+        }
+        return components;
+    }
+    default:
+        return {MessageComponent{type, QString(), {}}};
+    }
+}
+
 void MessageContentModel::updateLinkPreviewer()
 {
     if (m_room == nullptr || m_event == nullptr) {

src/models/messagecontentmodel.h

@@ -98,6 +98,8 @@ private:
     QPointer<LinkPreviewer> m_linkPreviewer;
     ItineraryModel *m_itineraryModel = nullptr;
 
+    QList<MessageComponent> componentsForType(MessageComponentType::Type type);
+
     void updateLinkPreviewer();
     void updateItineraryModel();
     bool m_emptyItinerary = false;

src/models/messageeventmodel.cpp

@@ -7,7 +7,6 @@
 
 #include "neochatconfig.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/csapi/rooms.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
@@ -117,34 +116,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
 
                 if (message != nullptr) {
                     createEventObjects(message);
-                    if (NeoChatConfig::self()->showFancyEffects()) {
-                        QString planBody = message->plainBody();
-                        // snowflake
-                        const QString snowlakeEmoji = QString::fromUtf8("\xE2\x9D\x84");
-                        if (planBody.contains(snowlakeEmoji)) {
-                            Q_EMIT fancyEffectsReasonFound(QStringLiteral("snowflake"));
-                        }
-                        // fireworks
-                        const QString fireworksEmoji = QString::fromUtf8("\xF0\x9F\x8E\x86");
-                        if (planBody.contains(fireworksEmoji)) {
-                            Q_EMIT fancyEffectsReasonFound(QStringLiteral("fireworks"));
-                        }
-                        // sparkler
-                        const QString sparklerEmoji = QString::fromUtf8("\xF0\x9F\x8E\x87");
-                        if (planBody.contains(sparklerEmoji)) {
-                            Q_EMIT fancyEffectsReasonFound(QStringLiteral("fireworks"));
-                        }
-                        // party pooper
-                        const QString partyEmoji = QString::fromUtf8("\xF0\x9F\x8E\x89");
-                        if (planBody.contains(partyEmoji)) {
-                            Q_EMIT fancyEffectsReasonFound(QStringLiteral("confetti"));
-                        }
-                        // confetti ball
-                        const QString confettiEmoji = QString::fromUtf8("\xF0\x9F\x8E\x8A");
-                        if (planBody.contains(confettiEmoji)) {
-                            Q_EMIT fancyEffectsReasonFound(QStringLiteral("confetti"));
-                        }
-                    }
                 }
                 if (event->is<PollStartEvent>()) {
                     m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event.get()));

src/models/messageeventmodel.h

@@ -140,5 +140,4 @@ private:
 
 Q_SIGNALS:
     void roomChanged();
-    void fancyEffectsReasonFound(const QString &fancyEffect);
 };

src/models/messagefiltermodel.cpp

@@ -36,6 +36,14 @@ MessageFilterModel::MessageFilterModel(QObject *parent, TimelineModel *sourceMod
 }
 
 bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    if (NeoChatConfig::self()->showAllEvents()) {
+        return true;
+    }
+    return eventIsVisible(sourceRow, sourceParent);
+}
+
+bool MessageFilterModel::eventIsVisible(int sourceRow, const QModelIndex &sourceParent) const
 {
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
@@ -59,9 +67,8 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
     // Don't show state events that are not the first in a consecutive group on the
     // same day as they will be grouped as a single delegate.
     const bool notLastRow = sourceRow < sourceModel()->rowCount() - 1;
-    const bool previousEventIsState = notLastRow
-        ? sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == DelegateType::State
-        : false;
+    const bool previousEventIsState =
+        notLastRow ? sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == DelegateType::State : false;
     const bool newDay = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageEventModel::ShowSectionRole).toBool();
     if (eventType == DelegateType::State && notLastRow && previousEventIsState && !newDay) {
         return false;
@@ -72,7 +79,11 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
 
 QVariant MessageFilterModel::data(const QModelIndex &index, int role) const
 {
-    if (role == AggregateDisplayRole) {
+    if (role == MessageEventModel::DelegateTypeRole && NeoChatConfig::self()->showAllEvents()) {
+        if (!eventIsVisible(index.row(), index.parent())) {
+            return DelegateType::Other;
+        }
+    } else if (role == AggregateDisplayRole) {
         return aggregateEventToString(mapToSource(index).row());
     } else if (role == StateEventsRole) {
         return stateEventsList(mapToSource(index).row());

src/models/messagefiltermodel.h

@@ -60,6 +60,8 @@ public:
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
 private:
+    bool eventIsVisible(int sourceRow, const QModelIndex &sourceParent) const;
+
     /**
      * @brief Aggregation of the text of consecutive state events starting at row.
      *

src/models/notificationsmodel.cpp

@@ -3,7 +3,6 @@
 
 #include "notificationsmodel.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/events/event.h>
 #include <Quotient/uri.h>
 

src/models/publicroomlistmodel.cpp

@@ -3,8 +3,7 @@
 
 #include "publicroomlistmodel.h"
 
-#include <Quotient/connection.h>
-
+#include "neochatconnection.h"
 #include "publicroomlist_logging.h"
 
 using namespace Quotient;
@@ -14,14 +13,14 @@ PublicRoomListModel::PublicRoomListModel(QObject *parent)
 {
 }
 
-Quotient::Connection *PublicRoomListModel::connection() const
+NeoChatConnection *PublicRoomListModel::connection() const
 {
     return m_connection;
 }
 
-void PublicRoomListModel::setConnection(Connection *conn)
+void PublicRoomListModel::setConnection(NeoChatConnection *connection)
 {
-    if (m_connection == conn) {
+    if (m_connection == connection) {
         return;
     }
 
@@ -38,7 +37,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
 
     endResetModel();
 
-    m_connection = conn;
+    m_connection = connection;
 
     if (job) {
         job->abandon();

src/models/publicroomlistmodel.h

@@ -9,10 +9,7 @@
 
 #include <Quotient/csapi/list_public_rooms.h>
 
-namespace Quotient
-{
-class Connection;
-}
+class NeoChatConnection;
 
 /**
  * @class PublicRoomListModel
@@ -33,7 +30,7 @@ class PublicRoomListModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting its rooms from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
     /**
      * @brief The server to get the public room list from.
@@ -95,8 +92,8 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *conn);
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
 
     [[nodiscard]] QString server() const;
     void setServer(const QString &value);
@@ -117,7 +114,7 @@ public:
     Q_INVOKABLE void search(int limit = 50);
 
 private:
-    QPointer<Quotient::Connection> m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection = nullptr;
     QString m_server;
     QString m_searchText;
     bool m_showOnlySpaces = false;

src/models/pushrulemodel.cpp

@@ -5,13 +5,13 @@
 
 #include <QDebug>
 
-#include <Quotient/connection.h>
 #include <Quotient/converters.h>
 #include <Quotient/csapi/definitions/push_ruleset.h>
 #include <Quotient/csapi/pushrules.h>
 #include <Quotient/jobs/basejob.h>
 
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 
 #include <KLazyLocalizedString>
 
@@ -454,7 +454,7 @@ void PushRuleModel::setConnection(NeoChatConnection *connection)
     Q_EMIT connectionChanged();
 
     if (m_connection) {
-        connect(m_connection, &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
+        connect(m_connection, &NeoChatConnection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
         updateNotificationRules(QStringLiteral("m.push_rules"));
     }
 }

src/models/pushrulemodel.h

@@ -126,7 +126,7 @@ private Q_SLOTS:
 private:
     PushRuleAction::Action m_defaultKeywordAction;
     QList<Rule> m_rules;
-    NeoChatConnection *m_connection;
+    QPointer<NeoChatConnection> m_connection;
 
     void setRules(QList<Quotient::PushRule> rules, PushRuleKind::Kind kind);
 

src/models/reactionmodel.cpp

@@ -68,7 +68,8 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                     text += i18nc("Separate the usernames of users", " and ");
                 }
             }
-            text += reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
+            auto displayName = reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
+            text += displayName.isEmpty() ? reaction.authors.at(i).toMap()[QStringLiteral("id")].toString() : displayName;
         }
 
         if (reaction.authors.count() > 3) {

src/models/roomlistmodel.cpp

@@ -25,12 +25,12 @@ RoomListModel::RoomListModel(QObject *parent)
 
 RoomListModel::~RoomListModel() = default;
 
-Quotient::Connection *RoomListModel::connection() const
+NeoChatConnection *RoomListModel::connection() const
 {
     return m_connection;
 }
 
-void RoomListModel::setConnection(Connection *connection)
+void RoomListModel::setConnection(NeoChatConnection *connection)
 {
     if (connection == m_connection) {
         return;

src/models/roomlistmodel.h

@@ -12,10 +12,11 @@ class NeoChatRoom;
 
 namespace Quotient
 {
-class Connection;
 class Room;
 }
 
+class NeoChatConnection;
+
 /**
  * @class RoomListModel
  *
@@ -29,7 +30,7 @@ class RoomListModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting its rooms from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
 public:
     /**
@@ -60,8 +61,8 @@ public:
     explicit RoomListModel(QObject *parent = nullptr);
     ~RoomListModel() override;
 
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *connection);
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
 
     /**
      * @brief Get the given role value at the given index.
@@ -109,7 +110,7 @@ private Q_SLOTS:
     void refresh(NeoChatRoom *room, const QList<int> &roles = {});
 
 private:
-    Quotient::Connection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
     QList<NeoChatRoom *> m_rooms;
 
     QString m_activeSpaceId;

src/models/roomtreemodel.cpp

@@ -3,7 +3,6 @@
 
 #include "roomtreemodel.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/room.h>
 
 #include "eventhandler.h"
@@ -300,9 +299,6 @@ QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
             return NeoChatRoomType::typeName(index.row());
         }
         if (role == DelegateTypeRole) {
-            if (index.row() == NeoChatRoomType::Search) {
-                return QStringLiteral("search");
-            }
             if (index.row() == NeoChatRoomType::AddDirect) {
                 return QStringLiteral("addDirect");
             }

src/models/searchmodel.cpp

@@ -10,7 +10,6 @@
 
 #include <QGuiApplication>
 
-#include <Quotient/connection.h>
 #include <Quotient/events/stickerevent.h>
 
 #include <KLocalizedString>

src/models/serverlistmodel.cpp

@@ -3,8 +3,6 @@
 
 #include "serverlistmodel.h"
 
-#include <Quotient/connection.h>
-
 #include <QDebug>
 
 #include <KConfig>

src/models/serverlistmodel.h

@@ -110,7 +110,7 @@ Q_SIGNALS:
 private:
     QList<Server> m_servers;
     QPointer<Quotient::QueryPublicRoomsJob> m_checkServerJob = nullptr;
-    NeoChatConnection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
 
     void initialize();
 };

src/models/sortfilterroomlistmodel.cpp

@@ -5,6 +5,8 @@
 
 #include "roomlistmodel.h"
 
+#include "neochatconnection.h"
+
 SortFilterRoomListModel::SortFilterRoomListModel(RoomListModel *sourceModel, QObject *parent)
     : QSortFilterProxyModel(parent)
 {

src/models/sortfilterroomtreemodel.cpp

@@ -129,10 +129,6 @@ QString SortFilterRoomTreeModel::filterText() const
 bool SortFilterRoomTreeModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     if (!source_parent.isValid()) {
-        if (sourceModel()->data(sourceModel()->index(source_row, 0), RoomTreeModel::CategoryRole).toInt() == NeoChatRoomType::Search
-            && NeoChatConfig::collapsed()) {
-            return true;
-        }
         if (sourceModel()->data(sourceModel()->index(source_row, 0), RoomTreeModel::CategoryRole).toInt() == NeoChatRoomType::AddDirect
             && m_mode == DirectChats) {
             return true;
@@ -205,4 +201,14 @@ void SortFilterRoomTreeModel::setMode(SortFilterRoomTreeModel::Mode mode)
     invalidate();
 }
 
+QModelIndex SortFilterRoomTreeModel::currentRoomIndex() const
+{
+    const auto roomModel = dynamic_cast<RoomTreeModel *>(sourceModel());
+    if (roomModel == nullptr) {
+        return {};
+    }
+
+    return mapFromSource(roomModel->indexForRoom(RoomManager::instance().currentRoom()));
+}
+
 #include "moc_sortfilterroomtreemodel.cpp"

src/models/sortfilterroomtreemodel.h

@@ -76,6 +76,8 @@ public:
     Mode mode() const;
     void setMode(Mode mode);
 
+    Q_INVOKABLE QModelIndex currentRoomIndex() const;
+
 protected:
     /**
      * @brief Returns true if the value of source_left is less than source_right.

src/models/spacechildrenmodel.cpp

@@ -3,7 +3,6 @@
 
 #include "spacechildrenmodel.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/room.h>
 
@@ -47,7 +46,7 @@ void SpaceChildrenModel::setSpace(NeoChatRoom *space)
     }
 
     auto connection = m_space->connection();
-    connect(connection, &Quotient::Connection::loadedRoomState, this, [this](Quotient::Room *room) {
+    connect(connection, &NeoChatConnection::loadedRoomState, this, [this](Quotient::Room *room) {
         if (m_pendingChildren.contains(room->name())) {
             m_pendingChildren.removeAll(room->name());
             refreshModel();

src/models/spacetreeitem.h

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
+#include <QPointer>
+
 #include <Quotient/csapi/space_hierarchy.h>
 #include <Quotient/events/stateevent.h>
 
@@ -149,7 +151,7 @@ public:
     bool isSuggested() const;
 
 private:
-    NeoChatConnection *m_connection;
+    QPointer<NeoChatConnection> m_connection;
     std::vector<std::unique_ptr<SpaceTreeItem>> m_children;
     SpaceTreeItem *m_parentItem;
 

src/models/userdirectorylistmodel.cpp

@@ -3,9 +3,10 @@
 
 #include "userdirectorylistmodel.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/room.h>
 
+#include "neochatconnection.h"
+
 using namespace Quotient;
 
 UserDirectoryListModel::UserDirectoryListModel(QObject *parent)
@@ -13,14 +14,14 @@ UserDirectoryListModel::UserDirectoryListModel(QObject *parent)
 {
 }
 
-Quotient::Connection *UserDirectoryListModel::connection() const
+NeoChatConnection *UserDirectoryListModel::connection() const
 {
     return m_connection;
 }
 
-void UserDirectoryListModel::setConnection(Connection *conn)
+void UserDirectoryListModel::setConnection(NeoChatConnection *connection)
 {
-    if (m_connection == conn) {
+    if (m_connection == connection) {
         return;
     }
 
@@ -35,7 +36,7 @@ void UserDirectoryListModel::setConnection(Connection *conn)
 
     endResetModel();
 
-    m_connection = conn;
+    m_connection = connection;
     Q_EMIT connectionChanged();
 
     if (m_job) {

src/models/userdirectorylistmodel.h

@@ -9,10 +9,7 @@
 
 #include <Quotient/csapi/users.h>
 
-namespace Quotient
-{
-class Connection;
-}
+class NeoChatConnection;
 
 /**
  * @class UserDirectoryListModel
@@ -32,7 +29,7 @@ class UserDirectoryListModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting users from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
     /**
      * @brief The text to search the public room list for.
@@ -57,8 +54,8 @@ public:
 
     explicit UserDirectoryListModel(QObject *parent = nullptr);
 
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *conn);
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
 
     [[nodiscard]] QString searchText() const;
     void setSearchText(const QString &searchText);
@@ -99,7 +96,7 @@ Q_SIGNALS:
     void searchingChanged();
 
 private:
-    Quotient::Connection *m_connection = nullptr;
+    QPointer<NeoChatConnection> m_connection;
     QString m_searchText;
 
     bool attempted = false;

src/models/userlistmodel.cpp

@@ -5,7 +5,6 @@
 
 #include <QGuiApplication>
 
-#include <Quotient/connection.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 
 #include "neochatroom.h"

src/neochat.notifyrc

@@ -202,6 +202,7 @@ Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
 Name[ru]=Новое приглашение
+Name[sk]=Nová pozvánka
 Name[sl]=Novo povabilo
 Name[sv]=Ny inbjudan
 Name[ta]=புதிய அழைப்பிதழ்
@@ -241,6 +242,7 @@ Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
 Comment[ru]=Доступно новое приглашение в комнату
+Comment[sk]=Máte novú pozvánku do miestnosti
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
@@ -253,12 +255,15 @@ Action=Popup
 
 [Event/Share]
 Name=Share
+Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
+Name[en_GB]=Share
 Name[eo]=Kundividi
 Name[es]=Compartir
 Name[eu]=Partekatu
+Name[fi]=Jaa
 Name[fr]=Partager
 Name[hu]=Megosztás
 Name[ia]=Comparti
@@ -267,18 +272,23 @@ Name[ka]=გაზიარება
 Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[pl]=Udostępnij
+Name[sk]=Zdieľať
 Name[sl]=Deli
+Name[sv]=Dela
 Name[ta]=பகிர்
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
 Name[x-test]=xxSharexx
 Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
+Comment[ar]=نتيجة مشاركة محتوى
 Comment[ca]=El resultat de compartir una peça de contingut
 Comment[ca@valencia]=El resultat de compartir una peça de contingut
+Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero
 Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
+Comment[fi]=Tulos yhden sisältöosasen jakamisesta
 Comment[fr]=Le résultat du partage d'une partie de contenu.
 Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
@@ -287,7 +297,9 @@ Comment[ka]=შემცველობის ნაწილის გაზი
 Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[pl]=Wynik udostępniania kawałka treści
+Comment[sk]=Výsledok zdieľania obsahu
 Comment[sl]=Rezultat deljenega kosa vsebine
+Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних

src/neochatconfig.kcfg

@@ -100,10 +100,6 @@
       <label>Minimize to system tray on startup</label>
       <default>false</default>
     </entry>
-    <entry name="ShowFancyEffects" type="bool">
-      <label>Show Fancy Effects</label>
-      <default>true</default>
-    </entry>
     <entry name="MediaMaxWidth" type="int">
       <label>The maximum width any media item in the timeline can be.</label>
       <default>540</default>
@@ -161,10 +157,18 @@
     </entry>
   </group>
   <group name="Debug">
+    <entry name="ShowAllEvents" type="bool">
+      <label>Don't hide any events in the timeline</label>
+      <default>false</default>
+    </entry>
     <entry name="AlwaysVerifyDevice" type="bool">
       <label>Always allow device verification</label>
       <default>false</default>
     </entry>
+    <entry name="WindowTitleFocus" type="bool">
+      <label>Show the current focus item in the window title</label>
+      <default>false</default>
+    </entry>
   </group>
   <group name="FeatureFlags">
     <entry name="Threads" type="bool">

src/plasma-runner-neochat.desktop

@@ -72,6 +72,7 @@ Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
 Comment[ru]=Поиск комнат NeoChat
+Comment[sk]=Nájsť miestnosti v NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்

src/purpose/purposeplugin.json

@@ -3,35 +3,23 @@
         "Authors": [
             {
                 "Name": "Tobias Fella",
-                "Name[ca@valencia]": "Tobias Fella",
-                "Name[ca]": "Tobias Fella",
-                "Name[cs]": "Tobias Fella",
-                "Name[de]": "Tobias Fella",
-                "Name[es]": "Tobias Fella",
-                "Name[eu]": "Tobias Fella",
-                "Name[fr]": "Tobias Fella",
-                "Name[hu]": "Tobias Fella",
-                "Name[ia]": "Tobias Fella",
-                "Name[it]": "Tobias Fella",
-                "Name[ka]": "Tobias Fella",
-                "Name[lv]": "Tobias Fella",
-                "Name[nl]": "Tobias Fella",
-                "Name[pl]": "Tobias Fella",
-                "Name[sl]": "Tobias Fella",
-                "Name[tr]": "Tobias Fella",
-                "Name[uk]": "Tobias Fella",
-                "Name[x-test]": "xxTobias Fellaxx",
-                "Name[zh_TW]": "Tobias Fella"
+                "Name[ar]": "توبياس فلة",
+                "Name[ta]": "டோபியாஸ் ஃபெல்லா",
+                "Name[x-test]": "xxTobias Fellaxx"
             }
         ],
         "Category": "Utilities",
         "Description": "Share via NeoChat",
+        "Description[ar]": "شارك بواسطة نيوتشات",
         "Description[ca@valencia]": "Compartix a través de NeoChat",
         "Description[ca]": "Comparteix a través del NeoChat",
         "Description[de]": "Über NeoChat teilen",
+        "Description[eo]": "Kundividi per NeoChat",
         "Description[es]": "Compartir mediante NeoChat",
         "Description[eu]": "Partekatu NeoChat bidez",
+        "Description[fi]": "Jaa NeoChatillä",
         "Description[fr]": "Partager grâce à NeoChat",
+        "Description[gl]": "Compartir por NeoChat",
         "Description[hu]": "Megosztás NeoChatben",
         "Description[ia]": "Comparti via NeoChat",
         "Description[it]": "Condividi tramite NeoChat",
@@ -40,6 +28,8 @@
         "Description[nl]": "Delen via NeoChat",
         "Description[pl]": "Udostępnij przez NeoChat",
         "Description[sl]": "Deli prek NeoChat",
+        "Description[sv]": "Dela via NeoChat",
+        "Description[ta]": "நியோச்சாட் மூலம் பகிர்",
         "Description[tr]": "NeoChat ile Paylaş",
         "Description[uk]": "Оприлюднити за допомогою NeoChat",
         "Description[x-test]": "xxShare via NeoChatxx",
@@ -47,26 +37,10 @@
         "Icon": "org.kde.neochat",
         "License": "GPL",
         "Name": "NeoChat",
-        "Name[ast]": "NeoChat",
-        "Name[ca@valencia]": "NeoChat",
-        "Name[ca]": "NeoChat",
-        "Name[cs]": "NeoChat",
-        "Name[de]": "NeoChat",
-        "Name[es]": "NeoChat",
-        "Name[eu]": "NeoChat",
-        "Name[fr]": "NeoChat",
-        "Name[hu]": "NeoChat",
+        "Name[ar]": "نيوتشات",
         "Name[ia]": "Neochat",
-        "Name[it]": "NeoChat",
-        "Name[ka]": "NeoChat",
-        "Name[lv]": "NeoChat",
-        "Name[nl]": "NeoChat",
-        "Name[pl]": "NeoChat",
-        "Name[sl]": "NeoChat",
-        "Name[tr]": "NeoChat",
-        "Name[uk]": "NeoChat",
+        "Name[ta]": "நியோச்சாட்",
         "Name[x-test]": "xxNeoChatxx",
-        "Name[zh_TW]": "NeoChat",
         "X-Purpose-ActionDisplay": "NeoChat"
     },
     "X-Purpose-PluginTypes": [

src/qml/AttachDialog.qml

@@ -13,13 +13,15 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: 16
+    padding: Kirigami.Units.largeSpacing
 
     signal chosen(string path)
 
     contentItem: RowLayout {
+
+        spacing: Kirigami.Units.smallSpacing
+
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -37,11 +39,8 @@ QQC2.Popup {
         Kirigami.Separator {}
 
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
-            padding: 16
-
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {

src/qml/AttachmentPane.qml

@@ -46,7 +46,7 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage);
+                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
                     applicationWindow().pageStack.layers.pop();
                     root.attachmentPath = newPath;

src/qml/ChatBar.qml

@@ -278,6 +278,8 @@ QQC2.Control {
                     Keys.onTabPressed: {
                         if (completionMenu.visible) {
                             completionMenu.complete();
+                        } else {
+                            contextDrawer.handle.children[0].forceActiveFocus()
                         }
                     }
                     Keys.onPressed: event => {

src/qml/CreateRoomDialog.qml

@@ -67,6 +67,11 @@ FormCard.FormCardPage {
                 }
             }
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.showChildType
+        }
+
         FormCard.FormTextFieldDelegate {
             id: roomNameField
             label: i18n("Name:")
@@ -75,17 +80,27 @@ FormCard.FormCardPage {
             }
         }
 
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormTextFieldDelegate {
             id: roomTopicField
             label: i18n("Topic:")
             onAccepted: ok.clicked()
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormCheckDelegate {
             id: newOfficialCheck
             visible: root.parentId.length > 0
             text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
             checked: true
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }
+
         FormCard.FormButtonDelegate {
             id: ok
             text: i18nc("@action:button", "Ok")
@@ -211,6 +226,9 @@ FormCard.FormCardPage {
                 });
             }
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormCheckDelegate {
             id: existingOfficialCheck
             visible: root.parentId.length > 0
@@ -230,6 +248,11 @@ FormCard.FormCardPage {
                 return false;
             }
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }
+
         FormCard.FormCheckDelegate {
             id: makeCanonicalCheck
             text: i18nc("@option:check The canonical parent is the default one if a room has multiple parent spaces.", "Make this space the canonical parent")
@@ -237,6 +260,9 @@ FormCard.FormCardPage {
 
             enabled: existingOfficialCheck.enabled
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormButtonDelegate {
             text: i18nc("@action:button", "Ok")
             enabled: chosenRoomDelegate.visible

src/qml/EmojiDelegate.qml

@@ -48,10 +48,10 @@ QQC2.ItemDelegate {
 
     background: Rectangle {
         color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
 
         Rectangle {
-            radius: Kirigami.Units.smallSpacing
+            radius: Kirigami.Units.cornerRadius
             anchors.fill: parent
             color: Kirigami.Theme.highlightColor
             opacity: root.hovered && !root.pressed ? 0.2 : 0

src/qml/EmojiDialog.qml

@@ -40,7 +40,7 @@ QQC2.Popup {
     background: Kirigami.ShadowedRectangle {
         Kirigami.Theme.colorSet: Kirigami.Theme.View
         color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.mediumSpacing
+        radius: Kirigami.Units.cornerRadius
         shadow {
             size: Kirigami.Units.largeSpacing
             color: Qt.rgba(0.0, 0.0, 0.0, 0.3)