aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArthur Mello <arthur.mello@canonical.com>2016-06-22 15:37:55 -0300
committerRobert Tari <robert@tari.in>2021-07-07 23:49:38 +0200
commit9c7c869ae51fffe7ce560faf0d3d2cecf5743563 (patch)
tree91089b2c54919a0b00884ebd04b858a59425b9cd /include
parentc1921a486f4a719b56ab1729fbc228d2b121b85b (diff)
downloadayatana-indicator-datetime-9c7c869ae51fffe7ce560faf0d3d2cecf5743563.tar.gz
ayatana-indicator-datetime-9c7c869ae51fffe7ce560faf0d3d2cecf5743563.tar.bz2
ayatana-indicator-datetime-9c7c869ae51fffe7ce560faf0d3d2cecf5743563.zip
Update indicator-datetime to work with the new notification settings
Diffstat (limited to 'include')
-rw-r--r--include/datetime/settings-live.h12
-rw-r--r--include/datetime/settings-shared.h9
-rw-r--r--include/datetime/settings.h6
3 files changed, 20 insertions, 7 deletions
diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h
index 330b8e8..4aeaa9b 100644
--- a/include/datetime/settings-live.h
+++ b/include/datetime/settings-live.h
@@ -39,9 +39,9 @@ public:
private:
static void on_changed_ccid(GSettings*, gchar*, gpointer);
- static void on_changed_cunh(GSettings*, gchar*, gpointer);
+ static void on_changed_cal_notification(GSettings*, gchar*, gpointer);
void update_key_ccid(const std::string& key);
- void update_key_cunh(const std::string& key);
+ void update_key_cal_notification(const std::string& key);
void update_custom_time_format();
void update_locations();
@@ -62,10 +62,14 @@ private:
void update_alarm_duration();
void update_alarm_haptic();
void update_snooze_duration();
- void update_muted_apps();
+ void update_cal_notification_enabled();
+ void update_cal_notification_sounds();
+ void update_cal_notification_vibrations();
+ void update_cal_notification_bubbles();
+ void update_cal_notification_list();
GSettings* m_settings;
- GSettings* m_settings_cunh;
+ GSettings* m_settings_cal_notification;
// we've got a raw pointer here, so disable copying
LiveSettings(const LiveSettings&) =delete;
diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h
index f385e7a..236b8f1 100644
--- a/include/datetime/settings-shared.h
+++ b/include/datetime/settings-shared.h
@@ -51,7 +51,12 @@ TimeFormatMode;
#define SETTINGS_ALARM_HAPTIC_S "alarm-haptic-feedback"
#define SETTINGS_SNOOZE_DURATION_S "snooze-duration-minutes"
-#define SETTINGS_CUNH_SCHEMA_ID "com.lomiri.notifications.hub"
-#define SETTINGS_CUNH_BLACKLIST_S "blacklist"
+#define SETTINGS_NOTIFY_SCHEMA_ID "com.lomiri.notifications.settings"
+#define SETTINGS_NOTIFY_CALENDAR_PATH "/com/lomiri/NotificationSettings/com.lomiri.calendar/calendar/"
+#define SETTINGS_NOTIFY_ENABLED_KEY "enable-notifications"
+#define SETTINGS_NOTIFY_SOUNDS_KEY "use-sounds-notifications"
+#define SETTINGS_NOTIFY_VIBRATIONS_KEY "use-vibrations-notifications"
+#define SETTINGS_NOTIFY_BUBBLES_KEY "use-bubbles-notifications"
+#define SETTINGS_NOTIFY_LIST_KEY "use-list-notifications"
#endif // INDICATOR_DATETIME_SETTINGS_SHARED
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index d5e81c6..5ae00f6 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -61,7 +61,11 @@ public:
core::Property<unsigned int> alarm_volume;
core::Property<unsigned int> alarm_duration;
core::Property<unsigned int> snooze_duration;
- core::Property<std::set<std::pair<std::string,std::string>>> muted_apps;
+ core::Property<bool> cal_notification_enabled;
+ core::Property<bool> cal_notification_sounds;
+ core::Property<bool> cal_notification_vibrations;
+ core::Property<bool> cal_notification_bubbles;
+ core::Property<bool> cal_notification_list;
};
} // namespace datetime