Port most settings in calendar-config.c to GSettings

2 files changed, 54 insertions, 0 deletions

diff --git a/data/evolution.convert b/data/evolution.convert
index 45954be817..874453aac7 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -32,18 +32,27 @@ vpane-position = /apps/evolution/addressbook/display/vpane_position
 show-preview = /apps/evolution/addressbook/display/show_preview
 
 [org.gnome.evolution.calendar]
+audi-dir = /apps/evolution/calendar/audio_dir
+day-second-zone = /apps/evolution/calendar/display/day_second_zone
+day-second-zones = /apps/evolution/calendar/display/day_second_zones
+day-second-zones-max = /apps/evolution/calendar/display/day_second_zones_max
 editor-show-categories = /apps/evolution/calendar/display/show_categories
 editor-show-role = /apps/evolution/calendar/display/show_role
 editor-show-rsvp = /apps/evolution/calendar/display/show_rsvp
 editor-show-status = /apps/evolution/calendar/display/show_status
 editor-show-timezone = /apps/evolution/calendar/display/show_timezone
 editor-show-type = /apps/evolution/calendar/display/show_type
+hide-completed-tasks = /apps/evolution/calendar/tasks/hide_completed
+hide-completed-tasks-units = /apps/evolution/calendar/tasks/hide_completed_units
+hide-completed-tasks-value = /apps/evolution/calendar/tasks/hide_completed_value
 last-notification-time = /apps/evolution/calendar/notify/last_notification_time
+month-scroll-by-week = /apps/evolution/calendar/display/month_scroll_by_week
 notify-programs = /apps/evolution/calendar/notify/programs
 notify-with-tray = /apps/evolution/calendar/notify/notify_with_tray
 timezone = /apps/evolution/calendar/display/timezone
 use-24hour-format = /apps/evolution/calendar/display/use_24hour_format
 use-system-timezone = /apps/evolution/calendar/display/use_system_timezone
+working-days = /apps/evolution/calendar/display/working_days
 
 [org.gnome.evolution.mail]
 check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in
index 9c0050f8f2..70a13b94d2 100644
--- a/data/org.gnome.evolution.calendar.gschema.xml.in
+++ b/data/org.gnome.evolution.calendar.gschema.xml.in
@@ -1,6 +1,26 @@
 <schemalist>
   <schema gettext-domain="evolution" id="org.gnome.evolution.calendar" path="/apps/evolution/calendar/">
   </schema>
+  <key name="audio-dir" type="s">
+    <default>''</default>
+    <_summary>Save directory for reminder audio</_summary>
+    <_description>Directory for saving reminder audio files</_description>
+  </key>
+  <key name="day-second-zone" type="s">
+    <default>''</default>
+    <_summary>The second timezone for a Day View</_summary>
+    <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key</_description>
+  </key>
+  <key name="day-second-zones" type="as">
+    <default>[]</default>
+    <_summary>Recently used second time zones in a Day View</_summary>
+    <_description>List of recently used second time zones in a Day View</_description>
+  </key>
+  <key name="day-second-zones-max" type="i">
+    <default>5</default>
+    <_summary>Maximum number of recently used timezones to remember</_summary>
+    <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list</_description>
+  </key>
   <key name="editor-show-categories" type="b">
     <default>false</default>
     <_summary>Show categories field in the event/meeting/task editor</_summary>
@@ -31,11 +51,31 @@
     <_summary>Show type field in the event/task/meeting editor</_summary>
     <_description>Whether to show type field in the event/task/meeting editor</_description>
   </key>
+  <key name="hide-completed-tasks" type="b">
+    <default>false</default>
+    <_summary>Hide completed tasks</_summary>
+    <_description>Whether to hide completed tasks in the tasks view</_description>
+  </key>
+  <key name="hide-completed-tasks-units" type="s">
+    <default>'days'</default>
+    <_summary>Hide task units</_summary>
+    <_description>Units for determining when to hide tasks, "minutes", "hours" or "days"</_description>
+  </key>
+  <key name="hide-completed-tasks-value" type="i">
+    <default>1</default>
+    <_summary>Hide task value</_summary>
+    <_description>Number of units for determining when to hide tasks</_description>
+  </key>
   <key name="last-notification-time" type="i">
     <default>1</default>
     <_summary>Last reminder time</_summary>
     <_description>Time the last reminder ran, in time_t</_description>
   </key>
+  <key name="month-scroll-by-week" type="b">
+    <default>true</default>
+    <_summary>Scroll Month View by a week</_summary>
+    <_description>Whether to scroll a Month View by a week, not by a month</_description>
+  </key>
   <key name="notify-programs" type="as">
     <default>[]</default>
     <_summary>Reminder programs</_summary>
@@ -61,4 +101,9 @@
     <_summary>Use system timezone</_summary>
     <_description>Use the system timezone instead of the timezone selected in Evolution</_description>
   </key>
+  <key name="working-days" type="i">
+    <default>62</default>
+    <_summary>Work days</_summary>
+    <_description>Days on which the start and end of work hours should be indicated</_description>
+  </key>
 </schemalist>