aboutsummaryrefslogtreecommitdiffstats
path: root/modules/addressbook
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2011-10-07 20:40:55 +0800
committerDan Vrátil <dvratil@redhat.com>2011-10-07 20:40:55 +0800
commitd2232a718dc86dda4182d154a7fdfe1d218229dc (patch)
tree6dc6c056311e91bc3de202595c43536401af49e4 /modules/addressbook
parent03a438c3acff6e97146836a84da7236b69cd37fe (diff)
downloadgsoc2013-evolution-d2232a718dc86dda4182d154a7fdfe1d218229dc.tar.gz
gsoc2013-evolution-d2232a718dc86dda4182d154a7fdfe1d218229dc.tar.zst
gsoc2013-evolution-d2232a718dc86dda4182d154a7fdfe1d218229dc.zip
Bug #659876 - Make automatic contact address formatting optional
Make behavior introduced in bug #636809 optional by adding checkbox to Preferences->Contacts.
Diffstat (limited to 'modules/addressbook')
-rw-r--r--modules/addressbook/apps_evolution_addressbook.schemas.in12
-rw-r--r--modules/addressbook/autocompletion-config.c12
-rw-r--r--modules/addressbook/e-book-shell-settings.c4
3 files changed, 28 insertions, 0 deletions
diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
index a6506d7a78..82412251a3 100644
--- a/modules/addressbook/apps_evolution_addressbook.schemas.in
+++ b/modules/addressbook/apps_evolution_addressbook.schemas.in
@@ -139,5 +139,17 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
+ <applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
+ <owner>evolution-addressbook</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Enable address formatting</short>
+ <long>Wheter addresses should be formatted according to standard in their destination country.</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 020ad1dc81..be9ddcc427 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -194,6 +194,18 @@ acc_get_general_page (EConfig *ec,
DTFormatKindDateTime, _("_Table column:"));
gtk_widget_show (widget);
+ itembox = add_section (vbox, _("Address formatting"), FALSE);
+
+ widget = gtk_check_button_new_with_label (
+ _("_Format address according to standard of its destination country"));
+ g_object_bind_property (
+ shell_settings, "enable-address-formatting",
+ widget, "active",
+ G_BINDING_BIDIRECTIONAL |
+ G_BINDING_SYNC_CREATE);
+ gtk_box_pack_start (GTK_BOX (itembox), widget, FALSE, FALSE, 0);
+ gtk_widget_show (widget);
+
itembox = add_section (vbox, _("Autocompletion"), TRUE);
widget = gtk_check_button_new_with_mnemonic (
diff --git a/modules/addressbook/e-book-shell-settings.c b/modules/addressbook/e-book-shell-settings.c
index 6be121d2c2..ae2e4f0adf 100644
--- a/modules/addressbook/e-book-shell-settings.c
+++ b/modules/addressbook/e-book-shell-settings.c
@@ -35,4 +35,8 @@ e_book_shell_backend_init_settings (EShell *shell)
e_shell_settings_install_property_for_key (
"book-primary-selection",
"/apps/evolution/addressbook/display/primary_addressbook");
+
+ e_shell_settings_install_property_for_key (
+ "enable-address-formatting",
+ "/apps/evolution/addressbook/display/address_formatting");
}