8 files changed, 20 insertions, 17 deletions
diff --git a/include/datetime/menu.h b/include/datetime/menu.h
index 0074ea5..5673bc1 100644
--- a/include/datetime/menu.h
+++ b/include/datetime/menu.h
@@ -53,7 +53,8 @@ public:
     static std::vector<Appointment> get_display_appointments(
         const std::vector<Appointment>&,
         const DateTime& start,
-        unsigned int max_items=5);
+        unsigned int max_items=5,
+        const bool include_alarms=true);
 
 protected:
     Menu (Profile profile_in, const std::string& name_in);
diff --git a/include/datetime/settings-live.h b/include/datetime/settings-live.h
index 85071ce..6a923f3 100644
--- a/include/datetime/settings-live.h
+++ b/include/datetime/settings-live.h
@@ -52,6 +52,7 @@ private:
     void update_show_day();
     void update_show_detected_locations();
     void update_show_events();
+    void update_show_alarms();
     void update_show_locations();
     void update_show_seconds();
     void update_show_week_numbers();
diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h
index 2deb52c..6e97328 100644
--- a/include/datetime/settings-shared.h
+++ b/include/datetime/settings-shared.h
@@ -40,6 +40,7 @@ TimeFormatMode;
 #define SETTINGS_SHOW_CALENDAR_S        "show-calendar"
 #define SETTINGS_SHOW_WEEK_NUMBERS_S    "show-week-numbers"
 #define SETTINGS_SHOW_EVENTS_S          "show-events"
+#define SETTINGS_SHOW_ALARMS_S          "show-alarms"
 #define SETTINGS_SHOW_LOCATIONS_S       "show-locations"
 #define SETTINGS_SHOW_DETECTED_S        "show-auto-detected-location"
 #define SETTINGS_LOCATIONS_S            "locations"
@@ -54,7 +55,7 @@ TimeFormatMode;
 #define SETTINGS_NOTIFY_APPS_SCHEMA_ID  "com.lomiri.notifications.settings.applications"
 #define SETTINGS_VIBRATE_SILENT_KEY     "vibrate-silent-mode"
 #define SETTINGS_NOTIFY_SCHEMA_ID       "com.lomiri.notifications.settings"
-#define SETTINGS_NOTIFY_CALENDAR_PATH   "/com/lomiri/NotificationSettings/com.ubuntu.calendar/calendar/"
+#define SETTINGS_NOTIFY_CALENDAR_PATH   "/com/lomiri/NotificationSettings/com.lomiri.calendar/calendar/"
 #define SETTINGS_NOTIFY_ENABLED_KEY     "enable-notifications"
 #define SETTINGS_NOTIFY_SOUNDS_KEY      "use-sounds-notifications"
 #define SETTINGS_NOTIFY_VIBRATIONS_KEY  "use-vibrations-notifications"
diff --git a/include/datetime/settings.h b/include/datetime/settings.h
index af9227d..29905fd 100644
--- a/include/datetime/settings.h
+++ b/include/datetime/settings.h
@@ -49,6 +49,7 @@ public:
     core::Property<bool> show_day;
     core::Property<bool> show_detected_location;
     core::Property<bool> show_events;
+    core::Property<bool> show_alarms;
     core::Property<bool> show_locations;
     core::Property<bool> show_seconds;
     core::Property<bool> show_week_numbers;
diff --git a/include/datetime/timezone-geoclue.h b/include/datetime/timezone-geoclue.h
index 18fc159..d25d3e5 100644
--- a/include/datetime/timezone-geoclue.h
+++ b/include/datetime/timezone-geoclue.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Canonical Ltd.
+ * Copyright 2022 Robert Tari
  *
  * 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
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #ifndef INDICATOR_DATETIME_GEOCLUE_TIMEZONE_H
@@ -36,7 +38,7 @@ public:
     ~GeoclueTimezone();
 
 private:
-    struct Impl;
+    class Impl;
     std::unique_ptr<Impl> impl;
 
     // we've got pointers in here, so don't allow copying
diff --git a/include/notifications/dbus-shared.h b/include/notifications/dbus-shared.h
index ea47328..931667e 100644
--- a/include/notifications/dbus-shared.h
+++ b/include/notifications/dbus-shared.h
@@ -31,9 +31,8 @@
 #define BUS_POWERD_PATH      "/com/lomiri/Repowerd"
 #define BUS_POWERD_INTERFACE "com.lomiri.Repowerd"
 
-//TODO: Reimplement using hfd-service
-//#define BUS_HAPTIC_NAME      ""
-//#define BUS_HAPTIC_PATH      ""
-//#define BUS_HAPTIC_INTERFACE ""
+#define BUS_HAPTIC_NAME      "com.lomiri.hfd"
+#define BUS_HAPTIC_PATH      "/com/lomiri/hfd"
+#define BUS_HAPTIC_INTERFACE "com.lomiri.hfd.Vibrator"
 
 #endif /* INDICATOR_NOTIFICATIONS_DBUS_SHARED_H */
diff --git a/include/notifications/haptic.h b/include/notifications/haptic.h
index 2f4008a..ccf5298 100644
--- a/include/notifications/haptic.h
+++ b/include/notifications/haptic.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
  *
  * 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
@@ -15,6 +16,7 @@
  *
  * Authors:
  *   Charles Kerr <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #ifndef AYATANA_INDICATOR_NOTIFICATIONS_HAPTIC_H
@@ -36,12 +38,8 @@ namespace notifications {
 class Haptic
 {
 public:
-    enum Mode
-    {
-      MODE_PULSE
-    };
 
-    explicit Haptic(const Mode& mode = MODE_PULSE, bool repeat = false);
+    explicit Haptic(bool repeat = false);
     ~Haptic();
 
 private:
diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h
index d35e38e..c0a941b 100644
--- a/include/notifications/notifications.h
+++ b/include/notifications/notifications.h
@@ -60,11 +60,11 @@ public:
     /* Add a notification hint.
        These keys may be dependent on the notification server. */
     void add_hint (const std::string& name);
-    static constexpr char const * HINT_SNAP {"x-ayatana-snap-decisions"};
-    static constexpr char const * HINT_NONSHAPED_ICON {"x-ayatana-non-shaped-icon"};
-    static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-ayatana-private-affirmative-tint"};
-    static constexpr char const * HINT_REJECTION_TINT {"x-ayatana-private-rejection-tint"};
-    static constexpr char const * HINT_INTERACTIVE {"x-ayatana-switch-to-application"};
+    static constexpr char const * HINT_SNAP {"x-lomiri-snap-decisions"};
+    static constexpr char const * HINT_NONSHAPED_ICON {"x-lomiri-non-shaped-icon"};
+    static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-lomiri-private-affirmative-tint"};
+    static constexpr char const * HINT_REJECTION_TINT {"x-lomiri-private-rejection-tint"};
+    static constexpr char const * HINT_INTERACTIVE {"x-lomiri-switch-to-application"};
 
     /* Add an action button.
        This may fail if the Engine doesn't support actions.