From b7055e92d2b05e9eb65edbcc889b9fd8d80e5130 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 4 Nov 2010 17:17:44 +0100 Subject: Move all plugin settings to their own schemas --- .gitignore | 33 ++++++++++ data/Makefile.am | 16 +++-- data/evolution.convert | 24 +++++-- data/org.gnome.evolution.calendar.gschema.xml.in | 4 ++ ...tion.eplugin.attachment-reminder.gschema.xml.in | 9 +++ ...nome.evolution.eplugin.bogo-junk.gschema.xml.in | 9 +++ ...tion.eplugin.email-custom-header.gschema.xml.in | 9 +++ ...volution.eplugin.external-editor.gschema.xml.in | 14 ++++ ...e.evolution.eplugin.face-picture.gschema.xml.in | 9 +++ ...lution.eplugin.mail-notification.gschema.xml.in | 44 +++++++++++++ ...nome.evolution.eplugin.templates.gschema.xml.in | 9 +++ data/org.gnome.evolution.mail.gschema.xml.in | 75 ---------------------- 12 files changed, 172 insertions(+), 83 deletions(-) create mode 100644 .gitignore create mode 100644 data/org.gnome.evolution.calendar.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in create mode 100644 data/org.gnome.evolution.eplugin.templates.gschema.xml.in diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..c1b47cc737 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +Makefile.in +Makefile.in.in +m4/* +configure +ABOUT-NLS +aclocal.m4 +autom4te.cache/ +compile +config.guess +config.h.in +config.log +config.rpath +config.sub +depcomp +gnome-doc-utils.make +gtk-doc.make +install-sh +intltool-extract.in +intltool-merge.in +intltool-update.in +ltmain.sh +missing +mkinstalldirs +po/Makevars.template +po/POTFILES +po/Rules-quot +po/boldquot.sed +po/en@boldquot.header +po/en@quot.header +po/insert-header.sin +po/quot.sed +po/remove-potcdate.sin +*~ diff --git a/data/Makefile.am b/data/Makefile.am index 75a36d47e2..c7f73e4744 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,10 +10,18 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -gsettings_SCHEMAS = \ - org.gnome.evolution.gschema.xml \ - org.gnome.evolution.addressbook.gschema.xml \ - org.gnome.evolution.mail.gschema.xml +gsettings_SCHEMAS = \ + org.gnome.evolution.gschema.xml \ + org.gnome.evolution.addressbook.gschema.xml \ + org.gnome.evolution.calendar.gschema.xml \ + org.gnome.evolution.mail.gschema.xml \ + org.gnome.evolution.eplugin.attachment-reminder.gschema.xml \ + org.gnome.evolution.eplugin.bogo-junk.gschema.xml \ + org.gnome.evolution.eplugin.email-custom-header.gschema.xml \ + org.gnome.evolution.eplugin.external-editor.gschema.xml \ + org.gnome.evolution.eplugin.face-picture.gschema.xml \ + org.gnome.evolution.eplugin.mail-notification.gschema.xml \ + org.gnome.evolution.eplugin.templates.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 0f8c7b46f4..57ce4d6a3c 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -31,13 +31,28 @@ hpane-position = /apps/evolution/addressbook/display/hpane_position vpane-position = /apps/evolution/addressbook/display/vpane_position show-preview = /apps/evolution/addressbook/display/show_preview +[org.gnome.evolution.calendar] + [org.gnome.evolution.mail] check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault -template-placeholders = /apps/evolution/mail/template_placeholders + +[org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues -custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader + +[org.gnome.evolution.eplugin.bogo-junk] utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode + +[org.gnome.evolution.eplugin.email-custom-header] +custom-header = /apps/evolution/eplugin/email_custom_header/customHeader + +[org.gnome.evolution.eplugin.external-editor] +external-editor-command = /apps/evolution/eplugin/external-editor/editor-command +external-editor-launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press + +[org.gnome.evolution.eplugin.face-picture] insert-face-picture = /apps/evolution/eplugin/face/insert_by_default + +[org.gnome.evolution.eplugin.mail-notification] notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled @@ -46,5 +61,6 @@ notify-sound-enabled = /apps/evolution/eplugin/mail-notification/sound-enabled notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep notify-sound-file = /apps/evolution/eplugin/mail-notification/sound-file notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-theme -external-editor-command = /apps/evolution/eplugin/external-editor/editor-command -external-editor-launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press + +[org.gnome.evolution.eplugin.templates] +template-placeholders = /apps/evolution/mail/template_placeholders diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in new file mode 100644 index 0000000000..3cd7f77435 --- /dev/null +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -0,0 +1,4 @@ + + + + diff --git a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in new file mode 100644 index 0000000000..7a4eb02e93 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in @@ -0,0 +1,9 @@ + + + + ['attachment','attaching','attached','enclosed'] + <_summary>List of clues for the attachment reminder plugin to look for in a message body + <_description>List of clues for the attachment reminder plugin to look for in a message body. + + + diff --git a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in new file mode 100644 index 0000000000..15db0a8956 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in @@ -0,0 +1,9 @@ + + + + true + <_summary>Convert mail messages to Unicode + <_description>Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets. + + + diff --git a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in b/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in new file mode 100644 index 0000000000..ac58441856 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in @@ -0,0 +1,9 @@ + + + + ['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret'] + <_summary>List of Custom Headers + <_description>The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";" + + + diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in new file mode 100644 index 0000000000..993734349d --- /dev/null +++ b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in @@ -0,0 +1,14 @@ + + + + 'gedit' + <_summary>Default External Editor + <_description>The default command that must be used as the editor. + + + false + <_summary>Automatically launch when a new mail is edited + <_description>Automatically launch editor when key is pressed in the mail composer. + + + diff --git a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in new file mode 100644 index 0000000000..83e8630451 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in @@ -0,0 +1,9 @@ + + + + false + <_summary>Insert Face picture by default + <_description>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. + + + diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in new file mode 100644 index 0000000000..26dd1e2ae8 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in @@ -0,0 +1,44 @@ + + + + true + <_summary>Notify new messages for Inbox only. + <_description>Whether to notify new messages in Inbox folder only. + + + true + <_summary>Enable D-Bus messages. + <_description>Generates a D-Bus message when new mail messages arrive. + + + true + <_summary>Enable icon in notification area. + <_description>Show new mail icon in notification area when new messages arrive. + + + true + <_summary>Popup message together with the icon. + <_description>Whether show message over the icon when new messages arrive. + + + true + <_summary>Play sound when new messages arrive. + <_description>Whether play sound or beep when new messages arrive. + + + true + <_summary>Beep or play sound file. + <_description>If "true", then beep, otherwise will play sound file when new messages arrive. + + + '' + <_summary>Sound file name to be played. + <_description>Sound file to be played when new messages arrive, if not in beep mode. + + + false + <_summary>Use sound theme + <_description>Play themed sound when new messages arrive, if not in beep mode. + + + diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in new file mode 100644 index 0000000000..7628c743b3 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in @@ -0,0 +1,9 @@ + + + + ['myphone=012345','myplace=Abcd','myname=Alice'] + <_summary>List of keyword/value pairs for the Templates plugin to substitute in a message body. + <_description>List of keyword/value pairs for the Templates plugin to substitute in a message body. + + + diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index a7bc4dc0fa..df9d6c4d5c 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -5,80 +5,5 @@ <_summary>Check whether Evolution is the default mailer <_description>Every time Evolution starts, check whether or not it is the default mailer. - - ['myphone=012345','myplace=Abcd','myname=Alice'] - <_summary>List of keyword/value pairs for the Templates plugin to substitute in a message body. - <_description>List of keyword/value pairs for the Templates plugin to substitute in a message body. - - - ['attachment','attaching','attached','enclosed'] - <_summary>List of clues for the attachment reminder plugin to look for in a message body - <_description>List of clues for the attachment reminder plugin to look for in a message body. - - - ['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret'] - <_summary>List of Custom Headers - <_description>The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";" - - - true - <_summary>Convert mail messages to Unicode - <_description>Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets. - - - false - <_summary>Insert Face picture by default - <_description>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. - - - true - <_summary>Notify new messages for Inbox only. - <_description>Whether to notify new messages in Inbox folder only. - - - true - <_summary>Enable D-Bus messages. - <_description>Generates a D-Bus message when new mail messages arrive. - - - true - <_summary>Enable icon in notification area. - <_description>Show new mail icon in notification area when new messages arrive. - - - true - <_summary>Popup message together with the icon. - <_description>Whether show message over the icon when new messages arrive. - - - true - <_summary>Play sound when new messages arrive. - <_description>Whether play sound or beep when new messages arrive. - - - true - <_summary>Beep or play sound file. - <_description>If "true", then beep, otherwise will play sound file when new messages arrive. - - - '' - <_summary>Sound file name to be played. - <_description>Sound file to be played when new messages arrive, if not in beep mode. - - - false - <_summary>Use sound theme - <_description>Play themed sound when new messages arrive, if not in beep mode. - - - 'gedit' - <_summary>Default External Editor - <_description>The default command that must be used as the editor. - - - false - <_summary>Automatically launch when a new mail is edited - <_description>Automatically launch editor when key is pressed in the mail composer. - -- cgit