Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Presence support #216

Merged
merged 13 commits into from
Jun 12, 2020
Merged

Presence support #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
96f4169
Show presence and set custom status messages
deepbluev7 Jun 7, 2020
f2bfa61
Add menu actions to set presence
deepbluev7 Jun 8, 2020
bf440f9
Bump mtxclient
deepbluev7 Jun 8, 2020
8148680
Disable presence and status_msg menu
deepbluev7 Jun 8, 2020
3baf11b
Fix unused capture
deepbluev7 Jun 8, 2020
b963175
Reenable custom status messages
deepbluev7 Jun 9, 2020
0a23615
Fix small formatting error
deepbluev7 Jun 9, 2020
488924c
Allow deleting a status
deepbluev7 Jun 11, 2020
db93e6b
Fix warning about not registered Presence type
deepbluev7 Jun 11, 2020
150c9b1
Fix scale factor setting
deepbluev7 Jun 11, 2020
dbaf927
Fix formatting
redsky17 Jun 12, 2020
7afb164
Merge remote-tracking branch 'origin/master' into presence
redsky17 Jun 12, 2020
a96e6e5
Merge branch origin/master and update translations
redsky17 Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 795b6a82d4f10c629ce0eb99803cc677c413f940
GIT_TAG a897142a3fa6ece92daa1040551fb8ac09be1766
)
FetchContent_MakeAvailable(MatrixClient)
else()
Expand Down
4 changes: 2 additions & 2 deletions io.github.NhekoReborn.Nheko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@
"name": "mtxclient",
"sources": [
{
"sha256": "7ba85bb477c9e17e2389faf2333034aa9ceae4b1c65d6bf5f7067f2799e9b770",
"sha256": "6a4368da5fda1db426c36c9a7b26c6e62ca99bd8c7fea421460156642e65a5cb",
"type": "archive",
"url": "https://github.com/Nheko-Reborn/mtxclient/archive/795b6a82d4f10c629ce0eb99803cc677c413f940.tar.gz"
"url": "https://github.com/Nheko-Reborn/mtxclient/archive/a897142a3fa6ece92daa1040551fb8ac09be1766.tar.gz"
}
]
},
Expand Down
61 changes: 48 additions & 13 deletions resources/langs/nheko_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
<context>
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1342"/>
<location filename="../../src/Cache.cpp" line="+1359"/>
<source>You joined this room.</source>
<translation>Du bist dem Raum beigetreten.</translation>
</message>
</context>
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+227"/>
<location filename="../../src/ChatPage.cpp" line="+229"/>
<source>Failed to invite user: %1</source>
<translation>Nutzer konnte nicht eingeladen werden: %1</translation>
</message>
<message>
<location line="+4"/>
<location line="+923"/>
<location line="+926"/>
<source>Invited user: %1</source>
<translation>Eingeladener Benutzer: %1</translation>
</message>
<message>
<location line="-471"/>
<location line="-474"/>
<source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
<translation>Migrieren des Caches auf die aktuelle Version fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte lege einen Bugreport an und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du das Cache manuell entfernen.</translation>
</message>
<message>
<location line="+436"/>
<location line="+439"/>
<source>Room %1 created.</source>
<translation>Raum %1 erzeugt.</translation>
</message>
Expand Down Expand Up @@ -68,7 +68,7 @@
<translation>Verbannung von %1 wurde aufgehoben.</translation>
</message>
<message>
<location line="-825"/>
<location line="-828"/>
<source>Failed to upload media. Please try again.</source>
<translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
</message>
Expand Down Expand Up @@ -103,13 +103,13 @@
<translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation>
</message>
<message>
<location line="+51"/>
<location line="+219"/>
<location line="+54"/>
<location line="+252"/>
<source>Please try to login again: %1</source>
<translation>Bitte melde dich erneut an: %1</translation>
</message>
<message>
<location line="-154"/>
<location line="-187"/>
<source>Failed to join room: %1</source>
<translation>Konnte Raum nicht betreten: %1</translation>
</message>
Expand Down Expand Up @@ -492,7 +492,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>RoomInfo</name>
<message>
<location filename="../../src/Cache.cpp" line="+940"/>
<location filename="../../src/Cache.cpp" line="+984"/>
<source>no version stored</source>
<translation>keine Version gespeichert</translation>
</message>
Expand Down Expand Up @@ -921,7 +921,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Kein Raum geöffnet</translation>
</message>
<message>
<location line="+259"/>
<location line="+271"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
Expand Down Expand Up @@ -975,15 +975,50 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>UserInfoWidget</name>
<message>
<location filename="../../src/UserInfoWidget.cpp" line="+91"/>
<location filename="../../src/UserInfoWidget.cpp" line="+95"/>
<source>Logout</source>
<translation>Abmelden</translation>
</message>
<message>
<location line="+20"/>
<source>Set custom status message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Custom status message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Status:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Set presence automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+520"/>
<location filename="../../src/UserSettingsPage.cpp" line="+535"/>
<source>Minimize to tray</source>
<translation>Ins Benachrichtigungsfeld minimieren</translation>
</message>
Expand Down
61 changes: 48 additions & 13 deletions resources/langs/nheko_el.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
<context>
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1342"/>
<location filename="../../src/Cache.cpp" line="+1359"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChatPage</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+227"/>
<location filename="../../src/ChatPage.cpp" line="+229"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+923"/>
<location line="+926"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-471"/>
<location line="-474"/>
<source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+436"/>
<location line="+439"/>
<source>Room %1 created.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -68,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="-825"/>
<location line="-828"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -103,13 +103,13 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+51"/>
<location line="+219"/>
<location line="+54"/>
<location line="+252"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-154"/>
<location line="-187"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -488,7 +488,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
<location filename="../../src/Cache.cpp" line="+940"/>
<location filename="../../src/Cache.cpp" line="+984"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -917,7 +917,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+259"/>
<location line="+271"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -971,15 +971,50 @@ Example: https://server.my:8787</source>
<context>
<name>UserInfoWidget</name>
<message>
<location filename="../../src/UserInfoWidget.cpp" line="+91"/>
<location filename="../../src/UserInfoWidget.cpp" line="+95"/>
<source>Logout</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
<source>Set custom status message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Custom status message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Status:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Set presence automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>Offline</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UserSettingsPage</name>
<message>
<location filename="../../src/UserSettingsPage.cpp" line="+520"/>
<location filename="../../src/UserSettingsPage.cpp" line="+535"/>
<source>Minimize to tray</source>
<translation>Ελαχιστοποίηση</translation>
</message>
Expand Down
Loading