diff options
author | Joseph Donofry <joedonofry@gmail.com> | 2020-04-23 19:22:54 -0400 |
---|---|---|
committer | Joseph Donofry <joedonofry@gmail.com> | 2020-04-23 19:22:54 -0400 |
commit | 619d9bc1858b12350d95f64a1340d56f32e28bfe (patch) | |
tree | 7c597bbe8f40059b8ef6c935d64f8a69ff107a94 | |
parent | ddcab64315a6cabdf635d0f031fd8c81b5b4778c (diff) | |
parent | 4e3b190ac7e8fc8d87cda6832a623296afd1b90e (diff) |
Merge remote-tracking branch 'origin/master' into release-prep-0.7.1
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | resources/langs/nheko_de.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_el.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_en.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_fi.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_fr.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_ja.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_nl.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_pl.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_ru.ts | 19 | ||||
-rw-r--r-- | resources/langs/nheko_zh_CN.ts | 19 | ||||
-rw-r--r-- | src/ChatPage.h | 1 | ||||
-rw-r--r-- | src/MainWindow.cpp | 4 | ||||
-rw-r--r-- | src/Olm.cpp | 2 | ||||
-rw-r--r-- | src/UserSettingsPage.cpp | 11 | ||||
-rw-r--r-- | src/UserSettingsPage.h | 10 | ||||
-rw-r--r-- | src/Utils.cpp | 5 | ||||
-rw-r--r-- | src/Utils.h | 1 | ||||
-rw-r--r-- | src/timeline/TimelineModel.cpp | 26 | ||||
-rw-r--r-- | src/timeline/TimelineModel.h | 4 | ||||
-rw-r--r-- | src/timeline/TimelineViewManager.cpp | 21 | ||||
-rw-r--r-- | src/timeline/TimelineViewManager.h | 1 |
23 files changed, 197 insertions, 86 deletions
@@ -6,6 +6,7 @@ cscope* /.ccls-cache /.exrc .gdb_history +.hunter # GTAGS GTAGS @@ -70,7 +71,8 @@ install_manifest.txt .LSOverride # Icon must end with two \r -Icon
+Icon + # Thumbnails ._* diff --git a/CHANGELOG.md b/CHANGELOG.md index 816c757e..e90dce89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,9 @@ - Fix display of images sent by the user (thank you, wnereiz and not-chicken for reporting) - Fix crash when trying to maximize image, that wasn't downloaded yet. -- Fix Binding restorMode flooding logs on Qt 5.14.2+ +- Fix Binding restoreMode flooding logs on Qt 5.14.2+ - Fix with some qml styles hidden menu items leave empty space +- Fix encrypted messages not showing a user in the sidebar - Fix hangs when generating colors with some system theme color schemes (#172) ## [0.7.0] -- 2020-04-19 diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 259b5c86..a97c3fb3 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation> @@ -779,7 +779,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Ins Benachrichtigungsfeld minimieren</translation> </message> @@ -800,6 +800,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation>Entschlüssele Nachrichten in der Raumliste</translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -859,7 +864,7 @@ <translation>Gerätefingerabdruck</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation>Sitzungsschlüssel</translation> </message> @@ -879,22 +884,22 @@ <translation>VERSCHLÜSSELUNG</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>ALLGEMEINES</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation>Emojischriftart</translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation>Öffne Sessions Datei</translation> </message> diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 4ce7e6e4..1f4c355c 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -779,7 +779,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Ελαχιστοποίηση</translation> </message> @@ -800,6 +800,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -859,7 +864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation type="unfinished"></translation> </message> @@ -879,22 +884,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>ΓΕΝΙΚΑ</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index f7b3b093..52eb4a4c 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation>-- Decryption Error (failed to communicate with DB) --</translation> @@ -779,7 +779,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Minimize to tray</translation> </message> @@ -800,6 +800,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation>Show buttons in timeline</translation> </message> @@ -859,7 +864,7 @@ <translation>Device Fingerprint</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation>Session Keys</translation> </message> @@ -879,22 +884,22 @@ <translation>ENCRYPTION</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>GENERAL</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation>INTERFACE</translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation>Emoji Font Family</translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation>Open Sessions File</translation> </message> diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index eab4771b..3ab797d8 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished">-- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --</translation> @@ -779,7 +779,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Pienennä ilmoitusalueelle</translation> </message> @@ -800,6 +800,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -859,7 +864,7 @@ <translation>Laitteen sormenjälki</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation>Istunnon avaimet</translation> </message> @@ -879,22 +884,22 @@ <translation>SALAUS</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>YLEISET ASETUKSET</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation>Avaa Istuntoavaintiedosto</translation> </message> diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 472f8c7f..f90ff8c0 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -472,7 +472,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -780,7 +780,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Réduire à la barre des tâches</translation> </message> @@ -801,6 +801,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -860,7 +865,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation type="unfinished"></translation> </message> @@ -880,22 +885,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>GÉNÉRAL</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index d3194b42..884ca357 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation>-- 復号エラー (データベースと通信できませんでした) --</translation> @@ -778,7 +778,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>トレイへ最小化</translation> </message> @@ -799,6 +799,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -858,7 +863,7 @@ <translation>デバイスの指紋</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation>セッション鍵</translation> </message> @@ -878,22 +883,22 @@ <translation>暗号化</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>全般</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation>セッションファイルを開く</translation> </message> diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index cb4f68e8..88b25e7f 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -779,7 +779,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Minimaliseren naar systeemvak</translation> </message> @@ -800,6 +800,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -859,7 +864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation type="unfinished"></translation> </message> @@ -879,22 +884,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>ALGEMEEN</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 9fb3bae6..749e172b 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -780,7 +780,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Zminimalizuj do paska zadań</translation> </message> @@ -801,6 +801,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -860,7 +865,7 @@ <translation>Odcisk palca urządzenia</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation type="unfinished"></translation> </message> @@ -880,22 +885,22 @@ <translation>SZYFROWANIE</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>OGÓLNE</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index f48fccf3..05240613 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -780,7 +780,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>Сворачивать в системную панель</translation> </message> @@ -801,6 +801,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Show buttons in timeline</source> <translation type="unfinished"></translation> </message> @@ -860,7 +865,7 @@ <translation>Отпечаток устройства</translation> </message> <message> - <location line="-58"/> + <location line="-59"/> <source>Session Keys</source> <translation>Ключи сеанса</translation> </message> @@ -880,22 +885,22 @@ <translation>ШИФРОВАНИЕ</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>GENERAL</source> <translation>ГЛАВНОЕ</translation> </message> <message> - <location line="+24"/> + <location line="+25"/> <source>INTERFACE</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+108"/> <source>Emoji Font Family</source> <translation type="unfinished"></translation> </message> <message> - <location line="+152"/> + <location line="+158"/> <source>Open Sessions File</source> <translation>Открыть файл сеансов</translation> </message> diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 63b67734..b6fe6d1d 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -471,7 +471,7 @@ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/> <source>-- Decryption Error (failed to communicate with DB) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment> <translation type="unfinished"></translation> @@ -778,7 +778,7 @@ <context> <name>UserSettingsPage</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+333"/> + <location filename="../../src/UserSettingsPage.cpp" line="+335"/> <source>Minimize to tray</source> <translation>最小化至托盘</translation> </message> @@ -799,6 +799,11 @@ </message> <message> <location line="+2"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + < |