rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'plain-text-messages' into 0.7.0-dev

This commit is contained in:
Nicolas Werner 2020-01-29 00:42:46 +01:00
parent 247af99399 b0ff1baa1d
commit 75c5c01189
21 changed files with 1008 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -333,7 +333,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 1fd59de2a37e6b547db8e5b52114f3f10171ef2f
GIT_TAG 03b5008a05f895e91e3968de7b68db50f6c41b2a
)
FetchContent_MakeAvailable(MatrixClient)
else()

2
README.md
View File

@ -209,7 +209,7 @@ cmake --build build
To use bundled dependencies you can use hunter, i.e.:
```bash
cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DCMAKE_BUILD_TYPE=OFF -DUSE_BUNDLED_OPENSSL=OFF
cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF
cmake --build build --config Release
```

101
resources/langs/nheko_de.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>Bitte melde dich erneut an: %1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>Raum konnte nicht erstellt werden: %1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>Konnte den Raum nicht verlassen: %1</translation>
</message>
@ -385,7 +451,7 @@
<translation>Emoji</translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Datei auswählen</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation>-- verschlüsselter Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
@ -646,42 +712,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Ins Benachrichtigungsfeld minimieren</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Im Benachrichtigungsfeld starten</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Gruppen-Seitenleiste</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation>Runde Profilbilder</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Schreibbenachrichtigungen</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Lesebestätigungen</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>Desktopbenachrichtigungen</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation>Skalierungsfaktor</translation>
</message>
@ -741,7 +812,7 @@
<translation>ALLGEMEINES</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation>Öffne Sessions Datei</translation>
</message>

101
resources/langs/nheko_el.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@ -385,7 +451,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Διάλεξε ένα αρχείο</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -646,42 +712,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Ελαχιστοποίηση</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation type="unfinished"></translation>
</message>
@ -741,7 +812,7 @@
<translation>ΓΕΝΙΚΑ</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>

101
resources/langs/nheko_en.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>Please try to login again: %1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>Room creation failed: %1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>Failed to leave room: %1</translation>
</message>
@ -385,7 +451,7 @@
<translation>Emoji</translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Select a file</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished">-- Encrypted Event (No keys found for decryption) --</translation>
@ -646,42 +712,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Minimize to tray</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Start in tray</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Group&apos;s sidebar</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Typing notifications</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Read receipts</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>Desktop notifications</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation>Scale factor</translation>
</message>
@ -741,7 +812,7 @@
<translation>GENERAL</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation>Open Sessions File</translation>
</message>

101
resources/langs/nheko_fi.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>Huoneen luominen epäonnistui: %1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>Huoneesta poistuminen epäonnistui: %1</translation>
</message>
@ -385,7 +451,7 @@
<translation>Emoji</translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Valitse tiedosto</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
@ -646,42 +712,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Pienennä ilmoitusalueelle</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Aloita ilmoitusalueella</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Ryhmäsivupalkki</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Kirjoitusilmoitukset</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Lukukuittaukset</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>Työpöytäilmoitukset</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation>Mittakerroin</translation>
</message>
@ -741,7 +812,7 @@
<translation>YLEISET ASETUKSET</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation>Avaa Istuntoavaintiedosto</translation>
</message>

101
resources/langs/nheko_fr.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@ -386,7 +452,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Sélectionnez un fichier</translation>
</message>
@ -404,7 +470,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -647,42 +713,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Réduire à la barre des tâches</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Démarrer dans la barre des tâches</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Barre latérale des groupes</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Notifications d&apos;écriture</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Accusés de lecture</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation type="unfinished"></translation>
</message>
@ -742,7 +813,7 @@
<translation>GÉNÉRAL</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>

101
resources/langs/nheko_nl.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@ -385,7 +451,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Kies een bestand</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -646,42 +712,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Minimaliseren naar systeemvak</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Geminimaliseerd opstarten</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Zijbalk van groep</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Meldingen bij typen van berichten</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Leesbevestigingen</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation type="unfinished"></translation>
</message>
@ -741,7 +812,7 @@
<translation>ALGEMEEN</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>

