aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-06-26 22:13:13 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-06-26 22:13:13 -0500
commit8bb09ca0225886c18e351d3c6156521ed479edd1 (patch)
treecd5e30c6fc5531f0ad1efb711957a3d951e4a66a /include/datetime
parentc5081444f4f493dc386012bcb99d2430fe26dc5a (diff)
downloadayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.tar.gz
ayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.tar.bz2
ayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.zip
Design prefers to have a volume slider instead of presets, so remove the AlarmVolume enum and replace it with an int range.
Diffstat (limited to 'include/datetime')
-rw-r--r--include/datetime/settings-shared.h10
-rw-r--r--include/datetime/settings.h2
2 files changed, 1 insertions, 11 deletions
diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h
index bfddd88..23d2e1c 100644
--- a/include/datetime/settings-shared.h
+++ b/include/datetime/settings-shared.h
@@ -30,16 +30,6 @@ 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"
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index a941f05..26d4ed0 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -57,7 +57,7 @@ public:
core::Property<TimeFormatMode> time_format_mode;
core::Property<std::string> timezone_name;
core::Property<std::string> alarm_sound;
- core::Property<AlarmVolume> alarm_volume;
+ core::Property<int> alarm_volume;
core::Property<int> alarm_duration;
};