diff options
author | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2012-06-15 15:04:08 +0800 |
commit | 94daae3dba8e86e88f69320bc82795fe660ec9cd (patch) | |
tree | 9965d4f6dfc6d48adecd0b9084442185d73d58c7 /modules/calendar | |
parent | 08dedf0a8a520b55c51a8117dc015915ec39f7fe (diff) | |
download | gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.gz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.bz2 gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.lz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.xz gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.tar.zst gsoc2013-evolution-94daae3dba8e86e88f69320bc82795fe660ec9cd.zip |
Remove the last remaining usage of GConf
Diffstat (limited to 'modules/calendar')
-rw-r--r-- | modules/calendar/Makefile.am | 30 | ||||
-rw-r--r-- | modules/calendar/apps_evolution_calendar.schemas.in | 839 | ||||
-rw-r--r-- | modules/calendar/e-cal-shell-settings.c | 37 |
3 files changed, 17 insertions, 889 deletions
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 43465f39fe..0bcc72cfde 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -102,39 +102,9 @@ module_calendar_la_LIBADD = \ module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = apps_evolution_calendar.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ - ui_DATA = e-calendar-preferences.ui EXTRA_DIST = \ - $(schema_in_files) \ $(ui_DATA) -DISTCLEANFILES = $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -if OS_WIN32 -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ - echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ - cmd /c _temp.bat; \ - rm _temp.bat; \ - done \ - fi -else -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -endif -endif - -include $(top_srcdir)/git.mk diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in deleted file mode 100644 index c34852ed4e..0000000000 --- a/modules/calendar/apps_evolution_calendar.schemas.in +++ /dev/null @@ -1,839 +0,0 @@ -<gconfschemafile> - <schemalist> - - <!-- Display --> - - <schema> - <key>/schemas/apps/evolution/calendar/display/primary_calendar</key> - <applyto>/apps/evolution/calendar/display/primary_calendar</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Primary calendar</short> - <long> - The UID of the selected (or "primary") calendar in the - sidebar of the "Calendar" view. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/timezone</key> - <applyto>/apps/evolution/calendar/display/timezone</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>UTC</default> - <locale name="C"> - <short>Timezone</short> - <long>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York".</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/use_system_timezone</key> - <applyto>/apps/evolution/calendar/display/use_system_timezone</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Use system timezone</short> - <long>Use the system timezone instead of the timezone selected - in Evolution.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_second_zone</key> - <applyto>/apps/evolution/calendar/display/day_second_zone</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>The second timezone for a Day View</short> - <long>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_second_zones</key> - <applyto>/apps/evolution/calendar/display/day_second_zones</applyto> - <owner>evolution-calendar</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Recently used second time zones in a Day View</short> - <long>List of recently used second time zones in a Day View.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_second_zones_max</key> - <applyto>/apps/evolution/calendar/display/day_second_zones_max</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>5</default> - <locale name="C"> - <short>Maximum number of recently used timezones to remember.</short> - <long>Maximum number of recently used timezones to remember in a 'day_second_zones' list.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/use_24hour_format</key> - <applyto>/apps/evolution/calendar/display/use_24hour_format</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Twenty four hour time format</short> - <long>Whether to show times in twenty four hour format instead of using am/pm.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_role</key> - <applyto>/apps/evolution/calendar/display/show_role</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show Role field in the event/task/meeting editor</short> - <long>Whether to show role field in the event/task/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_status</key> - <applyto>/apps/evolution/calendar/display/show_status</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show status field in the event/task/meeting editor</short> - <long>Whether to show status field in the event/task/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_type</key> - <applyto>/apps/evolution/calendar/display/show_type</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show type field in the event/task/meeting editor</short> - <long>Whether to show type field in the event/task/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_rsvp</key> - <applyto>/apps/evolution/calendar/display/show_rsvp</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show RSVP field in the event/task/meeting editor</short> - <long>Whether to show RSVP field in the event/task/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_timezone</key> - <applyto>/apps/evolution/calendar/display/show_timezone</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show timezone field in the event/meeting editor</short> - <long>Whether to show timezone field in the event/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_categories</key> - <applyto>/apps/evolution/calendar/display/show_categories</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show categories field in the event/meeting/task editor</short> - <long>Whether to show categories field in the event/meeting editor</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/week_start_day</key> - <applyto>/apps/evolution/calendar/display/week_start_day</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>1</default> - <locale name="C"> - <short>Week start</short> - <long>Weekday the week starts on, from Sunday (0) to Saturday (6).</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_start_hour</key> - <applyto>/apps/evolution/calendar/display/day_start_hour</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>9</default> - <locale name="C"> - <short>Workday start hour</short> - <long>Hour the workday starts on, in twenty four hour format, 0 to 23.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_start_minute</key> - <applyto>/apps/evolution/calendar/display/day_start_minute</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Workday start minute</short> - <long>Minute the workday starts on, 0 to 59.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_end_hour</key> - <applyto>/apps/evolution/calendar/display/day_end_hour</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>17</default> - <locale name="C"> - <short>Workday end hour</short> - <long>Hour the workday ends on, in twenty four hour format, 0 to 23.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/day_end_minute</key> - <applyto>/apps/evolution/calendar/display/day_end_minute</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Workday end minute</short> - <long>Minute the workday ends on, 0 to 59.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/time_divisions</key> - <applyto>/apps/evolution/calendar/display/time_divisions</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>30</default> - <locale name="C"> - <short>Time divisions</short> - <long>Intervals shown in Day and Work Week views, in minutes.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/hpane_position</key> - <applyto>/apps/evolution/calendar/display/hpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>400</default> - <locale name="C"> - <short>Horizontal pane position</short> - <long>Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/vpane_position</key> - <applyto>/apps/evolution/calendar/display/vpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>150</default> - <locale name="C"> - <short>Vertical pane position</short> - <long>Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/month_hpane_position</key> - <applyto>/apps/evolution/calendar/display/month_hpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>32000</default> - <locale name="C"> - <short>Month view horizontal pane position </short> - <long>Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/month_vpane_position</key> - <applyto>/apps/evolution/calendar/display/month_vpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>150</default> - <locale name="C"> - <short>Month view vertical pane position </short> - <long>Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/evolution/calendar/display/date_navigator_pane_position</key> - <applyto>/apps/evolution/calendar/display/date_navigator_pane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>150</default> - <locale name="C"> - <short>Month view vertical pane position </short> - <long>Position of the vertical pane, between the calendar lists and the date navigator calendar.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/memo_layout</key> - <applyto>/apps/evolution/calendar/display/memo_layout</applyto> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Memo layout style</short> - <long> - The layout style determines where to place the preview pane - in relation to the memo list. "0" (Classic View) places the - preview pane below the memo list. "1" (Vertical View) places - the preview pane next to the memo list. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_memo_preview</key> - <applyto>/apps/evolution/calendar/display/show_memo_preview</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show the memo preview pane</short> - <long> - If "true", show the memo preview pane in the main window. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/memo_hpane_position</key> - <applyto>/apps/evolution/calendar/display/memo_hpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>200</default> - <locale name="C"> - <short>Memo preview pane position (horizontal)</short> - <long> - Position of the task preview pane when oriented horizontally. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/memo_vpane_position</key> - <applyto>/apps/evolution/calendar/display/memo_vpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>400</default> - <locale name="C"> - <short>Memo preview pane position (vertical)</short> - <long> - Position of the memo preview pane when oriented vertically. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/task_layout</key> - <applyto>/apps/evolution/calendar/display/task_layout</applyto> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Task layout style</short> - <long> - The layout style determines where to place the preview pane - in relation to the task list. "0" (Classic View) places the - preview pane below the task list. "1" (Vertical View) places - the preview pane next to the task list. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_task_preview</key> - <applyto>/apps/evolution/calendar/display/show_task_preview</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show the task preview pane</short> - <long> - If "true", show the task preview pane in the main window. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/task_hpane_position</key> - <applyto>/apps/evolution/calendar/display/task_hpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>200</default> - <locale name="C"> - <short>Task preview pane position (horizontal)</short> - <long> - Position of the task preview pane when oriented horizontally. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/task_vpane_position</key> - <applyto>/apps/evolution/calendar/display/task_vpane_position</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>400</default> - <locale name="C"> - <short>Task preview pane position (vertical)</short> - <long> - Position of the task preview pane when oriented vertically. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/compress_weekend</key> - <applyto>/apps/evolution/calendar/display/compress_weekend</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Compress weekends in month view</short> - <long>Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_event_end</key> - <applyto>/apps/evolution/calendar/display/show_event_end</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Show appointment end times in week and month views</short> - <long>Whether to display the end time of events in the week and month views.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/working_days</key> - <applyto>/apps/evolution/calendar/display/working_days</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>62</default> - <locale name="C"> - <short>Work days</short> - <long>Days on which the start and end of work hours should be indicated.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/marcus_bains_line</key> - <applyto>/apps/evolution/calendar/display/marcus_bains_line</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Marcus Bains Line</short> - <long>Whether to draw the Marcus Bains Line (line at current time) in the calendar.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/marcus_bains_color_dayview</key> - <applyto>/apps/evolution/calendar/display/marcus_bains_color_dayview</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>#ff0000</default> - <locale name="C"> - <short>Marcus Bains Line Color - Day View</short> - <long>Color to draw the Marcus Bains line in the Day View.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/marcus_bains_color_timebar</key> - <applyto>/apps/evolution/calendar/display/marcus_bains_color_timebar</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>#ff0000</default> - <locale name="C"> - <short>Marcus Bains Line Color - Time bar</short> - <long>Color to draw the Marcus Bains Line in the Time bar (empty for default).</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/recur_events_italic</key> - <applyto>/apps/evolution/calendar/display/recur_events_italic</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Recurrent Events in Italic</short> - <long>Show days with recurrent events in italic font in bottom left calendar.</long> - </locale> - </schema> - - <!-- Memos --> - - <schema> - <key>/schemas/apps/evolution/calendar/memos/primary_memos</key> - <applyto>/apps/evolution/calendar/memos/primary_memos</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Primary memo list</short> - <long> - The UID of the selected (or "primary") memo list in the - sidebar of the "Memos" view. - </long> - </locale> - </schema> - - <!-- Tasks --> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/primary_tasks</key> - <applyto>/apps/evolution/calendar/tasks/primary_tasks</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Primary task list</short> - <long> - The UID of the selected (or "primary") task list in the - sidebar of the "Tasks" view. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/hide_completed</key> - <applyto>/apps/evolution/calendar/tasks/hide_completed</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Hide completed tasks</short> - <long>Whether to hide completed tasks in the tasks view.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/hide_completed_units</key> - <applyto>/apps/evolution/calendar/tasks/hide_completed_units</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>days</default> - <locale name="C"> - <short>Hide task units</short> - <long>Units for determining when to hide tasks, "minutes", "hours" or "days".</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/hide_completed_value</key> - <applyto>/apps/evolution/calendar/tasks/hide_completed_value</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>1</default> - <locale name="C"> - <short>Hide task value</short> - <long>Number of units for determining when to hide tasks.</long> - </locale> - </schema> - - <!-- Tasks: Colors --> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/colors/due_today</key> - <applyto>/apps/evolution/calendar/tasks/colors/due_today</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>#1e90ff</default> - <locale name="C"> - <short>Tasks due today color</short> - <long>Background color of tasks that are due today, in "#rrggbb" format.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/tasks/colors/overdue</key> - <applyto>/apps/evolution/calendar/tasks/colors/overdue</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>#ff0000</default> - <locale name="C"> - <short>Overdue tasks color</short> - <long>Background color of tasks that are overdue, in "#rrggbb" format.</long> - </locale> - </schema> - - <!-- Miscellaneous --> - - <schema> - <key>/schemas/apps/evolution/calendar/prompts/confirm_delete</key> - <applyto>/apps/evolution/calendar/prompts/confirm_delete</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Ask for confirmation when deleting items</short> - <long>Whether to ask for confirmation when deleting an appointment or task.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/prompts/confirm_purge</key> - <applyto>/apps/evolution/calendar/prompts/confirm_purge</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Confirm expunge</short> - <long>Whether to ask for confirmation when expunging appointments and tasks.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/use_default_reminder</key> - <applyto>/apps/evolution/calendar/other/use_default_reminder</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Default appointment reminder</short> - <long>Whether to set a default reminder for appointments.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/default_reminder_interval</key> - <applyto>/apps/evolution/calendar/other/default_reminder_interval</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>15</default> - <locale name="C"> - <short>Default reminder value</short> - <long>Number of units for determining a default reminder.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/default_reminder_units</key> - <applyto>/apps/evolution/calendar/other/default_reminder_units</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>minutes</default> - <locale name="C"> - <short>Default reminder units</short> - <long>Units for a default reminder, "minutes", "hours" or "days".</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/use_ba_reminder</key> - <applyto>/apps/evolution/calendar/other/use_ba_reminder</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Birthday and anniversary reminder</short> - <long> - Whether to set a reminder for birthdays and anniversaries. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/ba_reminder_interval</key> - <applyto>/apps/evolution/calendar/other/ba_reminder_interval</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>15</default> - <locale name="C"> - <short>Birthday and anniversary reminder value</short> - <long> - Number of units for determining a birthday or anniversary reminder. - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/other/ba_reminder_units</key> - <applyto>/apps/evolution/calendar/other/ba_reminder_units</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default>minutes</default> - <locale name="C"> - <short>Birthday and anniversary reminder units</short> - <long> - Units for a birthday or anniversary reminder, "minutes", "hours" - or "days". - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/show_week_numbers</key> - <applyto>/apps/evolution/calendar/display/show_week_numbers</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show week numbers in Day View, Work Week View, and Date Navigator</short> - <long>Whether to show week numbers in various places in the Calendar.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/month_scroll_by_week</key> - <applyto>/apps/evolution/calendar/display/month_scroll_by_week</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>Scroll Month View by a week</short> - <long>Whether to scroll a Month View by a week, not by a month.</long> - </locale> - </schema> - - <!-- Alarm notification --> - - <schema> - <key>/schemas/apps/evolution/calendar/notify/last_notification_time</key> - <applyto>/apps/evolution/calendar/notify/last_notification_time</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>-1</default> - <locale name="C"> - <short>Last reminder time</short> - <long>Time the last reminder ran, in time_t.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/notify/calendars</key> - <applyto>/apps/evolution/calendar/notify/calendars</applyto> - <owner>evolution-calendar</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Calendars to run reminders for</short> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/notify/programs</key> - <applyto>/apps/evolution/calendar/notify/programs</applyto> - <owner>evolution-calendar</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Reminder programs</short> - <long>Programs that are allowed to be run by reminders.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/notify/notify_with_tray</key> - <applyto>/apps/evolution/calendar/notify/notify_with_tray</applyto> - <owner>evolution-calendar</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Show display reminders in notification tray</short> - <long>Whether or not to use the notification tray for display reminders.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/publish/uris</key> - <applyto>/apps/evolution/calendar/publish/uris</applyto> - <owner>evolution-calendar</owner> - <type>list</type> - <list_type>string</list_type> - <default>[]</default> - <locale name="C"> - <short>Free/busy server URLs</short> - <long>List of server URLs for free/busy publishing.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/publish/template</key> - <applyto>/apps/evolution/calendar/publish/template</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Free/busy template URL</short> - <long>The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain.</long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/audio_dir</key> - <applyto>/apps/evolution/calendar/audio_dir</applyto> - <owner>evolution-calendar</owner> - <type>string</type> - <default></default> - <locale name="C"> - <short>Save directory for reminder audio</short> - <long> - Directory for saving reminder audio files - </long> - </locale> - </schema> - - <schema> - <key>/schemas/apps/evolution/calendar/display/error_timeout</key> - <applyto>/apps/evolution/calendar/display/error_timeout</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>60</default> - <locale name="C"> - <short>Amount of time in seconds the error should be shown on the status bar.</short> - <long> Amount of time in seconds the error should be shown on the status bar. - </long> - </locale> - </schema> - <schema> - <key>/schemas/apps/evolution/calendar/display/error_level</key> - <applyto>/apps/evolution/calendar/display/error_level</applyto> - <owner>evolution-calendar</owner> - <type>int</type> - <default>0</default> - <locale name="C"> - <short>Level beyond which the message should be logged.</short> - <long> This can have three possible values. 0 for errors. 1 for warnings. - 2 for debug messages. - </long> - </locale> - </schema> - </schemalist> -</gconfschemafile> diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index e160d18810..ade121d9c7 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -104,10 +104,10 @@ transform_icaltimezone_to_string (GBinding *binding, } static gboolean -transform_weekdays_gconf_to_evolution (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) +transform_weekdays_settings_to_evolution (GBinding *binding, + const GValue *source_value, + GValue *target_value, + gpointer user_data) { GDateWeekday weekday; @@ -119,7 +119,7 @@ transform_weekdays_gconf_to_evolution (GBinding *binding, /* This is purposefully verbose for better readability. */ - /* GConf numbering */ + /* setting numbering */ switch (g_value_get_int (source_value)) { case 0: weekday = G_DATE_SUNDAY; @@ -177,10 +177,10 @@ transform_weekdays_gconf_to_evolution (GBinding *binding, } static gboolean -transform_weekdays_evolution_to_gconf (GBinding *binding, - const GValue *source_value, - GValue *target_value, - gpointer user_data) +transform_weekdays_evolution_to_settings (GBinding *binding, + const GValue *source_value, + GValue *target_value, + gpointer user_data) { GDateWeekday weekday; @@ -192,7 +192,7 @@ transform_weekdays_evolution_to_gconf (GBinding *binding, /* This is purposefully verbose for better readability. */ - /* GConf numbering */ + /* setting numbering */ switch (g_value_get_int (source_value)) { case 0: weekday = G_DATE_MONDAY; @@ -692,7 +692,7 @@ e_cal_shell_backend_init_settings (EShell *shell) /* Do not bind to this. Use "cal-week-start-day" instead. */ e_shell_settings_install_property_for_key ( - "cal-week-start-day-gconf", + "cal-week-start-day-setting", CALENDAR_SCHEMA, "week-start-day"); @@ -727,11 +727,8 @@ e_cal_shell_backend_init_settings (EShell *shell) "prefer-new-item"); /* These properties use transform functions to convert - * GConf values to forms more useful to Evolution. We - * have to use separate properties because GConfBridge - * does not support transform functions. Much of this - * is backward-compatibility cruft for poorly designed - * GConf schemas. */ + * GSettings values to forms more useful to Evolution. + */ e_shell_settings_install_property ( g_param_spec_enum ( @@ -815,15 +812,15 @@ e_cal_shell_backend_init_settings (EShell *shell) G_PARAM_READWRITE)); g_object_bind_property_full ( - shell_settings, "cal-week-start-day-gconf", + shell_settings, "cal-week-start-day-setting", shell_settings, "cal-week-start-day", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE, - transform_weekdays_gconf_to_evolution, - transform_weekdays_evolution_to_gconf, + transform_weekdays_settings_to_evolution, + transform_weekdays_evolution_to_settings, NULL, (GDestroyNotify) NULL); - /* XXX These are my favorite. Storing a bit array in GConf + /* XXX These are my favorite. Storing a bit array in GSettings * instead of separate boolean keys. Brilliant move. */ e_shell_settings_install_property ( |