101
resources/langs/nheko_pl.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>Spróbuj zalogować się ponownie: %1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>Tworzenie pokoju nie powiodło się: %1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>Nie udało się opuścić pokoju: %1</translation>
</message>
@ -385,7 +451,7 @@
<translation>Emoji</translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Wybierz plik</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -647,42 +713,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Zminimalizuj do paska zadań</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Rozpocznij na pasku zadań</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Pasek boczny grupy</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Powiadomienia o pisaniu</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Potwierdzenia przeczytania</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>Powiadomienia na pulpicie</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation type="unfinished"></translation>
</message>
@ -742,7 +813,7 @@
<translation>OGÓLNE</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>

101
resources/langs/nheko_ru.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>Повторите попытку входа: %1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>Не удалось создать комнату: %1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>Не удалось покинуть комнату: %1</translation>
</message>
@ -385,7 +451,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>Выберите файл</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -647,42 +713,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>Сворачивать в системную панель</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>Запускать в системной панели</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>Боковая панель групп</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>Сообщать о наборе сообщения</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>Подтверждать прочтение</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>Уведомления на рабочем столе</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation>Масштаб</translation>
</message>
@ -742,7 +813,7 @@
<translation>ГЛАВНОЕ</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation>Открыть файл сеансов</translation>
</message>

101
resources/langs/nheko_zh_CN.ts
View File

@ -4,7 +4,53 @@
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+328"/>
<location filename="../../src/ChatPage.cpp" line="+211"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+84"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-6"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Failed to kick %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Kicked user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<source>Failed to ban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Banned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>Failed to unban %1 in %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unbanned user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+50"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@ -25,17 +71,37 @@
</message>
<message>
<location line="+51"/>
<location line="+155"/>
<location line="+154"/>
<source>Please try to login again: %1</source>
<translation>请尝试再次登录：%1</translation>
</message>
<message>
<location line="-47"/>
<location line="-77"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>You joined the room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
<translation>创建聊天室失败：%1</translation>
</message>
<message>
<location line="+16"/>
<location line="+5"/>
<source>Room %1 created</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>Failed to leave room: %1</source>
<translation>离开聊天室失败：%1</translation>
</message>
@ -385,7 +451,7 @@
<translation></translation>
</message>
<message>
<location line="+73"/>
<location line="+81"/>
<source>Select a file</source>
<translation>选择一个文件</translation>
</message>
@ -403,7 +469,7 @@
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+698"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+716"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
@ -645,42 +711,47 @@
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+172"/>
<location filename="../../src/UserSettingsPage.cpp" line="+188"/>
<source>Minimize to tray</source>
<translation>最小化至托盘</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Start in tray</source>
<translation>在托盘启动</translation>
</message>
<message>
<location line="+11"/>
<location line="+5"/>
<source>Group&apos;s sidebar</source>
<translation>群组侧边栏</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Circular Avatars</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Typing notifications</source>
<translation>打字通知</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Read receipts</source>
<translation>阅读回执</translation>
</message>
<message>
<location line="+9"/>
<location line="+3"/>
<source>Send messages as markdown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Desktop notifications</source>
<translation>桌面通知</translation>
</message>
<message>
<location line="+9"/>
<location line="+4"/>
<source>Scale factor</source>
<translation type="unfinished"></translation>
</message>
@ -740,7 +811,7 @@
<translation>通用</translation>
</message>
<message>
<location line="+161"/>
<location line="+168"/>
<source>Open Sessions File</source>
<translation>打开会话文件</translation>
</message>

101
src/ChatPage.cpp
View File

