From 748368460cbf26983a3f0cd9ce6159557b962eb9 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Sun, 31 Oct 2010 18:49:45 +0100 Subject: Start settings schemas migration --- data/Makefile.am | 17 ++++++++++- data/evolution.convert | 12 ++++++++ data/org.gnome.evolution.schema.xml.in | 52 ++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 data/evolution.convert create mode 100644 data/org.gnome.evolution.schema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 3b17a94a3a..ccc209616b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,6 +10,16 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +gsettings_SCHEMAS = \ + org.gnome.evolution.gschema.xml + +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ + +convertdir = $(datadir)/GConf/gsettings +convert_DATA = evolution.convert + mimedir = $(datadir)/mime-info dist_mime_DATA = evolution.mime @@ -54,6 +64,11 @@ CLEANFILES = \ EXTRA_DIST = \ $(autostart_in_files) \ - $(desktop_in_files) + $(desktop_in_files) \ + $(convert_DATA) \ + $(gsettings_SCHEMAS:.xml=.xml.in.in) + +DISTCLEANFILES = \ + $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/data/evolution.convert b/data/evolution.convert new file mode 100644 index 0000000000..da4b1e405b --- /dev/null +++ b/data/evolution.convert @@ -0,0 +1,12 @@ +[org.gnome.evolution] +version = /apps/evolution/version +last-upgraded-version = /apps/evolution/last_version + +[org.gnome.evolution.shell] +skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog +attachment-view = /apps/evolution/shell/attachment_view +file-chooser-folder = /apps/evolution/shell/file_chooser_folder +start-offline = /apps/evolution/shell/start_offline +folder-paths = /apps/evolution/shell/offline/folder_paths +express-mode = /apps/evolution/shell/express_mode +window-y = /apps/evolution/shell/view_defaults/window_y diff --git a/data/org.gnome.evolution.schema.xml.in b/data/org.gnome.evolution.schema.xml.in new file mode 100644 index 0000000000..8a7653454c --- /dev/null +++ b/data/org.gnome.evolution.schema.xml.in @@ -0,0 +1,52 @@ + + + + + '' + <_summary>Configuration version + <_description>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + + + '' + <_summary>Last upgraded configuration version + <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + + + + + false + <_summary>Skip development warning dialog + <_description>Whether the warning dialog in development versions of Evolution is skipped. + + + 0 + <_summary>Initial attachment view + <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. + + + '' + <_summary>Initial file chooser folder + <_description>Initial folder for GtkFileChooser dialogs. + + + false + <_summary>Start in offline mode + <_description> Whether Evolution will start up in offline mode instead of online mode. + + + [] + <_summary>Offline folder paths + <_description>List of paths for the folders to be synchronized to disk for offline usage. + + + false + <_summary>Enable express mode + <_description>Flag that enables a much simplified user interface. + + + + <_summary>Default window Y coordinate + <_description>The default Y coordinate for the main window. + + + -- cgit v1.2.3 From 8dc246eb61e3034914d8722bd834d5e0130997ba Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 1 Nov 2010 14:16:48 +0100 Subject: Migrate all shell schemas to GSettings --- data/evolution.convert | 11 +++++++ data/org.gnome.evolution.schema.xml.in | 55 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index da4b1e405b..7eae59d717 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -10,3 +10,14 @@ start-offline = /apps/evolution/shell/start_offline folder-paths = /apps/evolution/shell/offline/folder_paths express-mode = /apps/evolution/shell/express_mode window-y = /apps/evolution/shell/view_defaults/window_y +window-x = /apps/evolution/shell/view_defaults/window_x +window-width = /apps/evolution/shell/view_defaults/window_width +window-height = /apps/evolution/shell/view_defaults/window_height +window-maximized = /apps/evolution/shell/view_defaults/window_maximized +buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible +buttons-style = /apps/evolution/shell/view_defaults/buttons_style +toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible +sidebar-visible = /apps/evolution/shell/view_defaults/sidebar_visible +statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible +default-component-id = /apps/evolution/shell/view_defaults/component_id +folder-bar-width = /apps/evolution/shell/view_defaults/folder_bar/width diff --git a/data/org.gnome.evolution.schema.xml.in b/data/org.gnome.evolution.schema.xml.in index 8a7653454c..ab1316289d 100644 --- a/data/org.gnome.evolution.schema.xml.in +++ b/data/org.gnome.evolution.schema.xml.in @@ -48,5 +48,60 @@ <_summary>Default window Y coordinate <_description>The default Y coordinate for the main window. + + + <_summary>Default window X coordinate + <_description>The default X coordinate for the main window. + + + 640 + <_summary>Default window width + <_description>The default width for the main window, in pixels. + + + 480 + <_summary>Default window height + <_description>The default height for the main window, in pixels. + + + true + <_summary>Default window state + <_description>Whether or not the window should be maximized. + + + true + <_summary>Window buttons are visible + <_description>Whether the window buttons should be visible. + + + toolbar + <_summary>Window button style + <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. + + + true + <_summary>Toolbar is visible + <_description>Whether the toolbar should be visible. + + + true + <_summary>Sidebar is visible + <_description>Whether the sidebar should be visible. + + + TRUE + <_summary>Statusbar is visible + <_description>Whether the status bar should be visible. + + + mail + <_summary>ID or alias of the component to be shown by default at start-up. + <_description>ID or alias of the component to be shown by default at start-up. + + + 200 + <_summary>Default sidebar width + <_description>The default width for the sidebar, in pixels. + -- cgit v1.2.3 From 7f482ca3eda9b2f21a810cced232fa821f668a47 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:12:18 +0100 Subject: Add GSettings schemas for addressbook --- data/Makefile.am | 5 +++-- data/evolution.convert | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index ccc209616b..22de063b18 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,8 +10,9 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -gsettings_SCHEMAS = \ - org.gnome.evolution.gschema.xml +gsettings_SCHEMAS = \ + org.gnome.evolution.gschema.xml \ + org.gnome.evolution.addressbook.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 7eae59d717..0100bd94fe 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -21,3 +21,12 @@ sidebar-visible = /apps/evolution/shell/view_defaults/sidebar_visible statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible default-component-id = /apps/evolution/shell/view_defaults/component_id folder-bar-width = /apps/evolution/shell/view_defaults/folder_bar/width + +[org.gnome.evolution.addressbook] +completion-minimum-query-length = /apps/evolution/addressbook/completion/minimum_query_length +completion-show-address = /apps/evolution/addressbook/completion/show_address +select-names-last-used-uri = /apps/evolution/addressbook/select_names/last_used_uri +layout = /apps/evolution/addressbook/display/layout +hpane-position = /apps/evolution/addressbook/display/hpane_position +vpane-position = /apps/evolution/addressbook/display/vpane_position +show-preview = /apps/evolution/addressbook/display/show_preview -- cgit v1.2.3 From 82c33581e19e695461c4c044105cba559cc733ff Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:17:11 +0100 Subject: Migrate mail prompts schemas to GSettings --- data/Makefile.am | 3 +- data/evolution.convert | 3 + .../org.gnome.evolution.addressbook.gschema.xml.in | 39 ++++++++ data/org.gnome.evolution.gschema.xml.in | 107 +++++++++++++++++++++ data/org.gnome.evolution.mail.gschema.xml.in | 9 ++ data/org.gnome.evolution.schema.xml.in | 107 --------------------- 6 files changed, 160 insertions(+), 108 deletions(-) create mode 100644 data/org.gnome.evolution.addressbook.gschema.xml.in create mode 100644 data/org.gnome.evolution.gschema.xml.in create mode 100644 data/org.gnome.evolution.mail.gschema.xml.in delete mode 100644 data/org.gnome.evolution.schema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 22de063b18..75a36d47e2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,7 +12,8 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) gsettings_SCHEMAS = \ org.gnome.evolution.gschema.xml \ - org.gnome.evolution.addressbook.gschema.xml + org.gnome.evolution.addressbook.gschema.xml \ + org.gnome.evolution.mail.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 0100bd94fe..4faa4e3a4b 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -30,3 +30,6 @@ layout = /apps/evolution/addressbook/display/layout 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.mail] +check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault diff --git a/data/org.gnome.evolution.addressbook.gschema.xml.in b/data/org.gnome.evolution.addressbook.gschema.xml.in new file mode 100644 index 0000000000..536841eee4 --- /dev/null +++ b/data/org.gnome.evolution.addressbook.gschema.xml.in @@ -0,0 +1,39 @@ + + + + 3 + <_summary>Autocomplete length + <_description>The number of characters that must be typed before Evolution will attempt to autocomplete. + + + false + <_summary>Show autocompleted name with an address + <_description>Whether force showing the mail address with the name of the autocompleted contact in the entry. + + + '' + <_summary>URI for the folder last used in the select names dialog + <_description>URI for the folder last used in the select names dialog. + + + 0 + <_summary>Contact layout style + <_description>The layout style determines where to place the preview pane in relation to the contact list. "0" (Classic View) places the preview pane below the contact list. "1" (Vertical View) places the preview pane next to the contact list. + + + 200 + <_summary>Contact preview pane position (horizontal) + <_description>Position of the contact preview pane when oriented horizontally. + + + 400 + <_summary>Contact preview pane position (vertical) + <_description>Position of the contact preview pane when oriented vertically. + + + true + <_summary>Show preview pane + <_description>Whether to show the preview pane. + + + diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in new file mode 100644 index 0000000000..ab1316289d --- /dev/null +++ b/data/org.gnome.evolution.gschema.xml.in @@ -0,0 +1,107 @@ + + + + + '' + <_summary>Configuration version + <_description>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + + + '' + <_summary>Last upgraded configuration version + <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + + + + + false + <_summary>Skip development warning dialog + <_description>Whether the warning dialog in development versions of Evolution is skipped. + + + 0 + <_summary>Initial attachment view + <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. + + + '' + <_summary>Initial file chooser folder + <_description>Initial folder for GtkFileChooser dialogs. + + + false + <_summary>Start in offline mode + <_description> Whether Evolution will start up in offline mode instead of online mode. + + + [] + <_summary>Offline folder paths + <_description>List of paths for the folders to be synchronized to disk for offline usage. + + + false + <_summary>Enable express mode + <_description>Flag that enables a much simplified user interface. + + + + <_summary>Default window Y coordinate + <_description>The default Y coordinate for the main window. + + + + <_summary>Default window X coordinate + <_description>The default X coordinate for the main window. + + + 640 + <_summary>Default window width + <_description>The default width for the main window, in pixels. + + + 480 + <_summary>Default window height + <_description>The default height for the main window, in pixels. + + + true + <_summary>Default window state + <_description>Whether or not the window should be maximized. + + + true + <_summary>Window buttons are visible + <_description>Whether the window buttons should be visible. + + + toolbar + <_summary>Window button style + <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. + + + true + <_summary>Toolbar is visible + <_description>Whether the toolbar should be visible. + + + true + <_summary>Sidebar is visible + <_description>Whether the sidebar should be visible. + + + TRUE + <_summary>Statusbar is visible + <_description>Whether the status bar should be visible. + + + mail + <_summary>ID or alias of the component to be shown by default at start-up. + <_description>ID or alias of the component to be shown by default at start-up. + + + 200 + <_summary>Default sidebar width + <_description>The default width for the sidebar, in pixels. + + + diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in new file mode 100644 index 0000000000..df9d6c4d5c --- /dev/null +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -0,0 +1,9 @@ + + + + true + <_summary>Check whether Evolution is the default mailer + <_description>Every time Evolution starts, check whether or not it is the default mailer. + + + diff --git a/data/org.gnome.evolution.schema.xml.in b/data/org.gnome.evolution.schema.xml.in deleted file mode 100644 index ab1316289d..0000000000 --- a/data/org.gnome.evolution.schema.xml.in +++ /dev/null @@ -1,107 +0,0 @@ - - - - - '' - <_summary>Configuration version - <_description>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - - - '' - <_summary>Last upgraded configuration version - <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - - - - - false - <_summary>Skip development warning dialog - <_description>Whether the warning dialog in development versions of Evolution is skipped. - - - 0 - <_summary>Initial attachment view - <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. - - - '' - <_summary>Initial file chooser folder - <_description>Initial folder for GtkFileChooser dialogs. - - - false - <_summary>Start in offline mode - <_description> Whether Evolution will start up in offline mode instead of online mode. - - - [] - <_summary>Offline folder paths - <_description>List of paths for the folders to be synchronized to disk for offline usage. - - - false - <_summary>Enable express mode - <_description>Flag that enables a much simplified user interface. - - - - <_summary>Default window Y coordinate - <_description>The default Y coordinate for the main window. - - - - <_summary>Default window X coordinate - <_description>The default X coordinate for the main window. - - - 640 - <_summary>Default window width - <_description>The default width for the main window, in pixels. - - - 480 - <_summary>Default window height - <_description>The default height for the main window, in pixels. - - - true - <_summary>Default window state - <_description>Whether or not the window should be maximized. - - - true - <_summary>Window buttons are visible - <_description>Whether the window buttons should be visible. - - - toolbar - <_summary>Window button style - <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. - - - true - <_summary>Toolbar is visible - <_description>Whether the toolbar should be visible. - - - true - <_summary>Sidebar is visible - <_description>Whether the sidebar should be visible. - - - TRUE - <_summary>Statusbar is visible - <_description>Whether the status bar should be visible. - - - mail - <_summary>ID or alias of the component to be shown by default at start-up. - <_description>ID or alias of the component to be shown by default at start-up. - - - 200 - <_summary>Default sidebar width - <_description>The default width for the sidebar, in pixels. - - - -- cgit v1.2.3 From c7117af0742412b97366b4c4861566ab3d0cbfaf Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:20:17 +0100 Subject: Migrate template placeholders schemas to GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.mail.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 4faa4e3a4b..96f62821a3 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -33,3 +33,4 @@ show-preview = /apps/evolution/addressbook/display/show_preview [org.gnome.evolution.mail] check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault +template-placeholders = /apps/evolution/mail/template_placeholders diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index df9d6c4d5c..ec74a2b3d2 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -5,5 +5,10 @@ <_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. + -- cgit v1.2.3 From 46424f03b44f6dfd417b483f4830282e3ad7fc7a Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:24:02 +0100 Subject: Migrate custom headers schemas to GSettings --- data/evolution.convert | 2 ++ data/org.gnome.evolution.mail.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 96f62821a3..930ac2d6b3 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -34,3 +34,5 @@ show-preview = /apps/evolution/addressbook/display/show_preview [org.gnome.evolution.mail] check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault template-placeholders = /apps/evolution/mail/template_placeholders +attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues +custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index ec74a2b3d2..0ac359ee25 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -10,5 +10,15 @@ <_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 ";" + -- cgit v1.2.3 From 7b4aacd7323a0d65a692dfc3aa19e800cd619c0c Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:27:49 +0100 Subject: Migrate face picture schemas to GSettings --- data/evolution.convert | 2 ++ data/org.gnome.evolution.mail.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 930ac2d6b3..84f5e91275 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -36,3 +36,5 @@ check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault template-placeholders = /apps/evolution/mail/template_placeholders attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader +utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode +insert-face-picture = /apps/evolution/eplugin/face/insert_by_default diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 0ac359ee25..e711d0217f 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -20,5 +20,15 @@ <_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. + -- cgit v1.2.3 From 66874740c44489a8298ce3fe3a9d28a49d5c3e05 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:35:05 +0100 Subject: Migrate mail notification schemas to GSettings --- data/evolution.convert | 8 ++++++ data/org.gnome.evolution.mail.gschema.xml.in | 40 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 84f5e91275..903a53a3de 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -38,3 +38,11 @@ attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode insert-face-picture = /apps/evolution/eplugin/face/insert_by_default +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 +notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification +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 diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index e711d0217f..86cbb12dce 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -30,5 +30,45 @@ <_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 + Notify new messages for Inbox only. + Whether to notify new messages in Inbox folder only. + + + true + Enable D-Bus messages. + Generates a D-Bus message when new mail messages arrive. + + + true + Enable icon in notification area. + Show new mail icon in notification area when new messages arrive. + + + true + Popup message together with the icon. + Whether show message over the icon when new messages arrive. + + + true + Play sound when new messages arrive. + Whether play sound or beep when new messages arrive. + + + true + Beep or play sound file. + If "true", then beep, otherwise will play sound file when new messages arrive. + + + '' + Sound file name to be played. + Sound file to be played when new messages arrive, if not in beep mode. + + + false + Use sound theme + Play themed sound when new messages arrive, if not in beep mode. + -- cgit v1.2.3 From bea984eba00d835be71c283a7ae38310741eb609 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 3 Nov 2010 18:44:55 +0100 Subject: Fix copy-pasted XML --- data/org.gnome.evolution.mail.gschema.xml.in | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 86cbb12dce..29e8abff5d 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -32,43 +32,43 @@ true - Notify new messages for Inbox only. - Whether to notify new messages in Inbox folder only. + <_summary>Notify new messages for Inbox only. + <_description>Whether to notify new messages in Inbox folder only. true - Enable D-Bus messages. - Generates a D-Bus message when new mail messages arrive. + <_summary>Enable D-Bus messages. + <_description>Generates a D-Bus message when new mail messages arrive. true - Enable icon in notification area. - Show new mail icon in notification area when new messages arrive. + <_summary>Enable icon in notification area. + <_description>Show new mail icon in notification area when new messages arrive. true - Popup message together with the icon. - Whether show message over the icon when new messages arrive. + <_summary>Popup message together with the icon. + <_description>Whether show message over the icon when new messages arrive. true - Play sound when new messages arrive. - Whether play sound or beep when new messages arrive. + <_summary>Play sound when new messages arrive. + <_description>Whether play sound or beep when new messages arrive. true - Beep or play sound file. - If "true", then beep, otherwise will play sound file when new messages arrive. + <_summary>Beep or play sound file. + <_description>If "true", then beep, otherwise will play sound file when new messages arrive. '' - Sound file name to be played. - Sound file to be played when new messages arrive, if not in beep mode. + <_summary>Sound file name to be played. + <_description>Sound file to be played when new messages arrive, if not in beep mode. false - Use sound theme - Play themed sound when new messages arrive, if not in beep mode. + <_summary>Use sound theme + <_description>Play themed sound when new messages arrive, if not in beep mode. -- cgit v1.2.3 From 77843017693961ab93a81b7bb0bf2b4616d8381f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Nov 2010 10:59:54 +0100 Subject: Add missing stock appointment-reminder icons --- data/icons/Makefile.am | 10 ++++++++++ ...olor_status_16x16_stock_appointment-reminder-excl.png | Bin 0 -> 1007 bytes .../hicolor_status_16x16_stock_appointment-reminder.png | Bin 0 -> 969 bytes ...olor_status_22x22_stock_appointment-reminder-excl.png | Bin 0 -> 1641 bytes .../hicolor_status_22x22_stock_appointment-reminder.png | Bin 0 -> 1609 bytes ...olor_status_24x24_stock_appointment-reminder-excl.png | Bin 0 -> 1741 bytes .../hicolor_status_24x24_stock_appointment-reminder.png | Bin 0 -> 1672 bytes ...olor_status_32x32_stock_appointment-reminder-excl.png | Bin 0 -> 2620 bytes .../hicolor_status_32x32_stock_appointment-reminder.png | Bin 0 -> 2881 bytes ...olor_status_48x48_stock_appointment-reminder-excl.png | Bin 0 -> 4931 bytes .../hicolor_status_48x48_stock_appointment-reminder.png | Bin 0 -> 5216 bytes 11 files changed, 10 insertions(+) create mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png create mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder.png create mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png create mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder.png create mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png create mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder.png create mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png create mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder.png create mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png create mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder.png (limited to 'data') diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index caf61d344f..c95d4be0d0 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -190,6 +190,16 @@ stock_private_icons = \ hicolor_status_48x48_stock_signature-bad.png \ hicolor_status_48x48_stock_signature-ok.png \ hicolor_status_48x48_stock_signature.png \ + hicolor_status_16x16_stock_appointment-reminder.png \ + hicolor_status_16x16_stock_appointment-reminder-excl.png \ + hicolor_status_22x22_stock_appointment-reminder.png \ + hicolor_status_22x22_stock_appointment-reminder-excl.png \ + hicolor_status_24x24_stock_appointment-reminder.png \ + hicolor_status_24x24_stock_appointment-reminder-excl.png \ + hicolor_status_32x32_stock_appointment-reminder.png \ + hicolor_status_32x32_stock_appointment-reminder-excl.png \ + hicolor_status_48x48_stock_appointment-reminder.png \ + hicolor_status_48x48_stock_appointment-reminder-excl.png \ $(NULL) # hicolor_status_16x16_wrapped.png was copied from Firefox diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png new file mode 100644 index 0000000000..51339f875a Binary files /dev/null and b/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png differ diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder.png new file mode 100644 index 0000000000..4564284e39 Binary files /dev/null and b/data/icons/hicolor_status_16x16_stock_appointment-reminder.png differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png new file mode 100644 index 0000000000..ebbb497121 Binary files /dev/null and b/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder.png new file mode 100644 index 0000000000..6c7e878d70 Binary files /dev/null and b/data/icons/hicolor_status_22x22_stock_appointment-reminder.png differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png new file mode 100644 index 0000000000..a4a3cb5320 Binary files /dev/null and b/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder.png new file mode 100644 index 0000000000..72190aefb4 Binary files /dev/null and b/data/icons/hicolor_status_24x24_stock_appointment-reminder.png differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png new file mode 100644 index 0000000000..788d7d1e95 Binary files /dev/null and b/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder.png new file mode 100644 index 0000000000..cdd2bb381c Binary files /dev/null and b/data/icons/hicolor_status_32x32_stock_appointment-reminder.png differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png new file mode 100644 index 0000000000..f2ae551875 Binary files /dev/null and b/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder.png new file mode 100644 index 0000000000..57d92a28fb Binary files /dev/null and b/data/icons/hicolor_status_48x48_stock_appointment-reminder.png differ -- cgit v1.2.3 From 9f143e40d168c4e34433067735bcd5f7787dccf1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Nov 2010 11:40:59 +0100 Subject: stock_appontment-reminder icons renamed (reverts previous commit) --- data/icons/Makefile.am | 10 ---------- ...olor_status_16x16_stock_appointment-reminder-excl.png | Bin 1007 -> 0 bytes .../hicolor_status_16x16_stock_appointment-reminder.png | Bin 969 -> 0 bytes ...olor_status_22x22_stock_appointment-reminder-excl.png | Bin 1641 -> 0 bytes .../hicolor_status_22x22_stock_appointment-reminder.png | Bin 1609 -> 0 bytes ...olor_status_24x24_stock_appointment-reminder-excl.png | Bin 1741 -> 0 bytes .../hicolor_status_24x24_stock_appointment-reminder.png | Bin 1672 -> 0 bytes ...olor_status_32x32_stock_appointment-reminder-excl.png | Bin 2620 -> 0 bytes .../hicolor_status_32x32_stock_appointment-reminder.png | Bin 2881 -> 0 bytes ...olor_status_48x48_stock_appointment-reminder-excl.png | Bin 4931 -> 0 bytes .../hicolor_status_48x48_stock_appointment-reminder.png | Bin 5216 -> 0 bytes 11 files changed, 10 deletions(-) delete mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_16x16_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_22x22_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_24x24_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_32x32_stock_appointment-reminder.png delete mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png delete mode 100644 data/icons/hicolor_status_48x48_stock_appointment-reminder.png (limited to 'data') diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index c95d4be0d0..caf61d344f 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -190,16 +190,6 @@ stock_private_icons = \ hicolor_status_48x48_stock_signature-bad.png \ hicolor_status_48x48_stock_signature-ok.png \ hicolor_status_48x48_stock_signature.png \ - hicolor_status_16x16_stock_appointment-reminder.png \ - hicolor_status_16x16_stock_appointment-reminder-excl.png \ - hicolor_status_22x22_stock_appointment-reminder.png \ - hicolor_status_22x22_stock_appointment-reminder-excl.png \ - hicolor_status_24x24_stock_appointment-reminder.png \ - hicolor_status_24x24_stock_appointment-reminder-excl.png \ - hicolor_status_32x32_stock_appointment-reminder.png \ - hicolor_status_32x32_stock_appointment-reminder-excl.png \ - hicolor_status_48x48_stock_appointment-reminder.png \ - hicolor_status_48x48_stock_appointment-reminder-excl.png \ $(NULL) # hicolor_status_16x16_wrapped.png was copied from Firefox diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png deleted file mode 100644 index 51339f875a..0000000000 Binary files a/data/icons/hicolor_status_16x16_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_16x16_stock_appointment-reminder.png b/data/icons/hicolor_status_16x16_stock_appointment-reminder.png deleted file mode 100644 index 4564284e39..0000000000 Binary files a/data/icons/hicolor_status_16x16_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png deleted file mode 100644 index ebbb497121..0000000000 Binary files a/data/icons/hicolor_status_22x22_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_22x22_stock_appointment-reminder.png b/data/icons/hicolor_status_22x22_stock_appointment-reminder.png deleted file mode 100644 index 6c7e878d70..0000000000 Binary files a/data/icons/hicolor_status_22x22_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png deleted file mode 100644 index a4a3cb5320..0000000000 Binary files a/data/icons/hicolor_status_24x24_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_24x24_stock_appointment-reminder.png b/data/icons/hicolor_status_24x24_stock_appointment-reminder.png deleted file mode 100644 index 72190aefb4..0000000000 Binary files a/data/icons/hicolor_status_24x24_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png deleted file mode 100644 index 788d7d1e95..0000000000 Binary files a/data/icons/hicolor_status_32x32_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_32x32_stock_appointment-reminder.png b/data/icons/hicolor_status_32x32_stock_appointment-reminder.png deleted file mode 100644 index cdd2bb381c..0000000000 Binary files a/data/icons/hicolor_status_32x32_stock_appointment-reminder.png and /dev/null differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png deleted file mode 100644 index f2ae551875..0000000000 Binary files a/data/icons/hicolor_status_48x48_stock_appointment-reminder-excl.png and /dev/null differ diff --git a/data/icons/hicolor_status_48x48_stock_appointment-reminder.png b/data/icons/hicolor_status_48x48_stock_appointment-reminder.png deleted file mode 100644 index 57d92a28fb..0000000000 Binary files a/data/icons/hicolor_status_48x48_stock_appointment-reminder.png and /dev/null differ -- cgit v1.2.3 From d4ffb60e9bf71dfd4728c4d1d15720b5cb40e863 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 4 Nov 2010 13:44:44 +0100 Subject: Migrate external editor schemas to GSettings --- data/evolution.convert | 2 ++ data/org.gnome.evolution.mail.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 903a53a3de..0f8c7b46f4 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -46,3 +46,5 @@ 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 diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 29e8abff5d..a7bc4dc0fa 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -70,5 +70,15 @@ <_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 v1.2.3 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 --- 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 ---------------------- 11 files changed, 139 insertions(+), 83 deletions(-) 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 (limited to 'data') 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 v1.2.3 From 8c726b3b0468e535b1a8ae7cc9ac0cb714c67a41 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 4 Nov 2010 17:47:34 +0100 Subject: Migrate composer schemas to GSettings --- data/evolution.convert | 25 ++++++ data/org.gnome.evolution.mail.gschema.xml.in | 119 +++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 57ce4d6a3c..67b1a401f9 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -35,6 +35,31 @@ show-preview = /apps/evolution/addressbook/display/show_preview [org.gnome.evolution.mail] check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault +composer-charset = /apps/evolution/mail/composer/charset +composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling +composer-magic-links = /apps/evolution/mail/composer/magic_links +composer-magic-smileys = /apps/evolution/mail/composer/magic_smileys +composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list +composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom +composer-request-receipt = /apps/evolution/mail/composer/request_receipt +composer-send-html = /apps/evolution/mail/composer/send_html +composer-spell-color = /apps/evolution/mail/composer/spell_color +composer-spell-languages = /apps/evolution/mail/composer/spell_languages +composer-show-bcc = /apps/evolution/mail/composer/show_mail_bcc +composer-show-cc = /apps/evolution/mail/composer/show_mail_cc +composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to +composer-show-post-from = /apps/evolution/mail/composer/show_post_from +composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to +composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames +composer-top-signature = /apps/evolution/mail/composer/top_signature +composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim +composer-width = /apps/evolution/mail/composer/width +composer-height = /apps/evolution/mail/composer/height +composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to +show-animated-images = /apps/evolution/mail/display/animated_images +side-bar-search = /apps/evolution/mail/display/side_bar_search +no-folder-dots = /apps/evolution/mail/display/no_folder_dots +***********************************************HERE**************************************************** [org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index df9d6c4d5c..64b63c1982 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -5,5 +5,124 @@ <_summary>Check whether Evolution is the default mailer <_description>Every time Evolution starts, check whether or not it is the default mailer. + + '' + Default charset in which to compose messages + Default charset in which to compose messages. + + + true + Spell check inline + Draw spelling error indicators on words as you type. + + + true + Automatic link recognition + Recognize links in text and replace them. + + + false + Automatic emoticon recognition + Recognize emoticons in text and replace them with images. + + + false + Group Reply replies to list + Instead of the normal "Reply to All" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying. + + + false + Put the cursor at the bottom of replies + Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom. + + + false + Always request read receipt + Whether a read receipt request gets added to every message by default. + + + false + Send HTML mail by default + Send HTML mail by default. + + + '#FFFF00000000' + Spell checking color + Underline color for misspelled words when using inline spelling. + + + [] + Spell checking languages + List of dictionary language codes used for spell checking. + + + false + Show "Bcc" field when sending a mail message + Show the "Bcc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + + + true + Show "Cc" field when sending a mail message + Show the "Cc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + + + false + Show "Reply To" field when sending a mail message + Show the "Reply To" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + + + true + Show "From" field when posting to a newsgroup + Show the "From" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. + + + false + Show "Reply To" field when posting to a newsgroup + Show the "Reply To" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. + + + false + Encode file names in an Outlook/GMail way + Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard. + + + false + Put personalized signatures at the top of replies + Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom. + + + false + Do not add signature delimiter + Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail. + + + 600 + Composer Window default width + Default width of the Composer Window. + + + 500 + Composer Window default height + Default height of the Composer Window. + + + false + Ignore list Reply-To: + Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one. + + + false + Show image animations + Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead. + + + true + Enable or disable type ahead search feature + Enable the side bar search feature to allow interactive searching of folder names. + + + false + Disable or enable ellipsizing of folder names in side bar + Whether disable ellipsizing feature of folder names in side bar. -- cgit v1.2.3 From 63488d0db65548e529ce458ede3437d189c20004 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 9 Nov 2010 23:29:37 +0100 Subject: Migrated half of the mail schemas to GSettings --- data/evolution.convert | 39 +++- data/org.gnome.evolution.mail.gschema.xml.in | 287 ++++++++++++++++++++++----- 2 files changed, 277 insertions(+), 49 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 67b1a401f9..94334786bb 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -59,7 +59,44 @@ composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_ show-animated-images = /apps/evolution/mail/display/animated_images side-bar-search = /apps/evolution/mail/display/side_bar_search no-folder-dots = /apps/evolution/mail/display/no_folder_dots -***********************************************HERE**************************************************** +magic-spacebar = /apps/evolution/mail/display/magic_spacebar +global-view-setting = /apps/evolution/mail/display/global_view_setting +mark-citations = /apps/evolution/mail/display/mark_citations +citation-colour = /apps/evolution/mail/display/citation_colour +caret-mode = /apps/evolution/mail/display/caret_mode +charset = /apps/evolution/mail/display/charset +load-http-images = /apps/evolution/mail/display/load_http_images +animate-images = /apps/evolution/mail/display/animate_images +shoe-all-headers = /apps/evolution/mail/display/show_all_headers +headers = /apps/evolution/mail/display/headers +show-sender-photo = /apps/evolution/mail/display/sender_photo +photo-local = /apps/evolution/mail/display/photo_local +mime-types = /apps/evolution/mail/display/mime_types +mark-seen = /apps/evolution/mail/display/mark_seen +mark-seen-timeout = /apps/evolution/mail/display/mark_seen_timeout +show-email = /apps/evolution/mail/display/show_email +vertical-view-fonts = /apps/evolution/mail/display/vertical_view_fonts +show-deleted = /apps/evolution/mail/display/show_deleted +enable-vfolders = /apps/evolution/mail/display/enable_vfolders +safe-list = /apps/evolution/mail/display/safe_list +paned-size = /apps/evolution/mail/display/paned_size +hpaned-size = /apps/evolution/mail/display/hpaned_size +layout = /apps/evolution/mail/display/layout +variable-width-font = /apps/evolution/mail/display/fonts/variable +monospace-font = /apps/evolution/mail/display/fonts/monospace +use-custom-font = /apps/evolution/mail/display/fonts/use_custom +address-compress = /apps/evolution/mail/display/address_compress +force-message-limit = /apps/evolution/mail/display/force_message_limit +message-text-part-limit = /apps/evolution/mail/display/message_text_part_limit +address-count = /apps/evolution/mail/display/address_count +thread-subject = /apps/evolution/mail/display/thread_subject +thread-expand = /apps/evolution/mail/display/thread_expand +thread-latest = /apps/evolution/mail/display/thread_latest +mail-browser-width = /apps/evolution/mail/mail_browser_width +mail-browser-height = /apps/evolution/mail/mail_browser_height +mail-browser-maximized = /apps/evolution/mail/mail_browser_maximized +subscription-editor-height = /apps/evolution/mail/subscription_editor_height +=================================================================================================================== [org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 64b63c1982..7fe1b12b2e 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -7,122 +7,313 @@ '' - Default charset in which to compose messages - Default charset in which to compose messages. + <_summary>Default charset in which to compose messages + <_description>Default charset in which to compose messages. true - Spell check inline - Draw spelling error indicators on words as you type. + <_summary>Spell check inline + <_description>Draw spelling error indicators on words as you type. true - Automatic link recognition - Recognize links in text and replace them. + <_summary>Automatic link recognition + <_description>Recognize links in text and replace them. false - Automatic emoticon recognition - Recognize emoticons in text and replace them with images. + <_summary>Automatic emoticon recognition + <_description>Recognize emoticons in text and replace them with images. false - Group Reply replies to list - Instead of the normal "Reply to All" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying. + <_summary>Group Reply replies to list + <_description>Instead of the normal "Reply to All" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying. false - Put the cursor at the bottom of replies - Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom. + <_summary>Put the cursor at the bottom of replies + <_description>Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom. false - Always request read receipt - Whether a read receipt request gets added to every message by default. + <_summary>Always request read receipt + <_description>Whether a read receipt request gets added to every message by default. false - Send HTML mail by default - Send HTML mail by default. + <_summary>Send HTML mail by default + <_description>Send HTML mail by default. '#FFFF00000000' - Spell checking color - Underline color for misspelled words when using inline spelling. + <_summary>Spell checking color + <_description>Underline color for misspelled words when using inline spelling. [] - Spell checking languages - List of dictionary language codes used for spell checking. + <_summary>Spell checking languages + <_description>List of dictionary language codes used for spell checking. false - Show "Bcc" field when sending a mail message - Show the "Bcc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + <_summary>Show "Bcc" field when sending a mail message + <_description>Show the "Bcc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. true - Show "Cc" field when sending a mail message - Show the "Cc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + <_summary>Show "Cc" field when sending a mail message + <_description>Show the "Cc" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. false - Show "Reply To" field when sending a mail message - Show the "Reply To" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. + <_summary>Show "Reply To" field when sending a mail message + <_description>Show the "Reply To" field when sending a mail message. This is controlled from the View menu when a mail account is chosen. true - Show "From" field when posting to a newsgroup - Show the "From" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. + <_summary>Show "From" field when posting to a newsgroup + <_description>Show the "From" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. false - Show "Reply To" field when posting to a newsgroup - Show the "Reply To" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. + <_summary>Show "Reply To" field when posting to a newsgroup + <_description>Show the "Reply To" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. false - Encode file names in an Outlook/GMail way - Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard. + <_summary>Encode file names in an Outlook/GMail way + <_description>Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard. false - Put personalized signatures at the top of replies - Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom. + <_summary>Put personalized signatures at the top of replies + <_description>Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom. false - Do not add signature delimiter - Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail. + <_summary>Do not add signature delimiter + <_description>Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail. 600 - Composer Window default width - Default width of the Composer Window. + <_summary>Composer Window default width + <_description>Default width of the Composer Window. 500 - Composer Window default height - Default height of the Composer Window. + <_summary>Composer Window default height + <_description>Default height of the Composer Window. false - Ignore list Reply-To: - Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one. + <_summary>Ignore list Reply-To: + <_description>Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one. false - Show image animations - Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead. + <_summary>Show image animations + <_description>Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead. true - Enable or disable type ahead search feature - Enable the side bar search feature to allow interactive searching of folder names. + <_summary>Enable or disable type ahead search feature + <_description>Enable the side bar search feature to allow interactive searching of folder names. false - Disable or enable ellipsizing of folder names in side bar - Whether disable ellipsizing feature of folder names in side bar. + <_summary>Disable or enable ellipsizing of folder names in side bar + <_description>Whether disable ellipsizing feature of folder names in side bar. + + + true + <_summary>Enable or disable magic space bar + <_description>Enable this to use Space bar key to scroll in message preview, message list and folders. + + + false + <_summary>Enable to use a similar message list view settings for all folders + <_description>Enable to use a similar message list view settings for all folders. + + + true + <_summary>Mark citations in the message "Preview" + <_description>Mark citations in the message "Preview". + + + '#737373' + <_summary>Citation highlight color + <_description>Citation highlight color. + + + false + <_summary>Enable/disable caret mode + <_description>Enable caret mode, so that you can see a cursor when reading mail. + + + '' + <_summary>Default charset in which to display messages + <_description>Default charset in which to display messages. + + + 0 + <_summary>Load images for HTML messages over HTTP + <_description> + Load images for HTML messages over HTTP(S). Possible values are: + "0" - Never load images off the net. + "1" - Load images in messages from contacts. + "2" - Always load images off the net. + + + + true + <_summary>Show Animations + <_description>Show animated images as animations. + + + false + Show all message headers + Show all the headers when viewing a messages. + + + [] + List of custom headers and whether they are enabled. + This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is <header enabled> - set enabled if the header is to be displayed in the mail view. + + + false + Show photo of the sender + Show the photo of the sender in the message reading pane. + + + true + Search for the sender photo in local address books + This option would help in improving the speed of fetching. + + + [] + List of MIME types to check for Bonobo component viewers + If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content. + + + true + Mark as Seen after specified timeout + Mark as Seen after specified timeout. + + + 1500 + Timeout for marking message as seen + Timeout for marking message as seen. + + + false + Sender email-address column in the message list + Show the email-address of the sender in a separate column in the message list. + + + false + Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view + Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view. + + + false + Show deleted messages in the message-list + Show deleted messages (with a strike-through) in the message-list. + + + true + Enable search folders + Enable search folders on startup. + + + false + Hides the per-folder preview and removes the selection + This key is read only once and reset to "false" after read. This unselects the mail in the list and removes the preview for that folder. + + + 144 + Height of the message-list pane + Height of the message-list pane. + + + 450 + Width of the message-list pane + Width of the message-list pane. + + + 0 + Layout style + The layout style determines where to place the preview pane in relation to the message list. "0" (Classic View) places the preview pane below the message list. "1" (Vertical View) places the preview pane next to the message list. + + + 'Sans 12' + Variable width font + The variable width font for mail display. + + + 'Monospace 12' + Terminal font + The terminal font for mail display. + + + false + Use custom fonts + Use custom fonts for displaying mail. + + + true + Compress display of addresses in TO/CC/BCC + Compress display of addresses in TO/CC/BCC to the number specified in address_count. + + + true + Display only message texts not exceeding certain size + Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key. + + + 4096 + Message text limit for display + This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated. + + + 5 + Number of addresses to display in TO/CC/BCC + This sets the number of addresses to show in default message list view, beyond which a '...' is shown. + + + false + Thread the message-list based on Subject + Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers. + + + true + Default value for thread expand state + This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart. + + + true + Whether sort threads based on latest message in that thread + This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart. + + + 600 + Mail browser width + Default width of the mail browser window. + + + 400 + Mail browser height + Default height of the mail browser window. + + + false + Mail browser maximized + Default maximized state of the mail browser window. + + + 400 + "Folder Subscriptions" window height + Initial height of the "Folder Subscriptions" window. The value updates as the user resizes the window vertically. + -- cgit v1.2.3 From 9662ff3ef64b7e520dfbed40e3db9bd8c4b3f8a4 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 9 Nov 2010 23:37:40 +0100 Subject: Fix copy-pasted XML code --- data/org.gnome.evolution.mail.gschema.xml.in | 121 ++++++++++++++------------- 1 file changed, 63 insertions(+), 58 deletions(-) (limited to 'data') diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 7fe1b12b2e..4f618a5087 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -172,148 +172,153 @@ false - Show all message headers - Show all the headers when viewing a messages. + <_summary>Show all message headers + <_description>Show all the headers when viewing a messages. [] - List of custom headers and whether they are enabled. - This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is <header enabled> - set enabled if the header is to be displayed in the mail view. + <_summary>List of custom headers and whether they are enabled. + <_description>This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is <header enabled> - set enabled if the header is to be displayed in the mail view. false - Show photo of the sender - Show the photo of the sender in the message reading pane. + <_summary>Show photo of the sender + <_description>Show the photo of the sender in the message reading pane. true - Search for the sender photo in local address books - This option would help in improving the speed of fetching. + <_summary>Search for the sender photo in local address books + <_description>This option would help in improving the speed of fetching. [] - List of MIME types to check for Bonobo component viewers - If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content. + <_summary>List of MIME types to check for Bonobo component viewers + <_description>If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content. true - Mark as Seen after specified timeout - Mark as Seen after specified timeout. + <_summary>Mark as Seen after specified timeout + <_description>Mark as Seen after specified timeout. 1500 - Timeout for marking message as seen - Timeout for marking message as seen. + <_summary>Timeout for marking message as seen + <_description>Timeout for marking message as seen. false - Sender email-address column in the message list - Show the email-address of the sender in a separate column in the message list. + <_summary>Sender email-address column in the message list + <_description>Show the email-address of the sender in a separate column in the message list. false - Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view - Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view. + <_summary>Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view + <_description>Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view. false - Show deleted messages in the message-list - Show deleted messages (with a strike-through) in the message-list. + <_summary>Show deleted messages in the message-list + <_description>Show deleted messages (with a strike-through) in the message-list. true - Enable search folders - Enable search folders on startup. + <_summary>Enable search folders + <_description>Enable search folders on startup. false - Hides the per-folder preview and removes the selection - This key is read only once and reset to "false" after read. This unselects the mail in the list and removes the preview for that folder. + <_summary>Hides the per-folder preview and removes the selection + <_description>This key is read only once and reset to "false" after read. This unselects the mail in the list and removes the preview for that folder. 144 - Height of the message-list pane - Height of the message-list pane. + <_summary>Height of the message-list pane + <_description>Height of the message-list pane. 450 - Width of the message-list pane - Width of the message-list pane. + <_summary>Width of the message-list pane + <_description>Width of the message-list pane. 0 - Layout style - The layout style determines where to place the preview pane in relation to the message list. "0" (Classic View) places the preview pane below the message list. "1" (Vertical View) places the preview pane next to the message list. + <_summary>Layout style + <_description>The layout style determines where to place the preview pane in relation to the message list. "0" (Classic View) places the preview pane below the message list. "1" (Vertical View) places the preview pane next to the message list. 'Sans 12' - Variable width font - The variable width font for mail display. + <_summary>Variable width font + <_description>The variable width font for mail display. 'Monospace 12' - Terminal font - The terminal font for mail display. + <_summary>Terminal font + <_description>The terminal font for mail display. false - Use custom fonts - Use custom fonts for displaying mail. + <_summary>Use custom fonts + <_description>Use custom fonts for displaying mail. true - Compress display of addresses in TO/CC/BCC - Compress display of addresses in TO/CC/BCC to the number specified in address_count. + <_summary>Compress display of addresses in TO/CC/BCC + <_description>Compress display of addresses in TO/CC/BCC to the number specified in address_count. true - Display only message texts not exceeding certain size - Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key. + <_summary>Display only message texts not exceeding certain size + <_description>Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key. 4096 - Message text limit for display - This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated. + <_summary>Message text limit for display + <_description>This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated. 5 - Number of addresses to display in TO/CC/BCC - This sets the number of addresses to show in default message list view, beyond which a '...' is shown. + <_summary>Number of addresses to display in TO/CC/BCC + <_description>This sets the number of addresses to show in default message list view, beyond which a '...' is shown. false - Thread the message-list based on Subject - Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers. + <_summary>Thread the message-list based on Subject + <_description>Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers. true - Default value for thread expand state - This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart. + <_summary>Default value for thread expand state + <_description>This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart. true - Whether sort threads based on latest message in that thread - This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart. + <_summary>Whether sort threads based on latest message in that thread + <_description>This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart. 600 - Mail browser width - Default width of the mail browser window. + <_summary>Mail browser width + <_description>Default width of the mail browser window. 400 - Mail browser height - Default height of the mail browser window. + <_summary>Mail browser height + <_description>Default height of the mail browser window. false - Mail browser maximized - Default maximized state of the mail browser window. + <_summary>Mail browser maximized + <_description>Default maximized state of the mail browser window. 400 - "Folder Subscriptions" window height - Initial height of the "Folder Subscriptions" window. The value updates as the user resizes the window vertically. + <_summary>"Folder Subscriptions" window height + <_description>Initial height of the "Folder Subscriptions" window. The value updates as the user resizes the window vertically. + + + false + <_summary>"Folder Subscriptions" window maximize state + <_description>Initial maximize state of the "Folder Subscriptions" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Folder Subscriptions" window cannot be maximized. This key exists only as an implementation detail. -- cgit v1.2.3 From a0f84a5934124d37a1c176997eb3316850b16762 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 16 Nov 2010 10:35:13 +0100 Subject: Migrate all mail schemas to GSettings --- data/evolution.convert | 51 +++++- data/org.gnome.evolution.mail.gschema.xml.in | 245 +++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 94334786bb..643e5d68ee 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -96,7 +96,56 @@ mail-browser-width = /apps/evolution/mail/mail_browser_width mail-browser-height = /apps/evolution/mail/mail_browser_height mail-browser-maximized = /apps/evolution/mail/mail_browser_maximized subscription-editor-height = /apps/evolution/mail/subscription_editor_height -=================================================================================================================== +subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized +subscription-editor-width = /apps/evolution/mail/subscription_editor_width +filters-log-actions = /apps/evolution/mail/filters/log +filters-log-file = /apps/evolution/mail/filters/logfile +flush-outbox = /apps/evolution/mail/filters/flush-outbox +forward-style = /apps/evolution/mail/format/forward_style +reply-style = /apps/evolution/mail/format/reply_style +message-display-style = /apps/evolution/mail/format/message_display_style +prompt-on-empty-subject = /apps/evolution/mail/prompts/empty_subject +prompt-on-expunge = /apps/evolution/mail/prompts/expunge +prompt-on-only-bcc = /apps/evolution/mail/prompts/only_bcc +prompt-on-unwanted-html = /apps/evolution/mail/prompts/unwanted_html +prompt-on-open-many = /apps/evolution/mail/prompts/open_many +prompt-on-mark-all-read = /apps/evolution/mail/prompts/mark_all_read +prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder +prompt-on-private-list-reply = /apps/evolution/mail/prompts/private_list_reply +prompt-on-list-reply-to = /apps/evolution/mail/prompts/list_reply_to +prompt-on-reply-many-recips = /apps/evolution/mail/prompts/reply_many_recips +prompt-on-reply-close-browser = /apps/evolution/mail/prompts/reply_close_browser +trash-empty-on-exit = /apps/evolution/mail/trash/empty_on_exit +trash-empty-on-exit-days = /apps/evolution/mail/trash/empty_on_exit_days +trash-empty-date = /apps/evolution/mail/trash/empty_date +error-timeout = /apps/evolution/mail/display/error_timeout +error-level = /apps/evolution/mail/display/error_level +show-real-date = /apps/evolution/mail/display/show_real_date +labels = /apps/evolution/mail/labels +junk-check-incoming = /apps/evolution/mail/junk/check_incoming +junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit +junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days +junk-empty-date = /apps/evolution/mail/junk/empty_date +junk-default-plugin = /apps/evolution/mail/junk/default_plugin +junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only +junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon +junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook +junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only +junk-check-custom-header = /apps/evolution/mail/junk/check_custom_header +junk-custom-header = /apps/evolution/mail/junk/custom_header +default-account = /apps/evolution/mail/default_account +save-dir = /apps/evolution/mail/save_dir +composer-current-folder = /apps/evolution/mail/composer/current_folder +filter-editor-height = /apps/evolution/mail/filter_editor_height +filter-editor-maximized = /apps/evolution/mail/filter_editor_maximized +filter-editor-width = /apps/evolution/mail/filter_editor_width +send-recv-height = /apps/evolution/mail/send_recv_height +send-recv-maximized = /apps/evolution/mail/send_recv_maximized +send-recv-width = /apps/evolution/mail/send_recv_width +vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height +vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized +vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width +sync-interval = /apps/evolution/mail/sync_interval [org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 4f618a5087..c7735b2a12 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -320,5 +320,250 @@ <_summary>"Folder Subscriptions" window maximize state <_description>Initial maximize state of the "Folder Subscriptions" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Folder Subscriptions" window cannot be maximized. This key exists only as an implementation detail. + + 600 + <_summary>"Folder Subscriptions" window width + <_description>Initial width of the "Folder Subscriptions" window. The value updates as the user resizes the window horizontally. + + + false + <_summary>Log filter actions + <_description>Log filter actions to the specified log file. + + + '' + <_summary>Logfile to log filter actions + <_description>Logfile to log filter actions. + + + false + <_summary>Flush Outbox after filtering + <_description>Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation. + + + 0 + <_summary>Default forward style + <_description> + + + 0 + <_summary>Default forward style + <_description> + + + 0 + <_summary>Message-display style ("normal", "full headers", "source") + <_description> + + + true + <_summary>Prompt on empty subject + <_description>Prompt the user when he or she tries to send a message without a Subject. + + + true + <_summary>Prompt when user expunges + <_description>Prompt the user when he or she tries to expunge a folder. + + + true + <_summary>Prompt when user only fills Bcc + <_description>Prompt when user tries to send a message with no To or Cc recipients. + + + true + <_summary>Prompt when user tries to send unwanted HTML + <_description>Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail. + + + true + <_summary>Prompt when user tries to open 10 or more messages at once + <_description>If a user tries to open 10 or more messages at one time, ask the user if they really want to do it. + + + true + <_summary>Prompt while marking multiple messages + <_description>Enable or disable the prompt whilst marking multiple messages. + + + false + <_summary>Prompt when deleting messages in search folder + <_description>It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results. + + + true + <_summary>Prompt when replying privately to list messages + <_description>It disables/enables the repeated prompts to warn that you are sending a private reply to a message which arrived via a mailing list. + + + true + <_summary>Prompt when mailing list hijacks private replies + <_description>It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list + + + true + <_summary>Prompt when replying to many recipients + <_description>It disables/enables the repeated prompts to warn that you are sending a reply to many people. + + + 'ask' + <_summary>Asks whether to close the message window when the user forwards or replies to the message shown in the window + <_description>Possible values are: 'never' - to never close browser window, 'always' - to always close browser window or 'ask' - (or any other value) will ask user. + + + false + <_summary>Empty Trash folders on exit + <_description>Empty all Trash folders when exiting Evolution. + + + 0 + <_summary>Minimum days between emptying the trash on exit + <_description>Minimum time between emptying the trash on exit, in days. + + + 0 + <_summary>Last time Empty Trash was run + <_description>The last time Empty Trash was run, in days since January 1st, 1970 (Epoch). + + + 60 + <_summary>Amount of time in seconds the error should be shown on the status bar. + <_description>Amount of time in seconds the error should be shown on the status bar. + + + 0 + <_summary>Level beyond which the message should be logged. + <_description>This can have three possible values. "0" for errors. "1" for warnings. "2" for debug messages. + + + true + <_summary>Show original "Date" header value. + <_description>Show the original "Date" header (with a local time only if the time zone differs). Otherwise always show "Date" header value in a user preferred format and local time zone. + + + ['I_mportant:#EF2929','_Work:#F57900','_Personal:#4E9A06','_To Do:#3465A4','_Later:#75507B'] + <_summary>List of Labels and their associated colors + <_description>List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding. + + + true + <_summary>Check incoming mail being junk + <_description>Run junk test on incoming mail. + + + false + <_summary>Empty Junk folders on exit + <_description>Empty all Junk folders when exiting Evolution. + + + 0 + <_summary>Minimum days between emptying the junk on exit + <_description>Minimum time between emptying the junk on exit, in days. + + + 0 + <_summary>Last time Empty Junk was run + <_description>The last time Empty Junk was run, in days since January 1st, 1970 (Epoch). + + + 'Bogofilter' + <_summary>The default plugin for Junk hook + <_description>This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins. + + + true + <_summary>Use only local spam tests. + <_description>Use only the local spam tests (no DNS). + + + true + <_summary>Use SpamAssassin daemon and client + <_description>Use SpamAssassin daemon and client (spamc/spamd). + + + false + <_summary>Determines whether to lookup in address book for sender email + <_description>Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion. + + + false + <_summary>Determines whether to look up addresses for junk filtering in local address book only + <_description>This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering. + + + true + <_summary>Determines whether to use custom headers to check for junk + <_description>Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed. + + + ['X-Spam-Flag=YES','X-Spam-Level=*****'] + <_summary>Custom headers to use while checking for junk. + <_description>Custom headers to use while checking for junk. The list elements are string in the format "headername=value". + + + '' + <_summary>UID string of the default account. + <_description>UID string of the default account. + + + '' + <_summary>Save directory + <_description>Directory for saving mail component files. + + + '' + <_summary>Composer load/attach directory + <_description>Directory for loading/attaching files to composer. + + + 650 + <_summary>"Filter Editor" window height + <_description>Initial height of the "Filter Editor" window. The value updates as the user resizes the window vertically. + + + false + <_summary>"Filter Editor" window maximize state + <_description>Initial maximize state of the "Filter Editor" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Filter Editor" window cannot be maximized. This key exists only as an implementation detail. + + + 400 + <_summary>"Filter Editor" window width + <_description>Initial width of the "Filter Editor" window. The value updates as the user resizes the window horizontally. + + + 200 + <_summary>"Send and Receive Mail" window height + <_description>Initial height of the "Send and Receive Mail" window. The value updates as the user resizes the window vertically. + + + false + <_summary>"Send and Receive Mail" window maximize state + <_description>Initial maximize state of the "Send and Receive Mail" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Send and Receive Mail" window cannot be maximized. This key exists only as an implementation detail. + + + 600 + <_summary>"Send and Receive Mail" window width + <_description>Initial width of the "Send and Receive Mail" window. The value updates as the user resizes the window horizontally. + + + 650 + <_summary>"Search Folder Editor" window height + <_description>Initial height of the "Search Folder Editor" window. The value updates as the user resizes the window vertically. + + + false + <_summary>"Search Folder Editor" window maximize state + <_description>Initial maximize state of the "Search Folder Editor" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Search Folder Editor" window cannot be maximized. This key exists only as an implementation detail. + + + 400 + <_summary>"Search Folder Editor" window width + <_description>Initial width of the "Search Folder Editor" window. The value updates as the user resizes the window horizontally. + + + 600 + <_summary>Server synchronization interval + <_description>Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds. + -- cgit v1.2.3 From c55d5a308e798b7e24d10828cd54302e0698611f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 Apr 2011 10:16:32 -0400 Subject: Bug 646384 - Updated App Icon --- data/icons/Makefile.am | 23 +- data/icons/hicolor_apps_16x16_evolution.png | Bin 769 -> 919 bytes data/icons/hicolor_apps_22x22_evolution.png | Bin 1132 -> 1279 bytes data/icons/hicolor_apps_24x24_evolution.png | Bin 1139 -> 1343 bytes data/icons/hicolor_apps_256x256_evolution.png | Bin 0 -> 40876 bytes data/icons/hicolor_apps_32x32_evolution.png | Bin 2109 -> 2295 bytes data/icons/hicolor_apps_48x48_evolution.png | Bin 3680 -> 3875 bytes data/icons/hicolor_apps_scalable_evolution.svg | 4111 ++++++++++++++++++++---- 8 files changed, 3519 insertions(+), 615 deletions(-) create mode 100644 data/icons/hicolor_apps_256x256_evolution.png (limited to 'data') diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index caf61d344f..45c03aa6de 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -21,9 +21,18 @@ public_icons = \ hicolor_apps_48x48_evolution-mail.png \ hicolor_apps_48x48_evolution-memos.png \ hicolor_apps_48x48_evolution-tasks.png \ - hicolor_apps_scalable_evolution.svg \ + hicolor_apps_256x256_evolution.png \ $(NULL) +# hicolor_status_16x16_wrapped.png was copied from Firefox +# (toolkit/themes/gnomestripe/global/icons/wrap.png), which +# contained the following notice: +# +# All files in this directory are assumed to be licensed under the +# tri-license (MPL/GPL/LGPL) used throughout this codebase. +# +# There is no corresponding SVG file. */ + private_icons = \ hicolor_apps_16x16_contact-editor.png \ hicolor_apps_16x16_im-aim.png \ @@ -192,16 +201,10 @@ stock_private_icons = \ hicolor_status_48x48_stock_signature.png \ $(NULL) -# hicolor_status_16x16_wrapped.png was copied from Firefox -# (toolkit/themes/gnomestripe/global/icons/wrap.png), which -# contained the following notice: -# -# All files in this directory are assumed to be licensed under the -# tri-license (MPL/GPL/LGPL) used throughout this codebase. -# -# There is no corresponding SVG file. */ - +# These are source files for future editing +# and are not meant to be installed as icons. noinst_DATA = \ + hicolor_apps_scalable_evolution.svg \ hicolor_actions_16x16_go-today.svg \ hicolor_actions_16x16_view-calendar-day.svg \ hicolor_actions_16x16_view-calendar-list.svg \ diff --git a/data/icons/hicolor_apps_16x16_evolution.png b/data/icons/hicolor_apps_16x16_evolution.png index 0d1ad3496e..7691d5880d 100644 Binary files a/data/icons/hicolor_apps_16x16_evolution.png and b/data/icons/hicolor_apps_16x16_evolution.png differ diff --git a/data/icons/hicolor_apps_22x22_evolution.png b/data/icons/hicolor_apps_22x22_evolution.png index d069ad9c6f..765851d210 100644 Binary files a/data/icons/hicolor_apps_22x22_evolution.png and b/data/icons/hicolor_apps_22x22_evolution.png differ diff --git a/data/icons/hicolor_apps_24x24_evolution.png b/data/icons/hicolor_apps_24x24_evolution.png index 92c2605f91..b1b5438ed3 100644 Binary files a/data/icons/hicolor_apps_24x24_evolution.png and b/data/icons/hicolor_apps_24x24_evolution.png differ diff --git a/data/icons/hicolor_apps_256x256_evolution.png b/data/icons/hicolor_apps_256x256_evolution.png new file mode 100644 index 0000000000..b3031b384d Binary files /dev/null and b/data/icons/hicolor_apps_256x256_evolution.png differ diff --git a/data/icons/hicolor_apps_32x32_evolution.png b/data/icons/hicolor_apps_32x32_evolution.png index a24c73d629..33e7c43d9a 100644 Binary files a/data/icons/hicolor_apps_32x32_evolution.png and b/data/icons/hicolor_apps_32x32_evolution.png differ diff --git a/data/icons/hicolor_apps_48x48_evolution.png b/data/icons/hicolor_apps_48x48_evolution.png index e492c8b9cc..e1403634b2 100644 Binary files a/data/icons/hicolor_apps_48x48_evolution.png and b/data/icons/hicolor_apps_48x48_evolution.png differ diff --git a/data/icons/hicolor_apps_scalable_evolution.svg b/data/icons/hicolor_apps_scalable_evolution.svg index d44c9b319a..6cba2c12e4 100644 --- a/data/icons/hicolor_apps_scalable_evolution.svg +++ b/data/icons/hicolor_apps_scalable_evolution.svg @@ -1,615 +1,3516 @@ - + + - - - image/svg+xml - - Evolution 2.2 Logo - - - Jakub Steiner - - - - - Andreas Nilsson - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + inkscape:version="0.46+devel" + sodipodi:docname="evolution.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + style="enable-background:new"> + + + + Evolution + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Evolution + + + evolution + mail + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 51c8d2ed98184853c6651d07ca489e8733c71c7f Mon Sep 17 00:00:00 2001 From: Alban Crequy Date: Tue, 19 Apr 2011 15:09:55 +0100 Subject: evolution-alarm-notify: replace Moblin by Meego evolution-alarm-notify didn't start correctly on Meego Netbook. This patch fixes the problem by replacing "Moblin" by the new Meego strings. https://bugs.meego.com/show_bug.cgi?id=14683 --- data/evolution-alarm-notify.desktop.in.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/evolution-alarm-notify.desktop.in.in b/data/evolution-alarm-notify.desktop.in.in index 4f382a4a36..cb09268006 100644 --- a/data/evolution-alarm-notify.desktop.in.in +++ b/data/evolution-alarm-notify.desktop.in.in @@ -7,8 +7,8 @@ Exec=@PRIVLIBEXECDIR@/evolution-alarm-notify Terminal=false Type=Application Categories= -OnlyShowIn=GNOME;XFCE;MOBLIN; -X-Moblin-Priority=Low +OnlyShowIn=GNOME;XFCE;X-MEEGO-NB; +X-Meego-Priority=Low X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=evolution X-GNOME-Bugzilla-Component=calendar -- cgit v1.2.3 From cabf0e563627d5765a459da23b79bdb09b2c1284 Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Wed, 13 Jul 2011 15:49:25 +0200 Subject: Add more categories to settings desktop file. https://bugzilla.gnome.org/show_bug.cgi?id=654525 --- data/evolution-settings.desktop.in.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/evolution-settings.desktop.in.in b/data/evolution-settings.desktop.in.in index 20b22a252f..9f9103904b 100644 --- a/data/evolution-settings.desktop.in.in +++ b/data/evolution-settings.desktop.in.in @@ -5,6 +5,6 @@ Exec=evolution-settings Icon=evolution Terminal=false Type=Application -Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Network; OnlyShowIn=GNOME; StartupNotify=true -- cgit v1.2.3 From 0886cc544f0616f90383d4d51709a45da42dea37 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 14 Sep 2011 16:40:30 +0200 Subject: Port event/task/meeting editor to GSettings --- data/evolution.convert | 6 +++++ data/org.gnome.evolution.calendar.gschema.xml.in | 30 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 643e5d68ee..ad6c946579 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -32,6 +32,12 @@ vpane-position = /apps/evolution/addressbook/display/vpane_position show-preview = /apps/evolution/addressbook/display/show_preview [org.gnome.evolution.calendar] +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 [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 3cd7f77435..c10a1000cf 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -1,4 +1,34 @@ + + false + <_summary>Show categories field in the event/meeting/task editor + <_description>Whether to show categories field in the event/meeting editor + + + true + <_summary>Show Role field in the event/task/meeting editor + <_description>Whether to show role field in the event/task/meeting editor + + + false + <_summary>Show RSVP field in the event/task/meeting editor + <_description>Whether to show RSVP field in the event/task/meeting editor + + + false + <_summary>Show status field in the event/task/meeting editor + <_description>Whether to show status field in the event/task/meeting editor + + + false + <_summary>Show timezone field in the event/meeting editor + <_description>Whether to show timezone field in the event/meeting editor + + + false + <_summary>Show type field in the event/task/meeting editor + <_description>Whether to show type field in the event/task/meeting editor + -- cgit v1.2.3 From 035eda3f14857100bbf53b70173442ed5b929b19 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 15 Sep 2011 11:24:25 +0200 Subject: Port alarm-notify configuration to GSettings --- data/evolution.convert | 6 +++++ data/org.gnome.evolution.calendar.gschema.xml.in | 30 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index ad6c946579..45954be817 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -38,6 +38,12 @@ 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 +last-notification-time = /apps/evolution/calendar/notify/last_notification_time +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 [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 c10a1000cf..9c0050f8f2 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -31,4 +31,34 @@ <_summary>Show type field in the event/task/meeting editor <_description>Whether to show type field in the event/task/meeting editor + + 1 + <_summary>Last reminder time + <_description>Time the last reminder ran, in time_t + + + [] + <_summary>Reminder programs + <_description>Programs that are allowed to be run by reminders + + + false + <_summary>Show display reminders in notification tray + <_description>Whether or not to use the notification tray for display reminders + + + 'UTC' + <_summary>Timezone + <_description>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York" + + + false + <_summary>Twenty four hour time format + <_description>Whether to show times in twenty four hour format instead of using am/pm + + + true + <_summary>Use system timezone + <_description>Use the system timezone instead of the timezone selected in Evolution + -- cgit v1.2.3 From f304d1898d61e431738154c7f09cab901936e647 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 15 Sep 2011 13:47:06 +0200 Subject: Port most settings in calendar-config.c to GSettings --- data/evolution.convert | 9 +++++ data/org.gnome.evolution.calendar.gschema.xml.in | 45 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+) (limited to 'data') 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 @@ + + '' + <_summary>Save directory for reminder audio + <_description>Directory for saving reminder audio files + + + '' + <_summary>The second timezone for a Day View + <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key + + + [] + <_summary>Recently used second time zones in a Day View + <_description>List of recently used second time zones in a Day View + + + 5 + <_summary>Maximum number of recently used timezones to remember + <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list + false <_summary>Show categories field in the event/meeting/task editor @@ -31,11 +51,31 @@ <_summary>Show type field in the event/task/meeting editor <_description>Whether to show type field in the event/task/meeting editor + + false + <_summary>Hide completed tasks + <_description>Whether to hide completed tasks in the tasks view + + + 'days' + <_summary>Hide task units + <_description>Units for determining when to hide tasks, "minutes", "hours" or "days" + + + 1 + <_summary>Hide task value + <_description>Number of units for determining when to hide tasks + 1 <_summary>Last reminder time <_description>Time the last reminder ran, in time_t + + true + <_summary>Scroll Month View by a week + <_description>Whether to scroll a Month View by a week, not by a month + [] <_summary>Reminder programs @@ -61,4 +101,9 @@ <_summary>Use system timezone <_description>Use the system timezone instead of the timezone selected in Evolution + + 62 + <_summary>Work days + <_description>Days on which the start and end of work hours should be indicated + -- cgit v1.2.3 From 5329da73063f6f18171d25a8df00607ae9b6be3d Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 15 Sep 2011 13:59:00 +0200 Subject: Fix typo in GSettings key --- data/evolution.convert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 874453aac7..bfea9dcc66 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -32,7 +32,7 @@ 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 +audio-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 -- cgit v1.2.3 From 5226e534df877dcb10b8f5cbb581764bb679593c Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 16:30:48 +0200 Subject: Port e-memo-shell-view-actions.c to use GSettings --- data/evolution.convert | 2 ++ data/org.gnome.evolution.calendar.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index bfea9dcc66..099b200f7e 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -46,9 +46,11 @@ 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 +memo-layout = /apps/evolution/calendar/display/memo_layout 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 +show-memo-preview = /apps/evolution/calendar/display/show_memo_preview 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 diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 70a13b94d2..df27b45f02 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -71,6 +71,11 @@ <_summary>Last reminder time <_description>Time the last reminder ran, in time_t + + 0 + <_summary>Memo layout style + <_description>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 + true <_summary>Scroll Month View by a week @@ -86,6 +91,11 @@ <_summary>Show display reminders in notification tray <_description>Whether or not to use the notification tray for display reminders + + true + <_summary>Show the memo preview pane + <_description>If "true", show the memo preview pane in the main window + 'UTC' <_summary>Timezone -- cgit v1.2.3 From 67c036a33910d51e2703bb86840fd8729decf4b1 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 16:36:08 +0200 Subject: Port calendar sidebar to use GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.calendar.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 099b200f7e..657d743abd 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -33,6 +33,7 @@ show-preview = /apps/evolution/addressbook/display/show_preview [org.gnome.evolution.calendar] audio-dir = /apps/evolution/calendar/audio_dir +date-navigator-pane-position = /apps/evolution/calendar/display/date_navigator_pane_position 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 diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index df27b45f02..39285fc7f9 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -6,6 +6,11 @@ <_summary>Save directory for reminder audio <_description>Directory for saving reminder audio files + + 150 + <_summary>Month view vertical pane position + <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar + '' <_summary>The second timezone for a Day View -- cgit v1.2.3 From b9a43c056c67bc343748fbd7c1b5385a6457014a Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 17:04:46 +0200 Subject: Port ECalShellBackend to GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.calendar.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 657d743abd..83f5efccc5 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -51,6 +51,7 @@ memo-layout = /apps/evolution/calendar/display/memo_layout 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 +selected-calendars = /apps/evolution/calendar/display/selected_calendars show-memo-preview = /apps/evolution/calendar/display/show_memo_preview timezone = /apps/evolution/calendar/display/timezone use-24hour-format = /apps/evolution/calendar/display/use_24hour_format diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 39285fc7f9..9525066123 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -96,6 +96,11 @@ <_summary>Show display reminders in notification tray <_description>Whether or not to use the notification tray for display reminders + + [] + <_summary>List of selected calendars + <_description>List of calendars to load + true <_summary>Show the memo preview pane -- cgit v1.2.3 From d757ba352a135a81cfb2e638b25d66998dbe1eb9 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 17:15:07 +0200 Subject: Port EMemoShellBackend to GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.calendar.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 83f5efccc5..f2289ed14a 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -52,6 +52,7 @@ 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 selected-calendars = /apps/evolution/calendar/display/selected_calendars +selected-memos = /apps/evolution/calendar/memos/selected_memos show-memo-preview = /apps/evolution/calendar/display/show_memo_preview timezone = /apps/evolution/calendar/display/timezone use-24hour-format = /apps/evolution/calendar/display/use_24hour_format diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 9525066123..48fa505e06 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -101,6 +101,11 @@ <_summary>List of selected calendars <_description>List of calendars to load + + [] + <_summary>List of selected memos + <_description>List of memos to load + true <_summary>Show the memo preview pane -- cgit v1.2.3 From 6e7cb87f8783dfca7af2ec40b669344adf77f79f Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 17:21:35 +0200 Subject: Port e-task-shell-view-actions to GSettings --- data/evolution.convert | 2 ++ data/org.gnome.evolution.calendar.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index f2289ed14a..823125288a 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -54,6 +54,8 @@ notify-with-tray = /apps/evolution/calendar/notify/notify_with_tray selected-calendars = /apps/evolution/calendar/display/selected_calendars selected-memos = /apps/evolution/calendar/memos/selected_memos show-memo-preview = /apps/evolution/calendar/display/show_memo_preview +show-task-preview = /apps/evolution/calendar/display/show_task_preview +task-layout = /apps/evolution/calendar/display/task_layout 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 diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 48fa505e06..534ec5f99c 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -111,6 +111,16 @@ <_summary>Show the memo preview pane <_description>If "true", show the memo preview pane in the main window + + true + <_summary>Show the task preview pane + <_description>If "true", show the task preview pane in the main window + + + 0 + <_summary>Task layout style + <_description>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 + 'UTC' <_summary>Timezone -- cgit v1.2.3 From c27e999441069bf9b2a5994e9bde6313e9839cb0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 17:28:22 +0200 Subject: Port ETaskShellBackend to GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.calendar.gschema.xml.in | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 823125288a..e9922d051f 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -53,6 +53,7 @@ notify-programs = /apps/evolution/calendar/notify/programs notify-with-tray = /apps/evolution/calendar/notify/notify_with_tray selected-calendars = /apps/evolution/calendar/display/selected_calendars selected-memos = /apps/evolution/calendar/memos/selected_memos +selected-tasks = /apps/evolution/calendar/tasks/selected_tasks show-memo-preview = /apps/evolution/calendar/display/show_memo_preview show-task-preview = /apps/evolution/calendar/display/show_task_preview task-layout = /apps/evolution/calendar/display/task_layout diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 534ec5f99c..7fb0511325 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -103,8 +103,13 @@ [] - <_summary>List of selected memos - <_description>List of memos to load + <_summary>List of selected memo lists + <_description>List of memo lists to load + + + [] + <_summary>List of selected task lists + <_description>List of task lists to load true -- cgit v1.2.3 From 8732431bd961e7f75e813803575a868bada78c79 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 18:16:23 +0200 Subject: Port ETask/MemoShellContent to GSettings --- data/evolution.convert | 4 ++++ data/org.gnome.evolution.calendar.gschema.xml.in | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index e9922d051f..21b71cb58c 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -47,7 +47,9 @@ 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 +memo-hpane-position = /apps/evolution/calendar/display/memo_hpane_position memo-layout = /apps/evolution/calendar/display/memo_layout +memo-vpane-position = /apps/evolution/calendar/display/memo_vpane_position 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 @@ -56,6 +58,8 @@ selected-memos = /apps/evolution/calendar/memos/selected_memos selected-tasks = /apps/evolution/calendar/tasks/selected_tasks show-memo-preview = /apps/evolution/calendar/display/show_memo_preview show-task-preview = /apps/evolution/calendar/display/show_task_preview +task-hpane-position = /apps/evolution/calendar/display/task_hpane_position +task-vpane-position = /apps/evolution/calendar/display/task_vpane_position task-layout = /apps/evolution/calendar/display/task_layout timezone = /apps/evolution/calendar/display/timezone use-24hour-format = /apps/evolution/calendar/display/use_24hour_format diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 7fb0511325..12e091cd12 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -76,11 +76,21 @@ <_summary>Last reminder time <_description>Time the last reminder ran, in time_t + + 200 + <_summary>Memo preview pane position (horizontal) + <_description>Position of the task preview pane when oriented horizontally + 0 <_summary>Memo layout style <_description>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 + + 400 + <_summary>Memo preview pane position (vertical) + <_description>Position of the memo preview pane when oriented vertically + true <_summary>Scroll Month View by a week @@ -121,11 +131,21 @@ <_summary>Show the task preview pane <_description>If "true", show the task preview pane in the main window + + 200 + <_summary>Task preview pane position (horizontal) + <_description>Position of the task preview pane when oriented horizontally + 0 <_summary>Task layout style <_description>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 + + 400 + <_summary>Task preview pane position (vertical) + <_description>Position of the task preview pane when oriented vertically + 'UTC' <_summary>Timezone -- cgit v1.2.3 From 1f10f3ec681c3ed755ce4e02a4ca0117b9243b2b Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Oct 2011 16:14:10 +0200 Subject: Use correct path for GSettings schemas --- data/org.gnome.evolution.addressbook.gschema.xml.in | 2 +- data/org.gnome.evolution.calendar.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in | 2 +- data/org.gnome.evolution.eplugin.templates.gschema.xml.in | 2 +- data/org.gnome.evolution.gschema.xml.in | 6 +++--- data/org.gnome.evolution.mail.gschema.xml.in | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/org.gnome.evolution.addressbook.gschema.xml.in b/data/org.gnome.evolution.addressbook.gschema.xml.in index 536841eee4..f4f1a556c7 100644 --- a/data/org.gnome.evolution.addressbook.gschema.xml.in +++ b/data/org.gnome.evolution.addressbook.gschema.xml.in @@ -1,5 +1,5 @@ - + 3 <_summary>Autocomplete length diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 12e091cd12..706c0bf5ac 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -1,5 +1,5 @@ - + '' diff --git a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in index 7a4eb02e93..71fa2afaa7 100644 --- a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in @@ -1,5 +1,5 @@ - + ['attachment','attaching','attached','enclosed'] <_summary>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 index 15db0a8956..84ad60a66c 100644 --- a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in @@ -1,5 +1,5 @@ - + true <_summary>Convert mail messages to Unicode 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 index ac58441856..a82c18170d 100644 --- a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in @@ -1,5 +1,5 @@ - + ['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret'] <_summary>List of Custom Headers diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in index 993734349d..114cfd3990 100644 --- a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in @@ -1,5 +1,5 @@ - + 'gedit' <_summary>Default External Editor diff --git a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in index 83e8630451..a5430b7fdd 100644 --- a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in @@ -1,5 +1,5 @@ - + false <_summary>Insert Face picture by default diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in index 26dd1e2ae8..d70313e25c 100644 --- a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in @@ -1,5 +1,5 @@ - + true <_summary>Notify new messages for Inbox only. diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in index 7628c743b3..5fe07aab07 100644 --- a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in @@ -1,5 +1,5 @@ - + ['myphone=012345','myplace=Abcd','myname=Alice'] <_summary>List of keyword/value pairs for the Templates plugin to substitute in a message body. diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in index ab1316289d..ee7905b6b2 100644 --- a/data/org.gnome.evolution.gschema.xml.in +++ b/data/org.gnome.evolution.gschema.xml.in @@ -1,6 +1,5 @@ - - + '' <_summary>Configuration version @@ -11,8 +10,9 @@ <_summary>Last upgraded configuration version <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + - + false <_summary>Skip development warning dialog diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index c7735b2a12..868021c1cd 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -1,5 +1,5 @@ - + true <_summary>Check whether Evolution is the default mailer -- cgit v1.2.3 From 8fd93c9042bb30e53ce88303f8a0789a6ca688eb Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Oct 2011 18:19:33 +0200 Subject: First successful build --- data/Makefile.am | 1 + data/org.gnome.evolution.calendar.gschema.xml.in | 330 +++++++++++------------ data/org.gnome.evolution.gschema.xml.in | 93 ------- data/org.gnome.evolution.shell.gschema.xml.in | 94 +++++++ 4 files changed, 260 insertions(+), 258 deletions(-) create mode 100644 data/org.gnome.evolution.shell.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index c7f73e4744..17b32acc1e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -15,6 +15,7 @@ gsettings_SCHEMAS = \ org.gnome.evolution.addressbook.gschema.xml \ org.gnome.evolution.calendar.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ + org.gnome.evolution.shell.gschema.xml.in \ 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 \ diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 706c0bf5ac..6915a0c2aa 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -1,169 +1,169 @@ + + '' + <_summary>Save directory for reminder audio + <_description>Directory for saving reminder audio files + + + 150 + <_summary>Month view vertical pane position + <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar + + + '' + <_summary>The second timezone for a Day View + <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key + + + [] + <_summary>Recently used second time zones in a Day View + <_description>List of recently used second time zones in a Day View + + + 5 + <_summary>Maximum number of recently used timezones to remember + <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list + + + false + <_summary>Show categories field in the event/meeting/task editor + <_description>Whether to show categories field in the event/meeting editor + + + true + <_summary>Show Role field in the event/task/meeting editor + <_description>Whether to show role field in the event/task/meeting editor + + + false + <_summary>Show RSVP field in the event/task/meeting editor + <_description>Whether to show RSVP field in the event/task/meeting editor + + + false + <_summary>Show status field in the event/task/meeting editor + <_description>Whether to show status field in the event/task/meeting editor + + + false + <_summary>Show timezone field in the event/meeting editor + <_description>Whether to show timezone field in the event/meeting editor + + + false + <_summary>Show type field in the event/task/meeting editor + <_description>Whether to show type field in the event/task/meeting editor + + + false + <_summary>Hide completed tasks + <_description>Whether to hide completed tasks in the tasks view + + + 'days' + <_summary>Hide task units + <_description>Units for determining when to hide tasks, "minutes", "hours" or "days" + + + 1 + <_summary>Hide task value + <_description>Number of units for determining when to hide tasks + + + 1 + <_summary>Last reminder time + <_description>Time the last reminder ran, in time_t + + + 200 + <_summary>Memo preview pane position (horizontal) + <_description>Position of the task preview pane when oriented horizontally + + + 0 + <_summary>Memo layout style + <_description>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 + + + 400 + <_summary>Memo preview pane position (vertical) + <_description>Position of the memo preview pane when oriented vertically + + + true + <_summary>Scroll Month View by a week, not by a month + <_description>Whether to scroll a Month View by a week, not by a month + + + [] + <_summary>Reminder programs + <_description>Programs that are allowed to be run by reminders + + + false + <_summary>Show display reminders in notification tray + <_description>Whether or not to use the notification tray for display reminders + + + [] + <_summary>List of selected calendars + <_description>List of calendars to load + + + [] + <_summary>List of selected memo lists + <_description>List of memo lists to load + + + [] + <_summary>List of selected task lists + <_description>List of task lists to load + + + true + <_summary>Show the memo preview pane + <_description>If "true", show the memo preview pane in the main window + + + true + <_summary>Show the task preview pane + <_description>If "true", show the task preview pane in the main window + + + 200 + <_summary>Task preview pane position (horizontal) + <_description>Position of the task preview pane when oriented horizontally + + + 0 + <_summary>Task layout style + <_description>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 + + + 400 + <_summary>Task preview pane position (vertical) + <_description>Position of the task preview pane when oriented vertically + + + 'UTC' + <_summary>Timezone + <_description>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York" + + + false + <_summary>Twenty four hour time format + <_description>Whether to show times in twenty four hour format instead of using am/pm + + + true + <_summary>Use system timezone + <_description>Use the system timezone instead of the timezone selected in Evolution + + + 62 + <_summary>Work days + <_description>Days on which the start and end of work hours should be indicated + - - '' - <_summary>Save directory for reminder audio - <_description>Directory for saving reminder audio files - - - 150 - <_summary>Month view vertical pane position - <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar - - - '' - <_summary>The second timezone for a Day View - <_description>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key - - - [] - <_summary>Recently used second time zones in a Day View - <_description>List of recently used second time zones in a Day View - - - 5 - <_summary>Maximum number of recently used timezones to remember - <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list - - - false - <_summary>Show categories field in the event/meeting/task editor - <_description>Whether to show categories field in the event/meeting editor - - - true - <_summary>Show Role field in the event/task/meeting editor - <_description>Whether to show role field in the event/task/meeting editor - - - false - <_summary>Show RSVP field in the event/task/meeting editor - <_description>Whether to show RSVP field in the event/task/meeting editor - - - false - <_summary>Show status field in the event/task/meeting editor - <_description>Whether to show status field in the event/task/meeting editor - - - false - <_summary>Show timezone field in the event/meeting editor - <_description>Whether to show timezone field in the event/meeting editor - - - false - <_summary>Show type field in the event/task/meeting editor - <_description>Whether to show type field in the event/task/meeting editor - - - false - <_summary>Hide completed tasks - <_description>Whether to hide completed tasks in the tasks view - - - 'days' - <_summary>Hide task units - <_description>Units for determining when to hide tasks, "minutes", "hours" or "days" - - - 1 - <_summary>Hide task value - <_description>Number of units for determining when to hide tasks - - - 1 - <_summary>Last reminder time - <_description>Time the last reminder ran, in time_t - - - 200 - <_summary>Memo preview pane position (horizontal) - <_description>Position of the task preview pane when oriented horizontally - - - 0 - <_summary>Memo layout style - <_description>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 - - - 400 - <_summary>Memo preview pane position (vertical) - <_description>Position of the memo preview pane when oriented vertically - - - true - <_summary>Scroll Month View by a week - <_description>Whether to scroll a Month View by a week, not by a month - - - [] - <_summary>Reminder programs - <_description>Programs that are allowed to be run by reminders - - - false - <_summary>Show display reminders in notification tray - <_description>Whether or not to use the notification tray for display reminders - - - [] - <_summary>List of selected calendars - <_description>List of calendars to load - - - [] - <_summary>List of selected memo lists - <_description>List of memo lists to load - - - [] - <_summary>List of selected task lists - <_description>List of task lists to load - - - true - <_summary>Show the memo preview pane - <_description>If "true", show the memo preview pane in the main window - - - true - <_summary>Show the task preview pane - <_description>If "true", show the task preview pane in the main window - - - 200 - <_summary>Task preview pane position (horizontal) - <_description>Position of the task preview pane when oriented horizontally - - - 0 - <_summary>Task layout style - <_description>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 - - - 400 - <_summary>Task preview pane position (vertical) - <_description>Position of the task preview pane when oriented vertically - - - 'UTC' - <_summary>Timezone - <_description>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York" - - - false - <_summary>Twenty four hour time format - <_description>Whether to show times in twenty four hour format instead of using am/pm - - - true - <_summary>Use system timezone - <_description>Use the system timezone instead of the timezone selected in Evolution - - - 62 - <_summary>Work days - <_description>Days on which the start and end of work hours should be indicated - diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in index ee7905b6b2..6ae4388a5e 100644 --- a/data/org.gnome.evolution.gschema.xml.in +++ b/data/org.gnome.evolution.gschema.xml.in @@ -10,98 +10,5 @@ <_summary>Last upgraded configuration version <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - - - - - false - <_summary>Skip development warning dialog - <_description>Whether the warning dialog in development versions of Evolution is skipped. - - - 0 - <_summary>Initial attachment view - <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. - - - '' - <_summary>Initial file chooser folder - <_description>Initial folder for GtkFileChooser dialogs. - - - false - <_summary>Start in offline mode - <_description> Whether Evolution will start up in offline mode instead of online mode. - - - [] - <_summary>Offline folder paths - <_description>List of paths for the folders to be synchronized to disk for offline usage. - - - false - <_summary>Enable express mode - <_description>Flag that enables a much simplified user interface. - - - - <_summary>Default window Y coordinate - <_description>The default Y coordinate for the main window. - - - - <_summary>Default window X coordinate - <_description>The default X coordinate for the main window. - - - 640 - <_summary>Default window width - <_description>The default width for the main window, in pixels. - - - 480 - <_summary>Default window height - <_description>The default height for the main window, in pixels. - - - true - <_summary>Default window state - <_description>Whether or not the window should be maximized. - - - true - <_summary>Window buttons are visible - <_description>Whether the window buttons should be visible. - - - toolbar - <_summary>Window button style - <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. - - - true - <_summary>Toolbar is visible - <_description>Whether the toolbar should be visible. - - - true - <_summary>Sidebar is visible - <_description>Whether the sidebar should be visible. - - - TRUE - <_summary>Statusbar is visible - <_description>Whether the status bar should be visible. - - - mail - <_summary>ID or alias of the component to be shown by default at start-up. - <_description>ID or alias of the component to be shown by default at start-up. - - - 200 - <_summary>Default sidebar width - <_description>The default width for the sidebar, in pixels. - diff --git a/data/org.gnome.evolution.shell.gschema.xml.in b/data/org.gnome.evolution.shell.gschema.xml.in new file mode 100644 index 0000000000..d2fd7439cb --- /dev/null +++ b/data/org.gnome.evolution.shell.gschema.xml.in @@ -0,0 +1,94 @@ + + + + false + <_summary>Skip development warning dialog + <_description>Whether the warning dialog in development versions of Evolution is skipped. + + + 0 + <_summary>Initial attachment view + <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. + + + '' + <_summary>Initial file chooser folder + <_description>Initial folder for GtkFileChooser dialogs. + + + false + <_summary>Start in offline mode + <_description> Whether Evolution will start up in offline mode instead of online mode. + + + [] + <_summary>Offline folder paths + <_description>List of paths for the folders to be synchronized to disk for offline usage. + + + false + <_summary>Enable express mode + <_description>Flag that enables a much simplified user interface. + + + + <_summary>Default window Y coordinate + <_description>The default Y coordinate for the main window. + + + + <_summary>Default window X coordinate + <_description>The default X coordinate for the main window. + + + 640 + <_summary>Default window width + <_description>The default width for the main window, in pixels. + + + 480 + <_summary>Default window height + <_description>The default height for the main window, in pixels. + + + true + <_summary>Default window state + <_description>Whether or not the window should be maximized. + + + true + <_summary>Window buttons are visible + <_description>Whether the window buttons should be visible. + + + toolbar + <_summary>Window button style + <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. + + + true + <_summary>Toolbar is visible + <_description>Whether the toolbar should be visible. + + + true + <_summary>Sidebar is visible + <_description>Whether the sidebar should be visible. + + + TRUE + <_summary>Statusbar is visible + <_description>Whether the status bar should be visible. + + + mail + <_summary>ID or alias of the component to be shown by default at start-up. + <_description>ID or alias of the component to be shown by default at start-up. + + + 200 + <_summary>Default sidebar width + <_description>The default width for the sidebar, in pixels. + + + -- cgit v1.2.3 From 2f62d91630f58325820712e9c21439b7fae055ce Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 10 Oct 2011 17:13:18 +0200 Subject: Port calendar importer to GSettings --- data/Makefile.am | 1 + data/evolution.convert | 4 ++++ data/org.gnome.evolution.importer.gschema.xml.in | 14 ++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 data/org.gnome.evolution.importer.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 17b32acc1e..fb4c041c23 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,6 +14,7 @@ gsettings_SCHEMAS = \ org.gnome.evolution.gschema.xml \ org.gnome.evolution.addressbook.gschema.xml \ org.gnome.evolution.calendar.gschema.xml \ + org.gnome.evolution.importer.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ org.gnome.evolution.shell.gschema.xml.in \ org.gnome.evolution.eplugin.attachment-reminder.gschema.xml \ diff --git a/data/evolution.convert b/data/evolution.convert index 21b71cb58c..8bcec69f87 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -66,6 +66,10 @@ 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.importer] +gnome-calendar-done-calendar = /apps/evolution/importer/gnome-calendar/calendar +gnome-calendar-done-tasks = /apps/evolution/importer/gnome-calendar/tasks + [org.gnome.evolution.mail] check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault composer-charset = /apps/evolution/mail/composer/charset diff --git a/data/org.gnome.evolution.importer.gschema.xml.in b/data/org.gnome.evolution.importer.gschema.xml.in new file mode 100644 index 0000000000..83b3de78a2 --- /dev/null +++ b/data/org.gnome.evolution.importer.gschema.xml.in @@ -0,0 +1,14 @@ + + + + false + <_summary>Gnome Calendar's calendar import done + <_description>Whether calendar from Gnome Calendar has been imported or not + + + false + <_summary>Gnome Calendar's tasks import done + <_description>Whether tasks from Gnome Calendar have been imported or not + + + -- cgit v1.2.3 From b77871e4fd7a4464e3a2e4e458f0d10e71805a02 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 10 Oct 2011 18:11:01 +0200 Subject: Migrate ECalShellContent to GSettings --- data/evolution.convert | 3 +++ data/org.gnome.evolution.calendar.gschema.xml.in | 15 +++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 8bcec69f87..452ea39479 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -46,10 +46,12 @@ 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 +hpane-position = /apps/evolution/calendar/display/hpane_position last-notification-time = /apps/evolution/calendar/notify/last_notification_time memo-hpane-position = /apps/evolution/calendar/display/memo_hpane_position memo-layout = /apps/evolution/calendar/display/memo_layout memo-vpane-position = /apps/evolution/calendar/display/memo_vpane_position +month-hpane-position = /apps/evolution/calendar/display/month_hpane_position 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 @@ -58,6 +60,7 @@ selected-memos = /apps/evolution/calendar/memos/selected_memos selected-tasks = /apps/evolution/calendar/tasks/selected_tasks show-memo-preview = /apps/evolution/calendar/display/show_memo_preview show-task-preview = /apps/evolution/calendar/display/show_task_preview +tag-vpane-position = /apps/evolution/calendar/display/tag_vpane_position task-hpane-position = /apps/evolution/calendar/display/task_hpane_position task-vpane-position = /apps/evolution/calendar/display/task_vpane_position task-layout = /apps/evolution/calendar/display/task_layout diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index 6915a0c2aa..cc32a3c36d 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -70,6 +70,11 @@ <_summary>Hide task value <_description>Number of units for determining when to hide tasks + + 400 + <_summary>Horizontal pane position + <_description>Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels + 1 <_summary>Last reminder time @@ -90,6 +95,11 @@ <_summary>Memo preview pane position (vertical) <_description>Position of the memo preview pane when oriented vertically + + 32000 + <_summary>Month view horizontal pane position + <_description>Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels + true <_summary>Scroll Month View by a week, not by a month @@ -130,6 +140,11 @@ <_summary>Show the task preview pane <_description>If "true", show the task preview pane in the main window + + 0 + <_summary>Vertical position for the tag pane + <_description>Vertical position for the tag pane + 200 <_summary>Task preview pane position (horizontal) -- cgit v1.2.3 From a7fd5679e4bfa01dca4b2036c40118a6d3c21c4b Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 13:35:40 +0200 Subject: Fix typo in key name --- data/org.gnome.evolution.mail.gschema.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 868021c1cd..c1352bece7 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -190,7 +190,7 @@ <_summary>Search for the sender photo in local address books <_description>This option would help in improving the speed of fetching. - + [] <_summary>List of MIME types to check for Bonobo component viewers <_description>If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content. -- cgit v1.2.3 From 93f489a9a4bebc6b1f2331ba2aa5804669b41a9a Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 13:55:54 +0200 Subject: Port misc widgets to use GSettings --- data/org.gnome.evolution.mail.gschema.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index c1352bece7..c52c76c170 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -5,7 +5,7 @@ <_summary>Check whether Evolution is the default mailer <_description>Every time Evolution starts, check whether or not it is the default mailer. - + '' <_summary>Default charset in which to compose messages <_description>Default charset in which to compose messages. -- cgit v1.2.3 From b436b8468346c384edc6bde0f24b2ac0ce657e00 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 17:00:14 +0200 Subject: Migrate Contact Editor to GSettings --- data/evolution.convert | 27 +++++++++++----------- .../org.gnome.evolution.addressbook.gschema.xml.in | 5 ++++ 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 452ea39479..075a24a579 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -3,33 +3,34 @@ version = /apps/evolution/version last-upgraded-version = /apps/evolution/last_version [org.gnome.evolution.shell] -skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog attachment-view = /apps/evolution/shell/attachment_view +buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible +buttons-style = /apps/evolution/shell/view_defaults/buttons_style +default-component-id = /apps/evolution/shell/view_defaults/component_id +express-mode = /apps/evolution/shell/express_mode file-chooser-folder = /apps/evolution/shell/file_chooser_folder -start-offline = /apps/evolution/shell/start_offline +folder-bar-width = /apps/evolution/shell/view_defaults/folder_bar/width folder-paths = /apps/evolution/shell/offline/folder_paths -express-mode = /apps/evolution/shell/express_mode +sidebar-visible = /apps/evolution/shell/view_defaults/sidebar_visible +skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog +start-offline = /apps/evolution/shell/start_offline +statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible +toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible window-y = /apps/evolution/shell/view_defaults/window_y window-x = /apps/evolution/shell/view_defaults/window_x window-width = /apps/evolution/shell/view_defaults/window_width window-height = /apps/evolution/shell/view_defaults/window_height window-maximized = /apps/evolution/shell/view_defaults/window_maximized -buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible -buttons-style = /apps/evolution/shell/view_defaults/buttons_style -toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible -sidebar-visible = /apps/evolution/shell/view_defaults/sidebar_visible -statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible -default-component-id = /apps/evolution/shell/view_defaults/component_id -folder-bar-width = /apps/evolution/shell/view_defaults/folder_bar/width [org.gnome.evolution.addressbook] +address-formatting = /apps/evolution/addressbook/display/address_formatting completion-minimum-query-length = /apps/evolution/addressbook/completion/minimum_query_length completion-show-address = /apps/evolution/addressbook/completion/show_address -select-names-last-used-uri = /apps/evolution/addressbook/select_names/last_used_uri -layout = /apps/evolution/addressbook/display/layout hpane-position = /apps/evolution/addressbook/display/hpane_position -vpane-position = /apps/evolution/addressbook/display/vpane_position +layout = /apps/evolution/addressbook/display/layout +select-names-last-used-uri = /apps/evolution/addressbook/select_names/last_used_uri show-preview = /apps/evolution/addressbook/display/show_preview +vpane-position = /apps/evolution/addressbook/display/vpane_position [org.gnome.evolution.calendar] audio-dir = /apps/evolution/calendar/audio_dir diff --git a/data/org.gnome.evolution.addressbook.gschema.xml.in b/data/org.gnome.evolution.addressbook.gschema.xml.in index f4f1a556c7..11efc0c2af 100644 --- a/data/org.gnome.evolution.addressbook.gschema.xml.in +++ b/data/org.gnome.evolution.addressbook.gschema.xml.in @@ -1,5 +1,10 @@ + + false + <_summary>Enable address formatting + <_description>Whether addresses should be formatted according to standard in their destination country + 3 <_summary>Autocomplete length -- cgit v1.2.3 From 3dc5ac02b4acf762c22a2f1980facdd0d01d678e Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 14 Oct 2011 12:25:34 +0200 Subject: Migrate prefer-plain plugin to GSettings --- data/Makefile.am | 1 + data/evolution.convert | 4 ++++ ...org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in | 14 ++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index fb4c041c23..2a8b72a680 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,6 +23,7 @@ gsettings_SCHEMAS = \ 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.prefer-plain.gschema.xml.in \ org.gnome.evolution.eplugin.templates.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 075a24a579..cb4308d0a6 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -214,5 +214,9 @@ 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 +[org.gnome.evolution.eplugin.prefer-plain] +mode = /apps/evolution/eplugin/prefer_plain/mode" +show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed + [org.gnome.evolution.eplugin.templates] template-placeholders = /apps/evolution/mail/template_placeholders diff --git a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in new file mode 100644 index 0000000000..9d9b652be7 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in @@ -0,0 +1,14 @@ + + + + 'normal' + <_summary>Mode to use when displaying mails + <_description>The mode to use for displaying mails. "normal" makes Evolution choose the best part to show, "prefer_plain" makes it use the text part, if present, and "only_plain" forces Evolution to only show plain text + + + true + <_summary>Whether to show suppressed HTML output + <_description>Whether to show suppressed HTML output + + + -- cgit v1.2.3 From de38aaef11fe27ada765fb6d970dce55f00c77a2 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 14 Oct 2011 12:52:51 +0200 Subject: Migrate external editor plugin to GSettings --- data/evolution.convert | 152 ++++++++++----------- ...volution.eplugin.external-editor.gschema.xml.in | 4 +- 2 files changed, 78 insertions(+), 78 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index cb4308d0a6..4d9377de6f 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -75,8 +75,15 @@ gnome-calendar-done-calendar = /apps/evolution/importer/gnome-calendar/calendar gnome-calendar-done-tasks = /apps/evolution/importer/gnome-calendar/tasks [org.gnome.evolution.mail] +address-compress = /apps/evolution/mail/display/address_compress +address-count = /apps/evolution/mail/display/address_count +animate-images = /apps/evolution/mail/display/animate_images +caret-mode = /apps/evolution/mail/display/caret_mode +charset = /apps/evolution/mail/display/charset check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault +citation-colour = /apps/evolution/mail/display/citation_colour composer-charset = /apps/evolution/mail/composer/charset +composer-current-folder = /apps/evolution/mail/composer/current_folder composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling composer-magic-links = /apps/evolution/mail/composer/magic_links composer-magic-smileys = /apps/evolution/mail/composer/magic_smileys @@ -97,96 +104,89 @@ composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim composer-width = /apps/evolution/mail/composer/width composer-height = /apps/evolution/mail/composer/height composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to -show-animated-images = /apps/evolution/mail/display/animated_images -side-bar-search = /apps/evolution/mail/display/side_bar_search -no-folder-dots = /apps/evolution/mail/display/no_folder_dots -magic-spacebar = /apps/evolution/mail/display/magic_spacebar +default-account = /apps/evolution/mail/default_account +enable-vfolders = /apps/evolution/mail/display/enable_vfolders +error-level = /apps/evolution/mail/display/error_level +error-timeout = /apps/evolution/mail/display/error_timeout +filter-editor-height = /apps/evolution/mail/filter_editor_height +filter-editor-maximized = /apps/evolution/mail/filter_editor_maximized +filter-editor-width = /apps/evolution/mail/filter_editor_width +filters-log-actions = /apps/evolution/mail/filters/log +filters-log-file = /apps/evolution/mail/filters/logfile +flush-outbox = /apps/evolution/mail/filters/flush-outbox +force-message-limit = /apps/evolution/mail/display/force_message_limit +forward-style = /apps/evolution/mail/format/forward_style global-view-setting = /apps/evolution/mail/display/global_view_setting -mark-citations = /apps/evolution/mail/display/mark_citations -citation-colour = /apps/evolution/mail/display/citation_colour -caret-mode = /apps/evolution/mail/display/caret_mode -charset = /apps/evolution/mail/display/charset -load-http-images = /apps/evolution/mail/display/load_http_images -animate-images = /apps/evolution/mail/display/animate_images -shoe-all-headers = /apps/evolution/mail/display/show_all_headers headers = /apps/evolution/mail/display/headers -show-sender-photo = /apps/evolution/mail/display/sender_photo -photo-local = /apps/evolution/mail/display/photo_local -mime-types = /apps/evolution/mail/display/mime_types -mark-seen = /apps/evolution/mail/display/mark_seen -mark-seen-timeout = /apps/evolution/mail/display/mark_seen_timeout -show-email = /apps/evolution/mail/display/show_email -vertical-view-fonts = /apps/evolution/mail/display/vertical_view_fonts -show-deleted = /apps/evolution/mail/display/show_deleted -enable-vfolders = /apps/evolution/mail/display/enable_vfolders -safe-list = /apps/evolution/mail/display/safe_list -paned-size = /apps/evolution/mail/display/paned_size hpaned-size = /apps/evolution/mail/display/hpaned_size +junk-check-custom-header = /apps/evolution/mail/junk/check_custom_header +junk-check-incoming = /apps/evolution/mail/junk/check_incoming +junk-custom-header = /apps/evolution/mail/junk/custom_header +junk-default-plugin = /apps/evolution/mail/junk/default_plugin +junk-empty-date = /apps/evolution/mail/junk/empty_date +junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit +junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days +junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook +junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only +junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only +junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon +labels = /apps/evolution/mail/labels layout = /apps/evolution/mail/display/layout -variable-width-font = /apps/evolution/mail/display/fonts/variable -monospace-font = /apps/evolution/mail/display/fonts/monospace -use-custom-font = /apps/evolution/mail/display/fonts/use_custom -address-compress = /apps/evolution/mail/display/address_compress -force-message-limit = /apps/evolution/mail/display/force_message_limit -message-text-part-limit = /apps/evolution/mail/display/message_text_part_limit -address-count = /apps/evolution/mail/display/address_count -thread-subject = /apps/evolution/mail/display/thread_subject -thread-expand = /apps/evolution/mail/display/thread_expand -thread-latest = /apps/evolution/mail/display/thread_latest -mail-browser-width = /apps/evolution/mail/mail_browser_width +load-http-images = /apps/evolution/mail/display/load_http_images +magic-spacebar = /apps/evolution/mail/display/magic_spacebar mail-browser-height = /apps/evolution/mail/mail_browser_height mail-browser-maximized = /apps/evolution/mail/mail_browser_maximized -subscription-editor-height = /apps/evolution/mail/subscription_editor_height -subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized -subscription-editor-width = /apps/evolution/mail/subscription_editor_width -filters-log-actions = /apps/evolution/mail/filters/log -filters-log-file = /apps/evolution/mail/filters/logfile -flush-outbox = /apps/evolution/mail/filters/flush-outbox -forward-style = /apps/evolution/mail/format/forward_style -reply-style = /apps/evolution/mail/format/reply_style +mail-browser-width = /apps/evolution/mail/mail_browser_width +mark-citations = /apps/evolution/mail/display/mark_citations +mark-seen = /apps/evolution/mail/display/mark_seen +mark-seen-timeout = /apps/evolution/mail/display/mark_seen_timeout message-display-style = /apps/evolution/mail/format/message_display_style +message-text-part-limit = /apps/evolution/mail/display/message_text_part_limit +mime-types = /apps/evolution/mail/display/mime_types +monospace-font = /apps/evolution/mail/display/fonts/monospace +no-folder-dots = /apps/evolution/mail/display/no_folder_dots +paned-size = /apps/evolution/mail/display/paned_size +photo-local = /apps/evolution/mail/display/photo_local +prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder prompt-on-empty-subject = /apps/evolution/mail/prompts/empty_subject prompt-on-expunge = /apps/evolution/mail/prompts/expunge +prompt-on-list-reply-to = /apps/evolution/mail/prompts/list_reply_to +prompt-on-mark-all-read = /apps/evolution/mail/prompts/mark_all_read prompt-on-only-bcc = /apps/evolution/mail/prompts/only_bcc -prompt-on-unwanted-html = /apps/evolution/mail/prompts/unwanted_html prompt-on-open-many = /apps/evolution/mail/prompts/open_many -prompt-on-mark-all-read = /apps/evolution/mail/prompts/mark_all_read -prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder prompt-on-private-list-reply = /apps/evolution/mail/prompts/private_list_reply -prompt-on-list-reply-to = /apps/evolution/mail/prompts/list_reply_to -prompt-on-reply-many-recips = /apps/evolution/mail/prompts/reply_many_recips prompt-on-reply-close-browser = /apps/evolution/mail/prompts/reply_close_browser -trash-empty-on-exit = /apps/evolution/mail/trash/empty_on_exit -trash-empty-on-exit-days = /apps/evolution/mail/trash/empty_on_exit_days -trash-empty-date = /apps/evolution/mail/trash/empty_date -error-timeout = /apps/evolution/mail/display/error_timeout -error-level = /apps/evolution/mail/display/error_level -show-real-date = /apps/evolution/mail/display/show_real_date -labels = /apps/evolution/mail/labels -junk-check-incoming = /apps/evolution/mail/junk/check_incoming -junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit -junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days -junk-empty-date = /apps/evolution/mail/junk/empty_date -junk-default-plugin = /apps/evolution/mail/junk/default_plugin -junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only -junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon -junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook -junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only -junk-check-custom-header = /apps/evolution/mail/junk/check_custom_header -junk-custom-header = /apps/evolution/mail/junk/custom_header -default-account = /apps/evolution/mail/default_account +prompt-on-reply-many-recips = /apps/evolution/mail/prompts/reply_many_recips +prompt-on-unwanted-html = /apps/evolution/mail/prompts/unwanted_html +reply-style = /apps/evolution/mail/format/reply_style save-dir = /apps/evolution/mail/save_dir -composer-current-folder = /apps/evolution/mail/composer/current_folder -filter-editor-height = /apps/evolution/mail/filter_editor_height -filter-editor-maximized = /apps/evolution/mail/filter_editor_maximized -filter-editor-width = /apps/evolution/mail/filter_editor_width +safe-list = /apps/evolution/mail/display/safe_list send-recv-height = /apps/evolution/mail/send_recv_height send-recv-maximized = /apps/evolution/mail/send_recv_maximized send-recv-width = /apps/evolution/mail/send_recv_width +show-all-headers = /apps/evolution/mail/display/show_all_headers +show-animated-images = /apps/evolution/mail/display/animated_images +show-deleted = /apps/evolution/mail/display/show_deleted +show-email = /apps/evolution/mail/display/show_email +show-real-date = /apps/evolution/mail/display/show_real_date +show-sender-photo = /apps/evolution/mail/display/sender_photo +side-bar-search = /apps/evolution/mail/display/side_bar_search +subscription-editor-height = /apps/evolution/mail/subscription_editor_height +subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized +subscription-editor-width = /apps/evolution/mail/subscription_editor_width +sync-interval = /apps/evolution/mail/sync_interval +thread-expand = /apps/evolution/mail/display/thread_expand +thread-latest = /apps/evolution/mail/display/thread_latest +thread-subject = /apps/evolution/mail/display/thread_subject +trash-empty-date = /apps/evolution/mail/trash/empty_date +trash-empty-on-exit = /apps/evolution/mail/trash/empty_on_exit +trash-empty-on-exit-days = /apps/evolution/mail/trash/empty_on_exit_days +use-custom-font = /apps/evolution/mail/display/fonts/use_custom +variable-width-font = /apps/evolution/mail/display/fonts/variable +vertical-view-fonts = /apps/evolution/mail/display/vertical_view_fonts vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width -sync-interval = /apps/evolution/mail/sync_interval [org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues @@ -198,21 +198,21 @@ utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode 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 +command = /apps/evolution/eplugin/external-editor/editor-command +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 -notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification -notify-sound-enabled = /apps/evolution/eplugin/mail-notification/sound-enabled +notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep +notify-sound-enabled = /apps/evolution/eplugin/mail-notification/sound-enabled notify-sound-file = /apps/evolution/eplugin/mail-notification/sound-file notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-theme +notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled +notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification [org.gnome.evolution.eplugin.prefer-plain] mode = /apps/evolution/eplugin/prefer_plain/mode" diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in index 114cfd3990..5ee175adf0 100644 --- a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in @@ -1,11 +1,11 @@ - + '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 v1.2.3 From 5efdc804e452ab547cc2a1d04c8d7173a2c9b6d5 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 14 Oct 2011 13:46:33 +0200 Subject: Make e_utils_prompt_user and callers use GSettings keys --- data/evolution.convert | 4 +++- data/org.gnome.evolution.mail.gschema.xml.in | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 4d9377de6f..44fb9a8787 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -80,7 +80,6 @@ address-count = /apps/evolution/mail/display/address_count animate-images = /apps/evolution/mail/display/animate_images caret-mode = /apps/evolution/mail/display/caret_mode charset = /apps/evolution/mail/display/charset -check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault citation-colour = /apps/evolution/mail/display/citation_colour composer-charset = /apps/evolution/mail/composer/charset composer-current-folder = /apps/evolution/mail/composer/current_folder @@ -147,9 +146,12 @@ monospace-font = /apps/evolution/mail/display/fonts/monospace no-folder-dots = /apps/evolution/mail/display/no_folder_dots paned-size = /apps/evolution/mail/display/paned_size photo-local = /apps/evolution/mail/display/photo_local +prompt-check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder prompt-on-empty-subject = /apps/evolution/mail/prompts/empty_subject +prompt-on-empty-trash = /apps/evolution/mail/prompts/empty_trash prompt-on-expunge = /apps/evolution/mail/prompts/expunge +prompt-on-invalid-recip = /apps/evolution/mail/prompts/send_invalid_recip prompt-on-list-reply-to = /apps/evolution/mail/prompts/list_reply_to prompt-on-mark-all-read = /apps/evolution/mail/prompts/mark_all_read prompt-on-only-bcc = /apps/evolution/mail/prompts/only_bcc diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index c52c76c170..649dca1ed8 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -1,6 +1,6 @@ - + true <_summary>Check whether Evolution is the default mailer <_description>Every time Evolution starts, check whether or not it is the default mailer. @@ -360,11 +360,21 @@ <_summary>Prompt on empty subject <_description>Prompt the user when he or she tries to send a message without a Subject. + + true + <_summary>Prompt when emptying the trash + <_description>Prompt the user when he or she tries to empty the trash. + true <_summary>Prompt when user expunges <_description>Prompt the user when he or she tries to expunge a folder. + + true + <_summary>Prompt before sending to recipients not entered as mail addresses + <_description>It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses + true <_summary>Prompt when user only fills Bcc -- cgit v1.2.3 From cf730efa734bdd41f113543c04e90ba253149dff Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Oct 2011 11:08:00 -0400 Subject: Fix some GSettings schema typos. --- data/Makefile.am | 2 +- data/org.gnome.evolution.shell.gschema.xml.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 2a8b72a680..567b9be8b2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,7 +16,7 @@ gsettings_SCHEMAS = \ org.gnome.evolution.calendar.gschema.xml \ org.gnome.evolution.importer.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ - org.gnome.evolution.shell.gschema.xml.in \ + org.gnome.evolution.shell.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 \ diff --git a/data/org.gnome.evolution.shell.gschema.xml.in b/data/org.gnome.evolution.shell.gschema.xml.in index d2fd7439cb..36e2c99523 100644 --- a/data/org.gnome.evolution.shell.gschema.xml.in +++ b/data/org.gnome.evolution.shell.gschema.xml.in @@ -31,12 +31,12 @@ <_description>Flag that enables a much simplified user interface. - + 0 <_summary>Default window Y coordinate <_description>The default Y coordinate for the main window. - + 0 <_summary>Default window X coordinate <_description>The default X coordinate for the main window. @@ -61,7 +61,7 @@ <_description>Whether the window buttons should be visible. - toolbar + 'toolbar' <_summary>Window button style <_description>The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. @@ -76,12 +76,12 @@ <_description>Whether the sidebar should be visible. - TRUE + true <_summary>Statusbar is visible <_description>Whether the status bar should be visible. - mail + 'mail' <_summary>ID or alias of the component to be shown by default at start-up. <_description>ID or alias of the component to be shown by default at start-up. -- cgit v1.2.3 From b9eebfcb4f371ce3549264a97983b5f9cb6493df Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 19 Oct 2011 11:46:15 +0200 Subject: More mail GSettings migration --- data/evolution.convert | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 44fb9a8787..ea70dc8880 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -83,6 +83,8 @@ charset = /apps/evolution/mail/display/charset citation-colour = /apps/evolution/mail/display/citation_colour composer-charset = /apps/evolution/mail/composer/charset composer-current-folder = /apps/evolution/mail/composer/current_folder +composer-height = /apps/evolution/mail/composer/height +composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling composer-magic-links = /apps/evolution/mail/composer/magic_links composer-magic-smileys = /apps/evolution/mail/composer/magic_smileys @@ -101,8 +103,6 @@ composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames composer-top-signature = /apps/evolution/mail/composer/top_signature composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim composer-width = /apps/evolution/mail/composer/width -composer-height = /apps/evolution/mail/composer/height -composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to default-account = /apps/evolution/mail/default_account enable-vfolders = /apps/evolution/mail/display/enable_vfolders error-level = /apps/evolution/mail/display/error_level -- cgit v1.2.3 From 3b32549c69267295a9a7b482e4a6ca2db9e6c73f Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 19 Oct 2011 18:24:07 +0200 Subject: And yet more GSettings migration on the mail component --- data/evolution.convert | 7 +++++-- data/org.gnome.evolution.mail.gschema.xml.in | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index ea70dc8880..774d791a76 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -83,12 +83,16 @@ charset = /apps/evolution/mail/display/charset citation-colour = /apps/evolution/mail/display/citation_colour composer-charset = /apps/evolution/mail/composer/charset composer-current-folder = /apps/evolution/mail/composer/current_folder +composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list composer-height = /apps/evolution/mail/composer/height composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to composer-inline-spelling = /apps/evolution/mail/composer/inline_spelling composer-magic-links = /apps/evolution/mail/composer/magic_links composer-magic-smileys = /apps/evolution/mail/composer/magic_smileys -composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list +composer-message-attribution = /apps/evolution/mail/composer/message_attribution +composer-message-forward = /apps/evolution/mail/composer/message_forward +composer-message-original = /apps/evolution/mail/composer/message_original +composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom composer-request-receipt = /apps/evolution/mail/composer/request_receipt composer-send-html = /apps/evolution/mail/composer/send_html @@ -101,7 +105,6 @@ composer-show-post-from = /apps/evolution/mail/composer/show_post_from composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames composer-top-signature = /apps/evolution/mail/composer/top_signature -composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim composer-width = /apps/evolution/mail/composer/width default-account = /apps/evolution/mail/default_account enable-vfolders = /apps/evolution/mail/display/enable_vfolders diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 649dca1ed8..35092ccfff 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -25,6 +25,21 @@ <_summary>Automatic emoticon recognition <_description>Recognize emoticons in text and replace them with images. + + '' + <_summary>Attribute message + <_description>The text that is inserted when replying to a message, attributing the message to the original author + + + '' + <_summary>Forward message + <_description>The text that is inserted when forwarding a message, saying that the forwarded message follows + + + '' + <_summary>Original message + <_description>The text that is inserted when replying to a message (top posting), saying that the original message follows + false <_summary>Group Reply replies to list -- cgit v1.2.3 From 8d001181fbaf1350764e75c28f61e1ae3498dbb3 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 26 Oct 2011 12:29:31 +0200 Subject: Almost no more GConf in e-util --- data/evolution.convert | 1 + data/org.gnome.evolution.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 774d791a76..780ba5653c 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -1,6 +1,7 @@ [org.gnome.evolution] version = /apps/evolution/version last-upgraded-version = /apps/evolution/last_version +disabled-eplugins = /apps/evolution/eplugin/disabled [org.gnome.evolution.shell] attachment-view = /apps/evolution/shell/attachment_view diff --git a/data/org.gnome.evolution.gschema.xml.in b/data/org.gnome.evolution.gschema.xml.in index 6ae4388a5e..49e940d622 100644 --- a/data/org.gnome.evolution.gschema.xml.in +++ b/data/org.gnome.evolution.gschema.xml.in @@ -10,5 +10,10 @@ <_summary>Last upgraded configuration version <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). + + [] + <_summary>List of disabled plugins + <_description>The list of disabled plugins in Evolution + -- cgit v1.2.3 From fa4a42d741fade66d51857fb2653e27e347aef80 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 1 Nov 2011 17:26:07 +0100 Subject: Migrate SA extension to GSettings --- data/evolution.convert | 3 +++ data/org.gnome.evolution.mail.gschema.xml.in | 15 +++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 780ba5653c..992286f88d 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -132,6 +132,9 @@ junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only +junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary +junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary +junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon labels = /apps/evolution/mail/labels layout = /apps/evolution/mail/display/layout diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 35092ccfff..30884ae571 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -500,11 +500,26 @@ <_summary>Use only local spam tests. <_description>Use only the local spam tests (no DNS). + + '' + <_summary>Socket path for SpamAssassin + <_description>Socket path for SpamAssassin + true <_summary>Use SpamAssassin daemon and client <_description>Use SpamAssassin daemon and client (spamc/spamd). + + 'spamc' + <_summary>SpamAssassin client binary + <_description>SpamAssassin client binary + + + 'spamd' + <_summary>SpamAssassin daemon binary + <_description>SpamAssassin daemon binary + false <_summary>Determines whether to lookup in address book for sender email -- cgit v1.2.3 From 80937eb544e24b51244f3ade02e69fb7a3157920 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 1 Nov 2011 17:40:16 +0100 Subject: Addressbook module GSettings migration --- data/evolution.convert | 2 ++ data/org.gnome.evolution.addressbook.gschema.xml.in | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 992286f88d..bd391b7330 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -29,6 +29,8 @@ completion-minimum-query-length = /apps/evolution/addressbook/completion/minimum completion-show-address = /apps/evolution/addressbook/completion/show_address hpane-position = /apps/evolution/addressbook/display/hpane_position layout = /apps/evolution/addressbook/display/layout +preview-show-maps = /apps/evolution/addressbook/display/preview_show_maps +primary-addressbook = /apps/evolution/addressbook/display/primary_addressbook select-names-last-used-uri = /apps/evolution/addressbook/select_names/last_used_uri show-preview = /apps/evolution/addressbook/display/show_preview vpane-position = /apps/evolution/addressbook/display/vpane_position diff --git a/data/org.gnome.evolution.addressbook.gschema.xml.in b/data/org.gnome.evolution.addressbook.gschema.xml.in index 11efc0c2af..0dcaeddbe0 100644 --- a/data/org.gnome.evolution.addressbook.gschema.xml.in +++ b/data/org.gnome.evolution.addressbook.gschema.xml.in @@ -35,6 +35,16 @@ <_summary>Contact preview pane position (vertical) <_description>Position of the contact preview pane when oriented vertically. + + false + <_summary>Show maps + <_description>Whether to show maps in preview pane + + + '' + <_summary>Primary address book + <_description>The UID of the selected (or "primary") address book in the sidebar of the "Contacts" view + true <_summary>Show preview pane -- cgit v1.2.3 From 5182ae7cef949001e6aa8b36f1c8fa1694570f98 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 2 Nov 2011 14:41:12 +0100 Subject: Migrate mail notification plugin to GSettings --- data/evolution.convert | 1 + data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index bd391b7330..61b697412e 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -221,6 +221,7 @@ notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep notify-sound-enabled = /apps/evolution/eplugin/mail-notification/sound-enabled notify-sound-file = /apps/evolution/eplugin/mail-notification/sound-file +notify-sound-play-file = /apps/evolution/eplugin/mail-notification/sound-play-file notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-theme notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in index d70313e25c..025971f32e 100644 --- a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in @@ -35,6 +35,11 @@ <_summary>Sound file name to be played. <_description>Sound file to be played when new messages arrive, if not in beep mode. + + false + <_summary>FIXME + <_description>FIXME + false <_summary>Use sound theme -- cgit v1.2.3 From 80b0ca6849fd7b09a81a445771ae4ec64610ba18 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 4 Nov 2011 15:55:21 +0100 Subject: Migrate itip formatter to GSettings --- data/Makefile.am | 1 + data/evolution.convert | 3 +++ data/org.gnome.evolution.eplugin.itip.gschema.xml.in | 9 +++++++++ 3 files changed, 13 insertions(+) create mode 100644 data/org.gnome.evolution.eplugin.itip.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 567b9be8b2..4a4cc278d2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,6 +22,7 @@ gsettings_SCHEMAS = \ 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.itip.gschema.xml \ org.gnome.evolution.eplugin.mail-notification.gschema.xml \ org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in \ org.gnome.evolution.eplugin.templates.gschema.xml diff --git a/data/evolution.convert b/data/evolution.convert index 61b697412e..6946b0eab3 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -215,6 +215,9 @@ launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-pres [org.gnome.evolution.eplugin.face-picture] insert-face-picture = /apps/evolution/eplugin/face/insert_by_default +[org.gnome.evolution.eplugin.itip] +delete-processed = /apps/evolution/itip/delete_processed + [org.gnome.evolution.eplugin.mail-notification] notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox diff --git a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in b/data/org.gnome.evolution.eplugin.itip.gschema.xml.in new file mode 100644 index 0000000000..5e0e1d4567 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.itip.gschema.xml.in @@ -0,0 +1,9 @@ + + + + false + <_summary>Delete processed + <_description>Whether to delete processed iTip objects + + + -- cgit v1.2.3 From 55ed27cd2f509453c9928a21a75871a5fe59fb9f Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 14 Nov 2011 17:19:25 +0100 Subject: Migrate EShellSettings to GSettings --- data/evolution.convert | 35 +++++- data/org.gnome.evolution.calendar.gschema.xml.in | 135 +++++++++++++++++++++++ data/org.gnome.evolution.mail.gschema.xml.in | 30 +++++ 3 files changed, 199 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/evolution.convert b/data/evolution.convert index 6946b0eab3..ecb5236406 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -37,10 +37,21 @@ vpane-position = /apps/evolution/addressbook/display/vpane_position [org.gnome.evolution.calendar] audio-dir = /apps/evolution/calendar/audio_dir +ba-reminder-interval = /apps/evolution/calendar/other/ba_reminder_interval +ba-reminder-units = /apps/evolution/calendar/other/ba_reminder_units +compress-weekend = /apps/evolution/calendar/display/compress_weekend +confirm-delete = /apps/evolution/calendar/prompts/confirm_delete +confirm-purge = /apps/evolution/calendar/prompts/confirm_purge date-navigator-pane-position = /apps/evolution/calendar/display/date_navigator_pane_position +day-end-hour = /apps/evolution/calendar/display/day_end_hour +day-end-minute = /apps/evolution/calendar/display/day_end_minute +day-start-hour = /apps/evolution/calendar/display/day_start_hour +day-start-minute = /apps/evolution/calendar/display/day_start_minute 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 +default-reminder-interval = /apps/evolution/calendar/other/default_reminder_interval +default-reminder-units = /apps/evolution/calendar/other/default_reminder_units 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 @@ -52,6 +63,9 @@ hide-completed-tasks-units = /apps/evolution/calendar/tasks/hide_completed_units hide-completed-tasks-value = /apps/evolution/calendar/tasks/hide_completed_value hpane-position = /apps/evolution/calendar/display/hpane_position last-notification-time = /apps/evolution/calendar/notify/last_notification_time +marcus-bains-color-dayview = /apps/evolution/calendar/display/marcus_bains_color_dayview +marcus-bains-color-timebar = /apps/evolution/calendar/display/marcus_bains_color_timebar +marcus-bains-line = /apps/evolution/calendar/display/marcus_bains_line memo-hpane-position = /apps/evolution/calendar/display/memo_hpane_position memo-layout = /apps/evolution/calendar/display/memo_layout memo-vpane-position = /apps/evolution/calendar/display/memo_vpane_position @@ -59,18 +73,31 @@ month-hpane-position = /apps/evolution/calendar/display/month_hpane_position 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 +primary-calendar = /apps/evolution/calendar/display/primary_calendar +primary-memos = /apps/evolution/calendar/memos/primary_memos +primary-tasks = /apps/evolution/calendar/tasks/primary_tasks +publish-template = /apps/evolution/calendar/publish/template +recur-events-italic = /apps/evolution/calendar/display/recur_events_italic selected-calendars = /apps/evolution/calendar/display/selected_calendars selected-memos = /apps/evolution/calendar/memos/selected_memos selected-tasks = /apps/evolution/calendar/tasks/selected_tasks +show-event-end = /apps/evolution/calendar/display/show_event_end show-memo-preview = /apps/evolution/calendar/display/show_memo_preview show-task-preview = /apps/evolution/calendar/display/show_task_preview +show-week-numbers = /apps/evolution/calendar/display/show_week_numbers tag-vpane-position = /apps/evolution/calendar/display/tag_vpane_position +task-due-today-color = /apps/evolution/calendar/tasks/colors/due_today task-hpane-position = /apps/evolution/calendar/display/task_hpane_position task-vpane-position = /apps/evolution/calendar/display/task_vpane_position task-layout = /apps/evolution/calendar/display/task_layout +task-overdue-color = /apps/evolution/calendar/tasks/colors/overdue +time-divisions = /apps/evolution/calendar/display/time_divisions timezone = /apps/evolution/calendar/display/timezone use-24hour-format = /apps/evolution/calendar/display/use_24hour_format +use-ba-reminder = /apps/evolution/calendar/other/use_ba_reminder +use-default-reminder = /apps/evolution/calendar/other/use_default_reminder use-system-timezone = /apps/evolution/calendar/display/use_system_timezone +week-start-day = /apps/evolution/calendar/display/week_start_day working-days = /apps/evolution/calendar/display/working_days [org.gnome.evolution.importer] @@ -86,6 +113,7 @@ charset = /apps/evolution/mail/display/charset citation-colour = /apps/evolution/mail/display/citation_colour composer-charset = /apps/evolution/mail/composer/charset composer-current-folder = /apps/evolution/mail/composer/current_folder +composer-gallery-path = /apps/evolution/mail/composer/gallery_path composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list composer-height = /apps/evolution/mail/composer/height composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to @@ -96,6 +124,7 @@ composer-message-attribution = /apps/evolution/mail/composer/message_attribution composer-message-forward = /apps/evolution/mail/composer/message_forward composer-message-original = /apps/evolution/mail/composer/message_original composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim +composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom composer-request-receipt = /apps/evolution/mail/composer/request_receipt composer-send-html = /apps/evolution/mail/composer/send_html @@ -106,10 +135,10 @@ composer-show-cc = /apps/evolution/mail/composer/show_mail_cc composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to composer-show-post-from = /apps/evolution/mail/composer/show_post_from composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to -composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames composer-top-signature = /apps/evolution/mail/composer/top_signature composer-width = /apps/evolution/mail/composer/width default-account = /apps/evolution/mail/default_account +enable-local = /apps/evolution/mail/display/enable_local enable-vfolders = /apps/evolution/mail/display/enable_vfolders error-level = /apps/evolution/mail/display/error_level error-timeout = /apps/evolution/mail/display/error_timeout @@ -154,6 +183,7 @@ mime-types = /apps/evolution/mail/display/mime_types monospace-font = /apps/evolution/mail/display/fonts/monospace no-folder-dots = /apps/evolution/mail/display/no_folder_dots paned-size = /apps/evolution/mail/display/paned_size +paned-view-headers-state = /apps/evolution/mail/display/paned_view_headers_state photo-local = /apps/evolution/mail/display/photo_local prompt-check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder @@ -174,6 +204,8 @@ save-dir = /apps/evolution/mail/save_dir safe-list = /apps/evolution/mail/display/safe_list send-recv-height = /apps/evolution/mail/send_recv_height send-recv-maximized = /apps/evolution/mail/send_recv_maximized +send-recv-on-start = /apps/evolution/mail/send_recv_on_start +send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start send-recv-width = /apps/evolution/mail/send_recv_width show-all-headers = /apps/evolution/mail/display/show_all_headers show-animated-images = /apps/evolution/mail/display/animated_images @@ -182,6 +214,7 @@ show-email = /apps/evolution/mail/display/show_email show-real-date = /apps/evolution/mail/display/show_real_date show-sender-photo = /apps/evolution/mail/display/sender_photo side-bar-search = /apps/evolution/mail/display/side_bar_search +sort-accounts-alpha = /apps/evolution/mail/display/sort_accounts_alpha subscription-editor-height = /apps/evolution/mail/subscription_editor_height subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized subscription-editor-width = /apps/evolution/mail/subscription_editor_width diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in index cc32a3c36d..6217ce22d2 100644 --- a/data/org.gnome.evolution.calendar.gschema.xml.in +++ b/data/org.gnome.evolution.calendar.gschema.xml.in @@ -5,11 +5,56 @@ <_summary>Save directory for reminder audio <_description>Directory for saving reminder audio files + + 15 + <_summary>Birthday and anniversary reminder value + <_description>Number of units for determining a birthday or anniversary reminder + + + 'minutes' + <_summary>Birthday and anniversary reminder units + <_description>Units for a birthday or anniversary reminder, "minutes", "hours" or "days" + + + true + <_summary>Compress weekends in month view + <_description>Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday + + + true + <_summary>Ask for confirmation when deleting items + <_description>Whether to ask for confirmation when deleting an appointment or task + + + true + <_summary>Confirm expunge + <_description>Whether to ask for confirmation when expunging appointments and tasks + 150 <_summary>Month view vertical pane position <_description>Position of the vertical pane, between the calendar lists and the date navigator calendar + + 17 + <_summary>Workday end hour + <_description>Hour the workday ends on, in twenty four hour format, 0 to 23 + + + 0 + <_summary>Workday end minute + <_description>Minute the workday ends on, 0 to 59. + + + 9 + <_summary>Workday start hour + <_description>Hour the workday starts on, in twenty four hour format, 0 to 23. + + + 0 + <_summary>Workday start minute + <_description>Minute the workday starts on, 0 to 59. + '' <_summary>The second timezone for a Day View @@ -25,6 +70,16 @@ <_summary>Maximum number of recently used timezones to remember <_description>Maximum number of recently used timezones to remember in a 'day-second-zones' list + + 15 + <_summary>Default reminder value + <_description>Number of units for determining a default reminder + + + 'minutes' + <_summary>Default reminder units + <_description>Units for a default reminder, "minutes", "hours" or "days" + false <_summary>Show categories field in the event/meeting/task editor @@ -80,6 +135,21 @@ <_summary>Last reminder time <_description>Time the last reminder ran, in time_t + + '#ff0000' + <_summary>Marcus Bains Line Color - Day View + <_description>Color to draw the Marcus Bains line in the Day View + + + '#ff0000' + <_summary>Marcus Bains Line Color - Time bar + <_description>Color to draw the Marcus Bains Line in the Time bar (empty for default) + + + true + <_summary>Marcus Bains Line + <_description>Whether to draw the Marcus Bains Line (line at current time) in the calendar + 200 <_summary>Memo preview pane position (horizontal) @@ -115,6 +185,31 @@ <_summary>Show display reminders in notification tray <_description>Whether or not to use the notification tray for display reminders + + '' + <_summary>Primary calendar + <_description>The UID of the selected (or "primary") calendar in the sidebar of the "Calendar" view + + + '' + <_summary>Primary memo list + <_description>The UID of the selected (or "primary") memo list in the sidebar of the "Memos" view + + + '' + <_summary>Primary task list + <_description>The UID of the selected (or "primary") task list in the sidebar of the "Tasks" view + + + '' + <_summary>Free/busy template URL + <_description>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 + + + false + <_summary>Recurrent Events in Italic + <_description>Show days with recurrent events in italic font in bottom left calendar + [] <_summary>List of selected calendars @@ -130,6 +225,11 @@ <_summary>List of selected task lists <_description>List of task lists to load + + true + <_summary>Show appointment end times in week and month views + <_description>Whether to display the end time of events in the week and month views + true <_summary>Show the memo preview pane @@ -140,11 +240,21 @@ <_summary>Show the task preview pane <_description>If "true", show the task preview pane in the main window + + false + <_summary>Show week numbers in Day View, Work Week View, and Date Navigator + <_description>Whether to show week numbers in various places in the Calendar + 0 <_summary>Vertical position for the tag pane <_description>Vertical position for the tag pane + + '#1e90ff' + <_summary>Tasks due today color + <_description>Background color of tasks that are due today, in "#rrggbb" format + 200 <_summary>Task preview pane position (horizontal) @@ -160,6 +270,16 @@ <_summary>Task preview pane position (vertical) <_description>Position of the task preview pane when oriented vertically + + '#ff0000' + <_summary>Overdue tasks color + <_description>Background color of tasks that are overdue, in "#rrggbb" format + + + 30 + <_summary>Time divisions + <_description>Intervals shown in Day and Work Week views, in minutes + 'UTC' <_summary>Timezone @@ -170,11 +290,26 @@ <_summary>Twenty four hour time format <_description>Whether to show times in twenty four hour format instead of using am/pm + + false + <_summary>Birthday and anniversary reminder + <_description>Whether to set a reminder for birthdays and anniversaries + + + false + <_summary>Default appointment reminder + <_description>Whether to set a default reminder for appointments + true <_summary>Use system timezone <_description>Use the system timezone instead of the timezone selected in Evolution + + 1 + <_summary>Week start + <_description>Weekday the week starts on, from Sunday (0) to Saturday (6) + 62 <_summary>Work days diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 30884ae571..004ec16ccf 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -10,6 +10,11 @@ <_summary>Default charset in which to compose messages <_description>Default charset in which to compose messages. + + '' + <_summary>Path where picture gallery should search for its content + <_description>This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder + true <_summary>Spell check inline @@ -235,6 +240,11 @@ <_summary>Show deleted messages in the message-list <_description>Show deleted messages (with a strike-through) in the message-list. + + true + <_summary>Enable local folders + <_description>Whether to show local folders (On This Computer) in a folder tree + true <_summary>Enable search folders @@ -250,6 +260,11 @@ <_summary>Height of the message-list pane <_description>Height of the message-list pane. + + 0 + <_summary>State of message headers in paned view + <_description>Describes whether message headers in paned view should be collapsed or expanded by default. "0" = expanded and "1" = collapsed + 450 <_summary>Width of the message-list pane @@ -325,6 +340,11 @@ <_summary>Mail browser maximized <_description>Default maximized state of the mail browser window. + + true + <_summary>Sort accounts alphabetically in a folder tree + <_description>Tells how to sort accounts in a folder tree used in a Mail view. When set to true accounts are sorted alphabetically, with an exception of On This Computer and Search folders, otherwise accounts are sorted based on an order given by a user + 400 <_summary>"Folder Subscriptions" window height @@ -580,6 +600,16 @@ <_summary>"Send and Receive Mail" window maximize state <_description>Initial maximize state of the "Send and Receive Mail" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the "Send and Receive Mail" window cannot be maximized. This key exists only as an implementation detail. + + true + <_summary>Check for new messages on start + <_description>Whether check for new messages when Evolution is started. This includes also sending messages from Outbox. + + + false + <_summary>Check for new messages in all active accounts + <_description>Whether check for new messages in all active accounts regardless of the account "Check for new messages every X minutes" option when Evolution is started. This option is used only together with 'send_recv_on_start' option. + 600 <_summary>"Send and Receive Mail" window width -- cgit v1.2.3 From 73656ae57ee8a42678e09b07c5d85fe45b9844a6 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 17 Nov 2011 17:19:48 +0100 Subject: Port autocontacts plugin to GSettings --- data/Makefile.am | 1 + data/evolution.convert | 9 +++++ ...e.evolution.eplugin.autocontacts.gschema.xml.in | 39 ++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 4a4cc278d2..1aed9b3afe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,6 +18,7 @@ gsettings_SCHEMAS = \ org.gnome.evolution.mail.gschema.xml \ org.gnome.evolution.shell.gschema.xml \ org.gnome.evolution.eplugin.attachment-reminder.gschema.xml \ + org.gnome.evolution.eplugin.autocontacts.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 \ diff --git a/data/evolution.convert b/data/evolution.convert index ecb5236406..190b9ee555 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -235,6 +235,15 @@ vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width [org.gnome.evolution.eplugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues +[org.gnome.evolution.eplugin.autocontacts] +addressbook-source = /apps/evolution/autocontacts/addressbook_source +auto-sync-gaim = /apps/evolution/autocontacts/auto_sync_gaim +enable = /apps/evolution/autocontacts/enable_autocontacts +gaim-addressbook-source = /apps/evolution/autocontacts/gaim_addressbook_source +gaim-check-interval = /apps/evolution/autocontacts/gaim_check_interval +gaim-last-sync-md5 = /apps/evolution/autocontacts/gaim_last_sync_md5 +gaim-last-sync-time = /apps/evolution/autocontacts/gaim_last_sync_time + [org.gnome.evolution.eplugin.bogo-junk] utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode diff --git a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in b/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in new file mode 100644 index 0000000000..f1ff4a12e2 --- /dev/null +++ b/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in @@ -0,0 +1,39 @@ + + + + '' + <_summary>Address book source + <_description>Address book to use for storing automatically synced contacts + + + false + <_summary>Auto sync GAIM contacts + <_description>Whether GAIM contacts should be automaticall synced + + + false + <_summary>Enable autocontacts + <_description>Whether contacts should be automatically added to the user's addressbook + + + '' + <_summary>GAIM address book source + <_description>Address book to use for storing automatically synced contacts from GAIM + + + 10 + <_summary>GAIM check interval + <_description>Check interval for GAIM syncing of contacts + + + '' + <_summary>GAIM last sync MD5 + <_description>GAIM last sync MD5 + + + '' + <_summary>GAIM last sync time + <_description>GAIM last sync time + + + -- cgit v1.2.3 From adf6645d525842692ca625a278e41a66cd02d2b6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 15:54:39 -0500 Subject: Fix some GSettings runtime issues. --- data/Makefile.am | 2 +- data/evolution.convert | 27 +++++++++++----------- ...e.evolution.eplugin.prefer-plain.gschema.xml.in | 2 +- data/org.gnome.evolution.mail.gschema.xml.in | 5 ++++ 4 files changed, 21 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 1aed9b3afe..c703876e48 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,7 +25,7 @@ gsettings_SCHEMAS = \ org.gnome.evolution.eplugin.face-picture.gschema.xml \ org.gnome.evolution.eplugin.itip.gschema.xml \ org.gnome.evolution.eplugin.mail-notification.gschema.xml \ - org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in \ + org.gnome.evolution.eplugin.prefer-plain.gschema.xml \ org.gnome.evolution.eplugin.templates.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 190b9ee555..3d9179e5d1 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -5,8 +5,8 @@ disabled-eplugins = /apps/evolution/eplugin/disabled [org.gnome.evolution.shell] attachment-view = /apps/evolution/shell/attachment_view -buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible buttons-style = /apps/evolution/shell/view_defaults/buttons_style +buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible default-component-id = /apps/evolution/shell/view_defaults/component_id express-mode = /apps/evolution/shell/express_mode file-chooser-folder = /apps/evolution/shell/file_chooser_folder @@ -17,11 +17,11 @@ skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog start-offline = /apps/evolution/shell/start_offline statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible -window-y = /apps/evolution/shell/view_defaults/window_y -window-x = /apps/evolution/shell/view_defaults/window_x -window-width = /apps/evolution/shell/view_defaults/window_width window-height = /apps/evolution/shell/view_defaults/window_height window-maximized = /apps/evolution/shell/view_defaults/window_maximized +window-width = /apps/evolution/shell/view_defaults/window_width +window-x = /apps/evolution/shell/view_defaults/window_x +window-y = /apps/evolution/shell/view_defaults/window_y [org.gnome.evolution.addressbook] address-formatting = /apps/evolution/addressbook/display/address_formatting @@ -45,11 +45,11 @@ confirm-purge = /apps/evolution/calendar/prompts/confirm_purge date-navigator-pane-position = /apps/evolution/calendar/display/date_navigator_pane_position day-end-hour = /apps/evolution/calendar/display/day_end_hour day-end-minute = /apps/evolution/calendar/display/day_end_minute -day-start-hour = /apps/evolution/calendar/display/day_start_hour -day-start-minute = /apps/evolution/calendar/display/day_start_minute 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 +day-start-hour = /apps/evolution/calendar/display/day_start_hour +day-start-minute = /apps/evolution/calendar/display/day_start_minute default-reminder-interval = /apps/evolution/calendar/other/default_reminder_interval default-reminder-units = /apps/evolution/calendar/other/default_reminder_units editor-show-categories = /apps/evolution/calendar/display/show_categories @@ -88,9 +88,9 @@ show-week-numbers = /apps/evolution/calendar/display/show_week_numbers tag-vpane-position = /apps/evolution/calendar/display/tag_vpane_position task-due-today-color = /apps/evolution/calendar/tasks/colors/due_today task-hpane-position = /apps/evolution/calendar/display/task_hpane_position -task-vpane-position = /apps/evolution/calendar/display/task_vpane_position task-layout = /apps/evolution/calendar/display/task_layout task-overdue-color = /apps/evolution/calendar/tasks/colors/overdue +task-vpane-position = /apps/evolution/calendar/display/task_vpane_position time-divisions = /apps/evolution/calendar/display/time_divisions timezone = /apps/evolution/calendar/display/timezone use-24hour-format = /apps/evolution/calendar/display/use_24hour_format @@ -128,13 +128,14 @@ composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom composer-request-receipt = /apps/evolution/mail/composer/request_receipt composer-send-html = /apps/evolution/mail/composer/send_html -composer-spell-color = /apps/evolution/mail/composer/spell_color -composer-spell-languages = /apps/evolution/mail/composer/spell_languages composer-show-bcc = /apps/evolution/mail/composer/show_mail_bcc composer-show-cc = /apps/evolution/mail/composer/show_mail_cc -composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to composer-show-post-from = /apps/evolution/mail/composer/show_post_from composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to +composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to +composer-sign-reply-if-signed = /apps/evolution/mail/composer/sign_reply_if_signed +composer-spell-color = /apps/evolution/mail/composer/spell_color +composer-spell-languages = /apps/evolution/mail/composer/spell_languages composer-top-signature = /apps/evolution/mail/composer/top_signature composer-width = /apps/evolution/mail/composer/width default-account = /apps/evolution/mail/default_account @@ -163,9 +164,9 @@ junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only +junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary -junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon labels = /apps/evolution/mail/labels layout = /apps/evolution/mail/display/layout @@ -200,12 +201,12 @@ prompt-on-reply-close-browser = /apps/evolution/mail/prompts/reply_close_browser prompt-on-reply-many-recips = /apps/evolution/mail/prompts/reply_many_recips prompt-on-unwanted-html = /apps/evolution/mail/prompts/unwanted_html reply-style = /apps/evolution/mail/format/reply_style -save-dir = /apps/evolution/mail/save_dir safe-list = /apps/evolution/mail/display/safe_list +save-dir = /apps/evolution/mail/save_dir +send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start send-recv-height = /apps/evolution/mail/send_recv_height send-recv-maximized = /apps/evolution/mail/send_recv_maximized send-recv-on-start = /apps/evolution/mail/send_recv_on_start -send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start send-recv-width = /apps/evolution/mail/send_recv_width show-all-headers = /apps/evolution/mail/display/show_all_headers show-animated-images = /apps/evolution/mail/display/animated_images diff --git a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in index 9d9b652be7..6e9073da82 100644 --- a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in +++ b/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in @@ -1,5 +1,5 @@ - + 'normal' <_summary>Mode to use when displaying mails diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 004ec16ccf..830894ca6d 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -100,6 +100,11 @@ <_summary>Show "Reply To" field when posting to a newsgroup <_description>Show the "Reply To" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen. + + false + <_summary>Digitally sign replies when the original message is signed + <_description>Automatically enable PGP or S/MIME signatures when replying to a message which is also PGP or S/MIME signed. + false <_summary>Encode file names in an Outlook/GMail way -- cgit v1.2.3 From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 17:53:07 -0500 Subject: Tweak GSettings schemas. - Don't use the term "eplugin" for modules. - Use the term "plugin" instead of "eplugin" for plugins. - Split SpamAssassin settings into a separate schema. --- data/Makefile.am | 21 +++++----- data/evolution.convert | 36 ++++++++-------- data/org.gnome.evolution.bogofilter.gschema.xml.in | 9 ++++ ...tion.eplugin.attachment-reminder.gschema.xml.in | 9 ---- ...e.evolution.eplugin.autocontacts.gschema.xml.in | 39 ----------------- ...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 ---- ...org.gnome.evolution.eplugin.itip.gschema.xml.in | 9 ---- ...lution.eplugin.mail-notification.gschema.xml.in | 49 ---------------------- ...e.evolution.eplugin.prefer-plain.gschema.xml.in | 14 ------- ...nome.evolution.eplugin.templates.gschema.xml.in | 9 ---- data/org.gnome.evolution.mail.gschema.xml.in | 25 ----------- ...ution.plugin.attachment-reminder.gschema.xml.in | 9 ++++ ...me.evolution.plugin.autocontacts.gschema.xml.in | 39 +++++++++++++++++ ...ution.plugin.email-custom-header.gschema.xml.in | 9 ++++ ...evolution.plugin.external-editor.gschema.xml.in | 14 +++++++ ...me.evolution.plugin.face-picture.gschema.xml.in | 9 ++++ .../org.gnome.evolution.plugin.itip.gschema.xml.in | 9 ++++ ...olution.plugin.mail-notification.gschema.xml.in | 49 ++++++++++++++++++++++ ...me.evolution.plugin.prefer-plain.gschema.xml.in | 14 +++++++ ...gnome.evolution.plugin.templates.gschema.xml.in | 9 ++++ ...org.gnome.evolution.spamassassin.gschema.xml.in | 29 +++++++++++++ 24 files changed, 229 insertions(+), 222 deletions(-) create mode 100644 data/org.gnome.evolution.bogofilter.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.itip.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in delete mode 100644 data/org.gnome.evolution.eplugin.templates.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.external-editor.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.face-picture.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.itip.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in create mode 100644 data/org.gnome.evolution.plugin.templates.gschema.xml.in create mode 100644 data/org.gnome.evolution.spamassassin.gschema.xml.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index c703876e48..334de53f80 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,16 +17,17 @@ gsettings_SCHEMAS = \ org.gnome.evolution.importer.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ org.gnome.evolution.shell.gschema.xml \ - org.gnome.evolution.eplugin.attachment-reminder.gschema.xml \ - org.gnome.evolution.eplugin.autocontacts.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.itip.gschema.xml \ - org.gnome.evolution.eplugin.mail-notification.gschema.xml \ - org.gnome.evolution.eplugin.prefer-plain.gschema.xml \ - org.gnome.evolution.eplugin.templates.gschema.xml + org.gnome.evolution.bogofilter.gschema.xml \ + org.gnome.evolution.spamassassin.gschema.xml \ + org.gnome.evolution.plugin.attachment-reminder.gschema.xml \ + org.gnome.evolution.plugin.autocontacts.gschema.xml \ + org.gnome.evolution.plugin.email-custom-header.gschema.xml \ + org.gnome.evolution.plugin.external-editor.gschema.xml \ + org.gnome.evolution.plugin.face-picture.gschema.xml \ + org.gnome.evolution.plugin.itip.gschema.xml \ + org.gnome.evolution.plugin.mail-notification.gschema.xml \ + org.gnome.evolution.plugin.prefer-plain.gschema.xml \ + org.gnome.evolution.plugin.templates.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/evolution.convert b/data/evolution.convert index 3d9179e5d1..46da5db91f 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -163,11 +163,6 @@ junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only -junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only -junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path -junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary -junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary -junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon labels = /apps/evolution/mail/labels layout = /apps/evolution/mail/display/layout load-http-images = /apps/evolution/mail/display/load_http_images @@ -233,10 +228,20 @@ vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width -[org.gnome.evolution.eplugin.attachment-reminder] +[org.gnome.evolution.bogofilter] +utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode + +[org.gnome.evolution.spamassassin] +local-only = /apps/evolution/mail/junk/sa/local_only +socket-path = "/apps/evolution/mail/junk/sa/socket_path +spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary +spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary +use-daemon = /apps/evolution/mail/junk/sa/use_daemon + +[org.gnome.evolution.plugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues -[org.gnome.evolution.eplugin.autocontacts] +[org.gnome.evolution.plugin.autocontacts] addressbook-source = /apps/evolution/autocontacts/addressbook_source auto-sync-gaim = /apps/evolution/autocontacts/auto_sync_gaim enable = /apps/evolution/autocontacts/enable_autocontacts @@ -245,23 +250,20 @@ gaim-check-interval = /apps/evolution/autocontacts/gaim_check_interval gaim-last-sync-md5 = /apps/evolution/autocontacts/gaim_last_sync_md5 gaim-last-sync-time = /apps/evolution/autocontacts/gaim_last_sync_time -[org.gnome.evolution.eplugin.bogo-junk] -utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode - -[org.gnome.evolution.eplugin.email-custom-header] +[org.gnome.evolution.plugin.email-custom-header] custom-header = /apps/evolution/eplugin/email_custom_header/customHeader -[org.gnome.evolution.eplugin.external-editor] +[org.gnome.evolution.plugin.external-editor] command = /apps/evolution/eplugin/external-editor/editor-command launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press -[org.gnome.evolution.eplugin.face-picture] +[org.gnome.evolution.plugin.face-picture] insert-face-picture = /apps/evolution/eplugin/face/insert_by_default -[org.gnome.evolution.eplugin.itip] +[org.gnome.evolution.plugin.itip] delete-processed = /apps/evolution/itip/delete_processed -[org.gnome.evolution.eplugin.mail-notification] +[org.gnome.evolution.plugin.mail-notification] notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep @@ -272,9 +274,9 @@ notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-the notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification -[org.gnome.evolution.eplugin.prefer-plain] +[org.gnome.evolution.plugin.prefer-plain] mode = /apps/evolution/eplugin/prefer_plain/mode" show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed -[org.gnome.evolution.eplugin.templates] +[org.gnome.evolution.plugin.templates] template-placeholders = /apps/evolution/mail/template_placeholders diff --git a/data/org.gnome.evolution.bogofilter.gschema.xml.in b/data/org.gnome.evolution.bogofilter.gschema.xml.in new file mode 100644 index 0000000000..25ada49b56 --- /dev/null +++ b/data/org.gnome.evolution.bogofilter.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.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in deleted file mode 100644 index 71fa2afaa7..0000000000 --- a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - ['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.autocontacts.gschema.xml.in b/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in deleted file mode 100644 index f1ff4a12e2..0000000000 --- a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in +++ /dev/null @@ -1,39 +0,0 @@ - - - - '' - <_summary>Address book source - <_description>Address book to use for storing automatically synced contacts - - - false - <_summary>Auto sync GAIM contacts - <_description>Whether GAIM contacts should be automaticall synced - - - false - <_summary>Enable autocontacts - <_description>Whether contacts should be automatically added to the user's addressbook - - - '' - <_summary>GAIM address book source - <_description>Address book to use for storing automatically synced contacts from GAIM - - - 10 - <_summary>GAIM check interval - <_description>Check interval for GAIM syncing of contacts - - - '' - <_summary>GAIM last sync MD5 - <_description>GAIM last sync MD5 - - - '' - <_summary>GAIM last sync time - <_description>GAIM last sync time - - - diff --git a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in deleted file mode 100644 index 84ad60a66c..0000000000 --- a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - 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 deleted file mode 100644 index a82c18170d..0000000000 --- a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - ['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 deleted file mode 100644 index 5ee175adf0..0000000000 --- a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in +++ /dev/null @@ -1,14 +0,0 @@ - - - - '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 deleted file mode 100644 index a5430b7fdd..0000000000 --- a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - 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.itip.gschema.xml.in b/data/org.gnome.evolution.eplugin.itip.gschema.xml.in deleted file mode 100644 index 5e0e1d4567..0000000000 --- a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - false - <_summary>Delete processed - <_description>Whether to delete processed iTip objects - - - diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in deleted file mode 100644 index 025971f32e..0000000000 --- a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in +++ /dev/null @@ -1,49 +0,0 @@ - - - - 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>FIXME - <_description>FIXME - - - 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.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in deleted file mode 100644 index 6e9073da82..0000000000 --- a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in +++ /dev/null @@ -1,14 +0,0 @@ - - - - 'normal' - <_summary>Mode to use when displaying mails - <_description>The mode to use for displaying mails. "normal" makes Evolution choose the best part to show, "prefer_plain" makes it use the text part, if present, and "only_plain" forces Evolution to only show plain text - - - true - <_summary>Whether to show suppressed HTML output - <_description>Whether to show suppressed HTML output - - - diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in deleted file mode 100644 index 5fe07aab07..0000000000 --- a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - ['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 830894ca6d..fdd1e14947 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -520,31 +520,6 @@ <_summary>The default plugin for Junk hook <_description>This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins. - - true - <_summary>Use only local spam tests. - <_description>Use only the local spam tests (no DNS). - - - '' - <_summary>Socket path for SpamAssassin - <_description>Socket path for SpamAssassin - - - true - <_summary>Use SpamAssassin daemon and client - <_description>Use SpamAssassin daemon and client (spamc/spamd). - - - 'spamc' - <_summary>SpamAssassin client binary - <_description>SpamAssassin client binary - - - 'spamd' - <_summary>SpamAssassin daemon binary - <_description>SpamAssassin daemon binary - false <_summary>Determines whether to lookup in address book for sender email diff --git a/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in new file mode 100644 index 0000000000..51779d478d --- /dev/null +++ b/data/org.gnome.evolution.plugin.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.plugin.autocontacts.gschema.xml.in b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in new file mode 100644 index 0000000000..7d9aefc9e9 --- /dev/null +++ b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in @@ -0,0 +1,39 @@ + + + + '' + <_summary>Address book source + <_description>Address book to use for storing automatically synced contacts + + + false + <_summary>Auto sync GAIM contacts + <_description>Whether GAIM contacts should be automaticall synced + + + false + <_summary>Enable autocontacts + <_description>Whether contacts should be automatically added to the user's addressbook + + + '' + <_summary>GAIM address book source + <_description>Address book to use for storing automatically synced contacts from GAIM + + + 10 + <_summary>GAIM check interval + <_description>Check interval for GAIM syncing of contacts + + + '' + <_summary>GAIM last sync MD5 + <_description>GAIM last sync MD5 + + + '' + <_summary>GAIM last sync time + <_description>GAIM last sync time + + + diff --git a/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in b/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in new file mode 100644 index 0000000000..87e526fdb1 --- /dev/null +++ b/data/org.gnome.evolution.plugin.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.plugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.plugin.external-editor.gschema.xml.in new file mode 100644 index 0000000000..f69cc1bc4f --- /dev/null +++ b/data/org.gnome.evolution.plugin.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.plugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.plugin.face-picture.gschema.xml.in new file mode 100644 index 0000000000..b7c7682c52 --- /dev/null +++ b/data/org.gnome.evolution.plugin.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.plugin.itip.gschema.xml.in b/data/org.gnome.evolution.plugin.itip.gschema.xml.in new file mode 100644 index 0000000000..af7513a5e3 --- /dev/null +++ b/data/org.gnome.evolution.plugin.itip.gschema.xml.in @@ -0,0 +1,9 @@ + + + + false + <_summary>Delete processed + <_description>Whether to delete processed iTip objects + + + diff --git a/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in new file mode 100644 index 0000000000..c49d8b0e07 --- /dev/null +++ b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in @@ -0,0 +1,49 @@ + + + + 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>FIXME + <_description>FIXME + + + 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.plugin.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in new file mode 100644 index 0000000000..2cb7477a0d --- /dev/null +++ b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in @@ -0,0 +1,14 @@ + + + + 'normal' + <_summary>Mode to use when displaying mails + <_description>The mode to use for displaying mails. "normal" makes Evolution choose the best part to show, "prefer_plain" makes it use the text part, if present, and "only_plain" forces Evolution to only show plain text + + + true + <_summary>Whether to show suppressed HTML output + <_description>Whether to show suppressed HTML output + + + diff --git a/data/org.gnome.evolution.plugin.templates.gschema.xml.in b/data/org.gnome.evolution.plugin.templates.gschema.xml.in new file mode 100644 index 0000000000..e0163ef8df --- /dev/null +++ b/data/org.gnome.evolution.plugin.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.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in new file mode 100644 index 0000000000..7a95d07a35 --- /dev/null +++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in @@ -0,0 +1,29 @@ + + + + true + <_summary>Use only local spam tests. + <_description>Use only the local spam tests (no DNS). + + + '' + <_summary>Socket path for SpamAssassin + <_description>Socket path for SpamAssassin + + + true + <_summary>Use SpamAssassin daemon and client + <_description>Use SpamAssassin daemon and client (spamc/spamd). + + + 'spamc' + <_summary>SpamAssassin client binary + <_description>SpamAssassin client binary + + + 'spamd' + <_summary>SpamAssassin daemon binary + <_description>SpamAssassin daemon binary + + + -- cgit v1.2.3