diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/LoginPage.cpp | 8 | ||||
| -rw-r--r-- | src/UserSettingsPage.cpp | 10 | ||||
| -rw-r--r-- | src/UserSettingsPage.h | 6 |
3 files changed, 19 insertions, 5 deletions
diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 55487502..afc660a8 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -76,13 +76,13 @@ LoginPage::onMatrixIdEntered() try { user = parse<User>(mxid_.toStdString()); } catch (const std::exception &) { - mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org"); + mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com"); emit mxidErrorChanged(); return; } if (user.hostname().empty() || user.localpart().empty()) { - mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org"); + mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com"); emit mxidErrorChanged(); return; } else { @@ -146,7 +146,7 @@ LoginPage::checkHomeserverVersion() try { User user = parse<User>(mxid_.toStdString()); } catch (const std::exception &) { - mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org"); + mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com"); emit mxidErrorChanged(); return; } @@ -273,7 +273,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod, try { user = parse<User>(userid.toStdString()); } catch (const std::exception &) { - mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org"); + mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com"); emit mxidErrorChanged(); return; } diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 5caa4838..75a6b443 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -1041,6 +1041,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const return tr("Limit width of timeline"); case ReadReceipts: return tr("Read receipts"); + case HiddenTimelineEvents: + return tr("Hidden events"); case DesktopNotifications: return tr("Desktop notifications"); case AlertOnNotification: @@ -1119,6 +1121,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const return tr("SIDEBAR"); case TraySection: return tr("TRAY"); + case MessageVisibilitySection: + return tr("GLOBAL MESSAGE VISIBILITY"); case NotificationsSection: return tr("NOTIFICATIONS"); case VoipSection: @@ -1371,6 +1375,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const return tr( "Show if your message was read.\nStatus is displayed next to timestamps.\nWarning: " "If your homeserver does not support this, your rooms will never be marked as read!"); + case HiddenTimelineEvents: + return tr("Configure whether to show or hide certain events like room joins."); case DesktopNotifications: return tr("Notify about received messages when the client is not currently focused."); case AlertOnNotification: @@ -1438,6 +1444,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const case TimelineSection: case SidebarSection: case TraySection: + case MessageVisibilitySection: case NotificationsSection: case VoipSection: case EncryptionSection: @@ -1548,6 +1555,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const case TimelineSection: case SidebarSection: case TraySection: + case MessageVisibilitySection: case NotificationsSection: case VoipSection: case EncryptionSection: @@ -1562,6 +1570,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const case UserSigningKey: case MasterKey: return KeyStatus; + case HiddenTimelineEvents: + return ConfigureHiddenEvents; } } else if (role == ValueLowerBound) { switch (index.row()) { diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index 71eb039b..2bae068a 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -474,7 +474,6 @@ class UserSettingsModel : public QAbstractListModel ExposeDBusApi, #endif UpdateSpaceVias, - ExpireEvents, AccessibilitySection, ReducedMotion, @@ -506,6 +505,10 @@ class UserSettingsModel : public QAbstractListModel Tray, StartInTray, + MessageVisibilitySection, + ExpireEvents, + HiddenTimelineEvents, + NotificationsSection, DesktopNotifications, AlertOnNotification, @@ -562,6 +565,7 @@ public: KeyStatus, SessionKeyImportExport, XSignKeysRequestDownload, + ConfigureHiddenEvents, }; Q_ENUM(Types); |