@ -116,7 +116,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
contentLayout_->setMargin(0);
top_bar_ = new TopRoomBar(this);
view_manager_ = new TimelineViewManager(this);
view_manager_ = new TimelineViewManager(userSettings_, this);
contentLayout_->addWidget(top_bar_);
contentLayout_->addWidget(view_manager_->getWidget());
@ -208,12 +208,11 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
mtx::http::RequestErr err) {
if (err) {
emit showNotification(
QString("Failed to invite user: %1").arg(user));
tr("Failed to invite user: %1").arg(user));
return;
}
emit showNotification(
QString("Invited user: %1").arg(user));
emit showNotification(tr("Invited user: %1").arg(user));
});
});
}
@ -280,6 +279,89 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(text_input_, &TextInputWidget::sendJoinRoomRequest, this, &ChatPage::joinRoom);
// invites and bans via quick command
connect(text_input_,
&TextInputWidget::sendInviteRoomRequest,
this,
[this](QString userid, QString reason) {
http::client()->invite_user(
current_room_.toStdString(),
userid.toStdString(),
[this, userid, room = current_room_](const mtx::responses::Empty &,
mtx::http::RequestErr err) {
if (err) {
emit showNotification(tr("Failed to invite %1 to %2: %3")
.arg(userid)
.arg(room)
.arg(QString::fromStdString(
err->matrix_error.error)));
} else
emit showNotification(tr("Invited user: %1").arg(userid));
},
reason.trimmed().toStdString());
});
connect(text_input_,
&TextInputWidget::sendKickRoomRequest,
this,
[this](QString userid, QString reason) {
http::client()->kick_user(
current_room_.toStdString(),
userid.toStdString(),
[this, userid, room = current_room_](const mtx::responses::Empty &,
mtx::http::RequestErr err) {
if (err) {
emit showNotification(tr("Failed to kick %1 to %2: %3")
.arg(userid)
.arg(room)
.arg(QString::fromStdString(
err->matrix_error.error)));
} else
emit showNotification(tr("Kicked user: %1").arg(userid));
},
reason.trimmed().toStdString());
});
connect(text_input_,
&TextInputWidget::sendBanRoomRequest,
this,
[this](QString userid, QString reason) {
http::client()->ban_user(
current_room_.toStdString(),
userid.toStdString(),
[this, userid, room = current_room_](const mtx::responses::Empty &,
mtx::http::RequestErr err) {
if (err) {
emit showNotification(tr("Failed to ban %1 in %2: %3")
.arg(userid)
.arg(room)
.arg(QString::fromStdString(
err->matrix_error.error)));
} else
emit showNotification(tr("Banned user: %1").arg(userid));
},
reason.trimmed().toStdString());
});
connect(
text_input_,
&TextInputWidget::sendUnbanRoomRequest,
this,
[this](QString userid, QString reason) {
http::client()->unban_user(
current_room_.toStdString(),
userid.toStdString(),
[this, userid, room = current_room_](const mtx::responses::Empty &,
mtx::http::RequestErr err) {
if (err) {
emit showNotification(
tr("Failed to unban %1 in %2: %3")
.arg(userid)
.arg(room)
.arg(QString::fromStdString(err->matrix_error.error)));
} else
emit showNotification(tr("Unbanned user: %1").arg(userid));
},
reason.trimmed().toStdString());
});
connect(
text_input_,
&TextInputWidget::uploadMedia,
@ -1001,19 +1083,18 @@ ChatPage::joinRoom(const QString &room)
room_id, [this, room_id](const nlohmann::json &, mtx::http::RequestErr err) {
if (err) {
emit showNotification(
QString("Failed to join room: %1")
tr("Failed to join room: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
return;
}
emit showNotification("You joined the room");
emit tr("You joined the room");
// We remove any invites with the same room_id.
try {
cache::removeInvite(room_id);
} catch (const lmdb::error &e) {
emit showNotification(
QString("Failed to remove invite: %1").arg(e.what()));
emit showNotification(tr("Failed to remove invite: %1").arg(e.what()));
}
});
}
@ -1036,8 +1117,8 @@ ChatPage::createRoom(const mtx::requests::CreateRoom &req)
return;
}
emit showNotification(QString("Room %1 created")
.arg(QString::fromStdString(res.room_id.to_string())));
emit showNotification(
tr("Room %1 created").arg(QString::fromStdString(res.room_id.to_string())));
});
}

