From 8bb09ca0225886c18e351d3c6156521ed479edd1 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 26 Jun 2014 22:13:13 -0500
Subject: Design prefers to have a volume slider instead of presets, so remove
 the AlarmVolume enum and replace it with an int range.

---
 include/datetime/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/datetime/settings.h')

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;
 };
 
-- 
cgit v1.2.3


From eebf8f911cedf5124ada2f91576f821da6f421b0 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 27 Jun 2014 09:46:21 -0500
Subject: use unsigned ints for the alarm volume, duration properties

---
 include/datetime/settings.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/datetime/settings.h')

diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index 26d4ed0..e5f885e 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -57,8 +57,8 @@ public:
     core::Property<TimeFormatMode> time_format_mode;
     core::Property<std::string> timezone_name;
     core::Property<std::string> alarm_sound;
-    core::Property<int> alarm_volume;
-    core::Property<int> alarm_duration;
+    core::Property<unsigned int> alarm_volume;
+    core::Property<unsigned int> alarm_duration;
 };
 
 } // namespace datetime
-- 
cgit v1.2.3