aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-06-23 18:52:52 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-06-23 18:52:52 -0500
commita85fd44e7b2dc67b3e0712e174e88d0eb6c467e7 (patch)
tree222a1f286be139627a89d31a9db414b2d174f423 /include/datetime
parentf6778e1cc3e3881225e967c94de4685c732755db (diff)
downloadayatana-indicator-datetime-a85fd44e7b2dc67b3e0712e174e88d0eb6c467e7.tar.gz
ayatana-indicator-datetime-a85fd44e7b2dc67b3e0712e174e88d0eb6c467e7.tar.bz2
ayatana-indicator-datetime-a85fd44e7b2dc67b3e0712e174e88d0eb6c467e7.zip
add GSettings support for specifying a default alarm sound and default alarm volume.
Diffstat (limited to 'include/datetime')
-rw-r--r--include/datetime/settings-live.h2
-rw-r--r--include/datetime/settings-shared.h12
-rw-r--r--include/datetime/settings.h2
3 files changed, 16 insertions, 0 deletions
diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h
index 202c998..a075a85 100644
--- a/include/datetime/settings-live.h
+++ b/include/datetime/settings-live.h
@@ -55,6 +55,8 @@ private:
void update_show_year();
void update_time_format_mode();
void update_timezone_name();
+ void update_alarm_sound();
+ void update_alarm_volume();
GSettings* m_settings;
diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h
index 17a8ef0..b8d7737 100644
--- a/include/datetime/settings-shared.h
+++ b/include/datetime/settings-shared.h
@@ -30,6 +30,16 @@ typedef enum
}
TimeFormatMode;
+typedef enum
+{
+ ALARM_VOLUME_VERY_QUIET,
+ ALARM_VOLUME_QUIET,
+ ALARM_VOLUME_NORMAL,
+ ALARM_VOLUME_LOUD,
+ ALARM_VOLUME_VERY_LOUD
+}
+AlarmVolume;
+
#define SETTINGS_INTERFACE "com.canonical.indicator.datetime"
#define SETTINGS_SHOW_CLOCK_S "show-clock"
#define SETTINGS_TIME_FORMAT_S "time-format"
@@ -45,5 +55,7 @@ TimeFormatMode;
#define SETTINGS_SHOW_DETECTED_S "show-auto-detected-location"
#define SETTINGS_LOCATIONS_S "locations"
#define SETTINGS_TIMEZONE_NAME_S "timezone-name"
+#define SETTINGS_ALARM_SOUND_S "alarm-default-sound"
+#define SETTINGS_ALARM_VOLUME_S "alarm-default-volume"
#endif // INDICATOR_DATETIME_SETTINGS_SHARED
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index ce234d9..5a0f1eb 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -56,6 +56,8 @@ public:
core::Property<bool> show_year;
core::Property<TimeFormatMode> time_format_mode;
core::Property<std::string> timezone_name;
+ core::Property<std::string> alarm_sound;
+ core::Property<AlarmVolume> alarm_volume;
};
} // namespace datetime