8
src/TextInputWidget.cpp
View File

@ -605,6 +605,14 @@ TextInputWidget::command(QString command, QString args)
sendEmoteMessage(args, input_->related);
} else if (command == "join") {
sendJoinRoomRequest(args);
} else if (command == "invite") {
sendInviteRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
} else if (command == "kick") {
sendKickRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
} else if (command == "ban") {
sendBanRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
} else if (command == "unban") {
sendUnbanRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
} else if (command == "shrug") {
sendTextMessage("¯\\_(ツ)_/¯", input_->related);
} else if (command == "fliptable") {

4
src/TextInputWidget.h
View File

@ -183,6 +183,10 @@ signals:
const std::optional<RelatedInfo> &related);
void sendJoinRoomRequest(const QString &room);
void sendInviteRoomRequest(const QString &userid, const QString &reason);
void sendKickRoomRequest(const QString &userid, const QString &reason);
void sendBanRoomRequest(const QString &userid, const QString &reason);
void sendUnbanRoomRequest(const QString &userid, const QString &reason);
void startedTyping();
void stoppedTyping();

93
src/UserSettingsPage.cpp
View File

@ -50,6 +50,7 @@ UserSettings::load()
hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool();
isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool();
isGroupViewEnabled_ = settings.value("user/group_view", true).toBool();
isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool();
isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool();
isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool();
theme_ = settings.value("user/theme", defaultTheme_).toString();
@ -126,6 +127,7 @@ UserSettings::save()
settings.setValue("typing_notifications", isTypingNotificationsEnabled_);
settings.setValue("read_receipts", isReadReceiptsEnabled_);
settings.setValue("group_view", isGroupViewEnabled_);
settings.setValue("markdown_enabled", isMarkdownEnabled_);
settings.setValue("desktop_notifications", hasDesktopNotifications_);
settings.setValue("theme", theme());
settings.setValue("font_family", font_);
@ -167,70 +169,46 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
topBarLayout_->addWidget(backBtn_, 1, Qt::AlignLeft | Qt::AlignVCenter);
topBarLayout_->addStretch(1);
auto trayOptionLayout_ = new QHBoxLayout;
trayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto trayLabel = new QLabel(tr("Minimize to tray"), this);
trayLabel->setFont(font);
trayToggle_ = new Toggle(this);
auto addSetting = [this, &font](QString labelText) {
auto layout = new QHBoxLayout;
layout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
trayOptionLayout_->addWidget(trayLabel);
trayOptionLayout_->addWidget(trayToggle_, 0, Qt::AlignRight);
auto label = new QLabel(labelText, this);
label->setFont(font);
auto startInTrayOptionLayout_ = new QHBoxLayout;
startInTrayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto startInTrayLabel = new QLabel(tr("Start in tray"), this);
startInTrayLabel->setFont(font);
startInTrayToggle_ = new Toggle(this);
auto toggle = new Toggle(this);
layout->addWidget(label);
layout->addWidget(toggle, 0, Qt::AlignRight);
return std::pair{layout, toggle};
};
QHBoxLayout *trayOptionLayout_ = nullptr;
std::tie(trayOptionLayout_, trayToggle_) = addSetting(tr("Minimize to tray"));
QHBoxLayout *startInTrayOptionLayout_ = nullptr;
std::tie(startInTrayOptionLayout_, startInTrayToggle_) = addSetting(tr("Start in tray"));
if (!settings_->isTrayEnabled())
startInTrayToggle_->setDisabled(true);
startInTrayOptionLayout_->addWidget(startInTrayLabel);
startInTrayOptionLayout_->addWidget(startInTrayToggle_, 0, Qt::AlignRight);
QHBoxLayout *groupViewLayout = nullptr;
std::tie(groupViewLayout, groupViewToggle_) = addSetting(tr("Group's sidebar"));
auto groupViewLayout = new QHBoxLayout;
groupViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto groupViewLabel = new QLabel(tr("Group's sidebar"), this);
groupViewLabel->setFont(font);
groupViewToggle_ = new Toggle(this);
QHBoxLayout *avatarViewLayout = nullptr;
std::tie(avatarViewLayout, avatarCircles_) = addSetting(tr("Circular Avatars"));
groupViewLayout->addWidget(groupViewLabel);
groupViewLayout->addWidget(groupViewToggle_, 0, Qt::AlignRight);
QHBoxLayout *typingLayout = nullptr;
std::tie(typingLayout, typingNotifications_) = addSetting(tr("Typing notifications"));
auto avatarViewLayout = new QHBoxLayout;
avatarViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto avatarViewLabel = new QLabel(tr("Circular Avatars"), this);
avatarViewLabel->setFont(font);
avatarCircles_ = new Toggle(this);
QHBoxLayout *receiptsLayout = nullptr;
std::tie(receiptsLayout, readReceipts_) = addSetting(tr("Read receipts"));
avatarViewLayout->addWidget(avatarViewLabel);
avatarViewLayout->addWidget(avatarCircles_, 0, Qt::AlignRight);
QHBoxLayout *markdownLayout = nullptr;
std::tie(markdownLayout, markdownEnabled_) = addSetting(tr("Send messages as markdown"));
auto typingLayout = new QHBoxLayout;
typingLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto typingLabel = new QLabel(tr("Typing notifications"), this);
typingLabel->setFont(font);
typingNotifications_ = new Toggle(this);
typingLayout->addWidget(typingLabel);
typingLayout->addWidget(typingNotifications_, 0, Qt::AlignRight);
auto receiptsLayout = new QHBoxLayout;
receiptsLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto receiptsLabel = new QLabel(tr("Read receipts"), this);
receiptsLabel->setFont(font);
readReceipts_ = new Toggle(this);
receiptsLayout->addWidget(receiptsLabel);
receiptsLayout->addWidget(readReceipts_, 0, Qt::AlignRight);
auto desktopLayout = new QHBoxLayout;
desktopLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
auto desktopLabel = new QLabel(tr("Desktop notifications"), this);
desktopLabel->setFont(font);
desktopNotifications_ = new Toggle(this);
desktopLayout->addWidget(desktopLabel);
desktopLayout->addWidget(desktopNotifications_, 0, Qt::AlignRight);
QHBoxLayout *desktopLayout = nullptr;
std::tie(desktopLayout, desktopNotifications_) = addSetting(tr("Desktop notifications"));
auto scaleFactorOptionLayout = new QHBoxLayout;
scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
@ -385,6 +363,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
mainLayout_->addWidget(new HorizontalLine(this));
mainLayout_->addLayout(typingLayout);
mainLayout_->addLayout(receiptsLayout);
mainLayout_->addLayout(markdownLayout);
mainLayout_->addLayout(desktopLayout);
mainLayout_->addWidget(new HorizontalLine(this));
@ -466,6 +445,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
settings_->setAvatarCircles(!isDisabled);
});
connect(markdownEnabled_, &Toggle::toggled, this, [this](bool isDisabled) {
settings_->setMarkdownEnabled(!isDisabled);
});
connect(typingNotifications_, &Toggle::toggled, this, [this](bool isDisabled) {
settings_->setTypingNotifications(!isDisabled);
});
@ -496,8 +479,10 @@ UserSettingsPage::showEvent(QShowEvent *)
trayToggle_->setState(!settings_->isTrayEnabled());
startInTrayToggle_->setState(!settings_->isStartInTrayEnabled());
groupViewToggle_->setState(!settings_->isGroupViewEnabled());
avatarCircles_->setState(!settings_->isAvatarCirclesEnabled());
typingNotifications_->setState(!settings_->isTypingNotificationsEnabled());
readReceipts_->setState(!settings_->isReadReceiptsEnabled());
markdownEnabled_->setState(!settings_->isMarkdownEnabled());
desktopNotifications_->setState(!settings_->hasDesktopNotifications());
deviceIdValue_->setText(QString::fromStdString(http::client()->device_id()));

