From bcff13b6bce18604472e5954eb5ab7af4bb43b0f Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 16 Jan 2014 15:10:39 -0600
Subject: Implement Settings, a properties-cpp wrapper around GSettings

---
 include/datetime/settings-live.h | 19 ++++++++++++++++---
 include/datetime/settings.h      | 16 +++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h
index 44e27b0..202c998 100644
--- a/include/datetime/settings-live.h
+++ b/include/datetime/settings-live.h
@@ -38,10 +38,23 @@ public:
     virtual ~LiveSettings();
 
 private:
-    void update_show_clock();
-
-    void update_key(const std::string& key);
     static void on_changed(GSettings*, gchar*, gpointer);
+    void update_key(const std::string& key);
+
+    void update_custom_time_format();
+    void update_locations();
+    void update_show_calendar();
+    void update_show_clock();
+    void update_show_date();
+    void update_show_day();
+    void update_show_detected_locations();
+    void update_show_events();
+    void update_show_locations();
+    void update_show_seconds();
+    void update_show_week_numbers();
+    void update_show_year();
+    void update_time_format_mode();
+    void update_timezone_name();
 
     GSettings* m_settings;
 
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index 3d4bc33..418bc33 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -42,17 +42,19 @@ public:
     Settings() =default;
     virtual ~Settings() =default;
 
-    core::Property<TimeFormatMode> time_format_mode;
-    core::Property<bool> show_clock;
-    core::Property<bool> show_day;
-    core::Property<bool> show_year;
-    core::Property<bool> show_seconds;
     core::Property<std::string> custom_time_format;
+    core::Property<std::vector<std::string>> locations;
     core::Property<bool> show_calendar;
+    core::Property<bool> show_clock;
+    core::Property<bool> show_date;
+    core::Property<bool> show_day;
+    core::Property<bool> show_detected_location;
     core::Property<bool> show_events;
     core::Property<bool> show_locations;
-    core::Property<bool> show_auto_detected_location;
-    core::Property<std::vector<std::string>> locations;
+    core::Property<bool> show_seconds;
+    core::Property<bool> show_week_numbers;
+    core::Property<bool> show_year;
+    core::Property<TimeFormatMode> time_format_mode;
     core::Property<std::string> timezone_name;
 };
 
-- 
cgit v1.2.3