2 files changed, 131 insertions, 0 deletions
diff --git a/include/datetime/locations-settings.h b/include/datetime/locations-settings.h
new file mode 100644
index 0000000..d343fe3
--- /dev/null
+++ b/include/datetime/locations-settings.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_SETTINGS_LOCATIONS_H
+#define INDICATOR_DATETIME_SETTINGS_LOCATIONS_H
+
+#include <datetime/locations.h> // base class
+
+#include <glib.h>
+#include <gio/gio.h>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+class Timezones;
+
+/**
+ * \brief An ordered list of Location objects found from
+ *        the system timezone and from the user's GSettings
+ */
+class SettingsLocations: public Locations
+{
+public:
+    /**
+     * @param[in] schemaId the settings schema to load 
+     * @param[in] timezones the timezones to always show first in the list
+     */
+    SettingsLocations (const std::string& schemaId, const std::shared_ptr<Timezones>& timezones);
+
+protected:
+    std::unique_ptr<GSettings,std::function<void(GSettings*)>> settings_;
+    std::shared_ptr<Timezones> timezones_;
+
+private:
+    static void onSettingsChanged (gpointer gself);
+    void reload();
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_SETTINGS_LOCATIONS_H
diff --git a/include/datetime/locations.h b/include/datetime/locations.h
new file mode 100644
index 0000000..a06d1cc
--- /dev/null
+++ b/include/datetime/locations.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_LOCATIONS_H
+#define INDICATOR_DATETIME_LOCATIONS_H
+
+#include <core/property.h>
+
+#include <string>
+#include <vector>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief A physical place and its timezone; eg, "America/Chicago" + "Oklahoma City"
+ */
+struct Location
+{
+    /** timezone; eg, "America/Chicago" */
+    std::string zone;
+
+    /* human-readable location name; eg, "Oklahoma City" */
+    std::string name;
+
+    /** offset from UTC in microseconds */
+    int64_t offset = 0;
+
+    bool operator== (const Location& that) const
+    {
+        return (name == that.name) && (zone == that.zone) && (offset == that.offset);
+    }
+
+    Location (const std::string& zone, const std::string& name);
+};
+
+/**
+ * A container for an ordered list of Locations.
+ */
+class Locations
+{
+public:
+    Locations() =default;
+    virtual ~Locations() =default;
+
+    /** \brief an ordered list of Location items */
+    core::Property<std::vector<Location> > locations;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_LOCATIONS_H