10
src/UserSettingsPage.h
View File

@ -68,6 +68,12 @@ public:
save();
}
void setMarkdownEnabled(bool state)
{
isMarkdownEnabled_ = state;
save();
}
void setReadReceipts(bool state)
{
isReadReceiptsEnabled_ = state;
@ -96,6 +102,8 @@ public:
bool isTrayEnabled() const { return isTrayEnabled_; }
bool isStartInTrayEnabled() const { return isStartInTrayEnabled_; }
bool isGroupViewEnabled() const { return isGroupViewEnabled_; }
bool isAvatarCirclesEnabled() const { return avatarCircles_; }
bool isMarkdownEnabled() const { return isMarkdownEnabled_; }
bool isTypingNotificationsEnabled() const { return isTypingNotificationsEnabled_; }
bool isReadReceiptsEnabled() const { return isReadReceiptsEnabled_; }
bool hasDesktopNotifications() const { return hasDesktopNotifications_; }
@ -116,6 +124,7 @@ private:
bool isTrayEnabled_;
bool isStartInTrayEnabled_;
bool isGroupViewEnabled_;
bool isMarkdownEnabled_;
bool isTypingNotificationsEnabled_;
bool isReadReceiptsEnabled_;
bool hasDesktopNotifications_;
@ -168,6 +177,7 @@ private:
Toggle *groupViewToggle_;
Toggle *typingNotifications_;
Toggle *readReceipts_;
Toggle *markdownEnabled_;
Toggle *desktopNotifications_;
Toggle *avatarCircles_;
QLabel *deviceFingerprintValue_;

4
src/Utils.cpp
View File

@ -397,6 +397,10 @@ utils::markdownToHtml(const QString &text)
auto result = linkifyMessage(escapeBlacklistedHtml(QString::fromStdString(html))).trimmed();
if (result.count("<p>") == 1 && result.startsWith("<p>") && result.endsWith("</p>")) {
result = result.mid(3, result.size() - 3 - 4);
}
return result;
}

