Move evolution-alarm-notify to evolution-data-server

Apart of the move itself, it also contains a UI change of the notification
dialog, the same as the changed way of dealing with the reminders:
a) reminders persist between sessions, until they are dismissed
b) snoozed reminders also persist between sessions.

3 files changed, 81 insertions, 0 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e1714ea18..e1be69120 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,21 @@
 # ********************************
+# evolution-alarm-notify
+# ********************************
+
+set(autostartdir ${SYSCONF_INSTALL_DIR}/xdg/autostart)
+
+configure_file(org.gnome.Evolution-alarm-notify.desktop.in.in
+	org.gnome.Evolution-alarm-notify.desktop.in
+	@ONLY
+)
+
+intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop.in org.gnome.Evolution-alarm-notify.desktop --desktop-style --utf8)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop
+	DESTINATION ${autostartdir}
+)
+
+# ********************************
 # GSettings schemas
 # ********************************
 
@@ -23,6 +40,7 @@ add_custom_command(OUTPUT gschemas.compiled
 
 add_custom_target(data-files ALL
 	DEPENDS gschemas.compiled
+		org.gnome.Evolution-alarm-notify.desktop
 )
 
 add_gsettings_schemas(data-files ${BUILT_SCHEMAS})
diff --git a/data/org.gnome.Evolution-alarm-notify.desktop.in.in b/data/org.gnome.Evolution-alarm-notify.desktop.in.in
new file mode 100644
index 000000000..b0d76b0b0
--- /dev/null
+++ b/data/org.gnome.Evolution-alarm-notify.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+_Name=Evolution Alarm Notify
+_Comment=Calendar event notifications
+Icon=appointment-soon
+Exec=@privlibexecdir@/evolution-alarm-notify
+Terminal=false
+Categories=
+OnlyShowIn=GNOME;Unity;XFCE;Dawati;MATE;
+NoDisplay=true
+X-Meego-Priority=Low
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=evolution-data-server
+X-GNOME-Bugzilla-Component=calendar
+X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
diff --git a/data/org.gnome.evolution-data-server.calendar.gschema.xml.in b/data/org.gnome.evolution-data-server.calendar.gschema.xml.in
index 2e82c9783..4878eb5b4 100644
--- a/data/org.gnome.evolution-data-server.calendar.gschema.xml.in
+++ b/data/org.gnome.evolution-data-server.calendar.gschema.xml.in
@@ -32,5 +32,53 @@
       <default>['']</default>
       <_summary>Snoozed reminders for EReminderWatcher</_summary>
     </key>
+
+    <key name="notify-programs" type="as">
+      <default>[]</default>
+      <_summary>Reminder programs</_summary>
+      <_description>Programs that are allowed to be run by reminders</_description>
+    </key>
+    <key name="notify-with-tray" type="b">
+      <default>true</default>
+      <_summary>Show reminders in notification tray only</_summary>
+      <_description>When set to true, the reminders are shown only in the notification tray, otherwise the reminders dialog is shown immediately</_description>
+    </key>
+    <key name="notify-window-on-top" type="b">
+      <default>true</default>
+      <_summary>Show reminder notification dialog always on top</_summary>
+      <_description>Whether or not to show reminder notification dialog always on top. Note this works only as a hint for the window manager, which may or may not obey it.</_description>
+    </key>
+    <key name="notify-window-x" type="i">
+      <default>-1</default>
+      <_summary>X position of the reminder notification dialog</_summary>
+    </key>
+    <key name="notify-window-y" type="i">
+      <default>-1</default>
+      <_summary>Y position of the reminder notification dialog</_summary>
+    </key>
+    <key name="notify-window-width" type="i">
+      <default>-1</default>
+      <_summary>Width of the reminder notification dialog</_summary>
+    </key>
+    <key name="notify-window-height" type="i">
+      <default>-1</default>
+      <_summary>Height of the reminder notification dialog</_summary>
+    </key>
+    <key name="notify-completed-tasks" type="b">
+      <default>true</default>
+      <_summary>Show reminder notification for completed tasks</_summary>
+    </key>
+    <key name="notify-past-events" type="b">
+      <default>true</default>
+      <_summary>Show reminder notification for past events</_summary>
+    </key>
+    <key name="notify-last-snooze-minutes" type="i">
+      <default>5</default>
+      <_summary>The last used snooze time, in minutes</_summary>
+    </key>
+    <key name="notify-custom-snooze-minutes" type="ai">
+      <default>[]</default>
+      <_summary>User-defined snooze times, in minutes</_summary>
+    </key>
   </schema>
 </schemalist>