From 224f26b84d9c12b0dd1d337f51c14b6ebb901007 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 4 Sep 2011 09:48:24 -0400 Subject: GtkApplication has some new EShell-like features. I pushed a few EShell features up to GtkApplication for GTK+ 3.2, so we can now trim off the redundancies in EShell. 1) GtkApplication has a new "window-added" signal which replaces EShell's own "window-created" signal. 2) GtkApplication has a new "window-removed" signal which replaces EShell's own "window-destroyed" signal. 3) gtk_application_get_windows() now returns a list of windows sorted by most recently focused, replacing e_shell_get_watched_windows(). 4) GtkApplication now provides enough hooks to subclasses that we can remove e_shell_watch_window() and call gtk_application_add_window() directly. --- modules/addressbook/e-book-shell-backend.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/addressbook') diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index c52b39b9fa..92341e4a3f 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -440,8 +440,8 @@ book_shell_backend_handle_uri_cb (EShellBackend *shell_backend, } static void -book_shell_backend_window_created_cb (EShellBackend *shell_backend, - GtkWindow *window) +book_shell_backend_window_added_cb (EShellBackend *shell_backend, + GtkWindow *window) { const gchar *backend_name; @@ -525,8 +525,8 @@ book_shell_backend_constructed (GObject *object) shell_backend); g_signal_connect_swapped ( - shell, "window-created", - G_CALLBACK (book_shell_backend_window_created_cb), + shell, "window-added", + G_CALLBACK (book_shell_backend_window_added_cb), shell_backend); e_book_shell_backend_init_settings (shell); -- cgit v1.2.3 From d2232a718dc86dda4182d154a7fdfe1d218229dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 7 Oct 2011 14:40:55 +0200 Subject: Bug #659876 - Make automatic contact address formatting optional Make behavior introduced in bug #636809 optional by adding checkbox to Preferences->Contacts. --- modules/addressbook/apps_evolution_addressbook.schemas.in | 12 ++++++++++++ modules/addressbook/autocompletion-config.c | 12 ++++++++++++ modules/addressbook/e-book-shell-settings.c | 4 ++++ 3 files changed, 28 insertions(+) (limited to 'modules/addressbook') 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 @@ + + /schemas/apps/evolution/addressbook/display/address_formatting + /apps/evolution/addressbook/display/address_formatting + evolution-addressbook + bool + true + + Enable address formatting + Wheter addresses should be formatted according to standard in their destination country. + + + 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"); } -- cgit v1.2.3 From a3775515de53af55bf4f269315dfda51ae66cfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 7 Oct 2011 16:04:17 +0200 Subject: Fix typo in schema file in commit d2232a7 --- modules/addressbook/apps_evolution_addressbook.schemas.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/addressbook') diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in index 82412251a3..cf9f098e90 100644 --- a/modules/addressbook/apps_evolution_addressbook.schemas.in +++ b/modules/addressbook/apps_evolution_addressbook.schemas.in @@ -147,7 +147,7 @@ true Enable address formatting - Wheter addresses should be formatted according to standard in their destination country. + Whether addresses should be formatted according to standard in their destination country. -- cgit v1.2.3