24
src/install-debian.txt Normal file
View File

@ -0,0 +1,24 @@
sudo apt install cmake
sudo apt install gcc make automake
sudo apt install qt5-default
sudo apt install liblmdb-dev
sudo apt install qttools5-dev-tools
sudo apt install qttools5-dev-tools
sudo apt install qttools5
sudo apt install qt5-qmltooling-plugins qml-module-qtgstreamer
sudo apt install libqt5webview5-dev
sudo apt install libqt5quickcontrols2-5
sudo apt install qtquickcontrols2-5-dev
sudo apt install libssl-dev
sudo apt install qml-module-qtgraphicaleffects
sudo apt install qml-module-qtquick-controls2
sudo apt install qml-module-qtquick-layouts
sudo apt install qml-module-qtmultimedia
sudo apt install qml-module-qt-labs-settings qml-module-qt-labs-sharedimage
sudo apt install qttools5-dev
sudo apt install libqt5svg5-dev
sudo apt install qt5multimedia
sudo apt install libqt5multimedia5
sudo apt install libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5multimediawidgets5
sudo apt install qt5ct
sudo apt install qtmultimedia5-dev

23
src/timeline/TimelineModel.cpp
View File

@ -281,9 +281,26 @@ TimelineModel::data(const QString &id, int role) const
case FormattedBody: {
const static QRegularExpression replyFallback(
"<mx-reply>.*</mx-reply>", QRegularExpression::DotMatchesEverythingOption);
return QVariant(
utils::replaceEmoji(utils::linkifyMessage(utils::escapeBlacklistedHtml(
formattedBodyWithFallback(event).remove(replyFallback)))));
bool isReply = !in_reply_to_event(event).empty();
auto formattedBody_ = QString::fromStdString(formatted_body(event));
if (formattedBody_.isEmpty()) {
auto body_ = QString::fromStdString(body(event));
if (isReply) {
while (body_.startsWith("> "))
body_ = body_.right(body_.size() - body_.indexOf('\n') - 1);
if (body_.startsWith('\n'))
body_ = body_.right(body_.size() - 1);
}
formattedBody_ = body_.toHtmlEscaped().replace('\n', "<br>");
} else {
if (isReply)
formattedBody_ = formattedBody_.remove(replyFallback);
}
return QVariant(utils::replaceEmoji(
utils::linkifyMessage(utils::escapeBlacklistedHtml(formattedBody_))));
}
case Url:
return QVariant(QString::fromStdString(url(event)));

