1 files changed, 5 insertions, 14 deletions
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index db12b1e6..7bb722f1 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -58,7 +58,7 @@ class UserSettings : public QObject
bool avatarCircles READ avatarCircles WRITE setAvatarCircles NOTIFY avatarCirclesChanged)
Q_PROPERTY(
bool decryptSidebar READ decryptSidebar WRITE setDecryptSidebar NOTIFY decryptSidebarChanged)
- Q_PROPERTY(SpaceNotificationOptions spaceNotifications READ spaceNotifications WRITE
+ Q_PROPERTY(bool spaceNotifications READ spaceNotifications WRITE
setSpaceNotifications NOTIFY spaceNotificationsChanged)
Q_PROPERTY(
bool privacyScreen READ privacyScreen WRITE setPrivacyScreen NOTIFY privacyScreenChanged)
@@ -136,15 +136,6 @@ public:
};
Q_ENUM(Presence)
- enum class SpaceNotificationOptions
- {
- SidebarAndRoomlist = 0,
- Sidebar,
- SidebarHiddenRooms,
- SpaceNotificationsOff,
- };
- Q_ENUM(SpaceNotificationOptions)
-
void save();
void load(std::optional<QString> profile);
void applyTheme();
@@ -173,7 +164,7 @@ public:
void setAlertOnNotification(bool state);
void setAvatarCircles(bool state);
void setDecryptSidebar(bool state);
- void setSpaceNotifications(SpaceNotificationOptions state);
+ void setSpaceNotifications(bool state);
void setPrivacyScreen(bool state);
void setPrivacyScreenTimeout(int state);
void setPresence(Presence state);
@@ -215,7 +206,7 @@ public:
bool groupView() const { return groupView_; }
bool avatarCircles() const { return avatarCircles_; }
bool decryptSidebar() const { return decryptSidebar_; }
- SpaceNotificationOptions spaceNotifications() const { return spaceNotifications_; }
+ bool spaceNotifications() const { return spaceNotifications_; }
bool privacyScreen() const { return privacyScreen_; }
int privacyScreenTimeout() const { return privacyScreenTimeout_; }
bool markdown() const { return markdown_; }
@@ -293,7 +284,7 @@ signals:
void alertOnNotificationChanged(bool state);
void avatarCirclesChanged(bool state);
void decryptSidebarChanged(bool state);
- void spaceNotificationsChanged(SpaceNotificationOptions state);
+ void spaceNotificationsChanged(bool state);
void privacyScreenChanged(bool state);
void privacyScreenTimeoutChanged(int state);
void timelineMaxWidthChanged(int state);
@@ -356,7 +347,7 @@ private:
bool hasAlertOnNotification_;
bool avatarCircles_;
bool decryptSidebar_;
- SpaceNotificationOptions spaceNotifications_;
+ bool spaceNotifications_;
bool privacyScreen_;
int privacyScreenTimeout_;
bool shareKeysWithTrustedUsers_;
|