33
src/timeline/TimelineViewManager.cpp
View File

@ -18,8 +18,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
void
TimelineViewManager::updateColorPalette()
{
UserSettings settings;
if (settings.theme() == "light") {
if (settings->theme() == "light") {
QPalette lightActive(/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"),
/*light*/ QColor(),
@ -31,7 +30,7 @@ TimelineViewManager::updateColorPalette()
/*window*/ QColor("white"));
view->rootContext()->setContextProperty("currentActivePalette", lightActive);
view->rootContext()->setContextProperty("currentInactivePalette", lightActive);
} else if (settings.theme() == "dark") {
} else if (settings->theme() == "dark") {
QPalette darkActive(/*windowText*/ QColor("#caccd1"),
/*button*/ QColor("#caccd1"),
/*light*/ QColor(),
@ -50,9 +49,10 @@ TimelineViewManager::updateColorPalette()
}
}
TimelineViewManager::TimelineViewManager(QWidget *parent)
TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettings, QWidget *parent)
: imgProvider(new MxcImageProvider())
, colorImgProvider(new ColorImageProvider())
, settings(userSettings)
{
qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
"im.nheko",
@ -186,9 +186,17 @@ TimelineViewManager::queueTextMessage(const QString &msg, const std::optional<Re
{
mtx::events::msg::Text text = {};
text.body = msg.trimmed().toStdString();
text.format = "org.matrix.custom.html";
if (settings->isMarkdownEnabled()) {
text.formatted_body = utils::markdownToHtml(msg).toStdString();
// Don't send formatted_body, when we don't need to
if (text.formatted_body == text.body)
text.formatted_body = "";
else
text.format = "org.matrix.custom.html";
}
if (related) {
QString body;
bool firstLine = true;
@ -202,8 +210,17 @@ TimelineViewManager::queueTextMessage(const QString &msg, const std::optional<Re
}
text.body = QString("%1\n%2").arg(body).arg(msg).toStdString();
// NOTE(Nico): rich replies always need a formatted_body!
text.format = "org.matrix.custom.html";
if (settings->isMarkdownEnabled())
text.formatted_body =
utils::getFormattedQuoteBody(*related, utils::markdownToHtml(msg)).toStdString();
utils::getFormattedQuoteBody(*related, utils::markdownToHtml(msg))
.toStdString();
else
text.formatted_body =
utils::getFormattedQuoteBody(*related, msg.toHtmlEscaped()).toStdString();
text.relates_to.in_reply_to.event_id = related->related_event;
}
@ -219,8 +236,10 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
mtx::events::msg::Emote emote;
emote.body = msg.trimmed().toStdString();
if (html != msg.trimmed().toHtmlEscaped())
if (html != msg.trimmed().toHtmlEscaped() && settings->isMarkdownEnabled()) {
emote.formatted_body = html.toStdString();
emote.format = "org.matrix.custom.html";
}
if (timeline_)
timeline_->sendMessage(emote);

5
src/timeline/TimelineViewManager.h
View File

@ -15,6 +15,7 @@
class MxcImageProvider;
class ColorImageProvider;
class UserSettings;
class TimelineViewManager : public QObject
{
@ -28,7 +29,7 @@ class TimelineViewManager : public QObject
replyingEventChanged)
public:
TimelineViewManager(QWidget *parent = 0);
TimelineViewManager(QSharedPointer<UserSettings> userSettings, QWidget *parent = 0);
QWidget *getWidget() const { return container; }
void sync(const mtx::responses::Rooms &rooms);
@ -109,4 +110,6 @@ private:
TimelineModel *timeline_ = nullptr;
bool isInitialSync_ = true;
QString replyingEvent_;
QSharedPointer<UserSettings> settings;
};