Bug #205137 - Configurable date formats in components

3 files changed, 20 insertions, 4 deletions

diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index 823d5bd89f..4000f01526 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -115,10 +115,10 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="evolution2:config_item:title" type="string"
-		_value="Autocompletion"/>
+		_value="Contacts"/>
 
 	<oaf_attribute name="evolution2:config_item:description" type="string"
-		_value="Configure autocomplete here"/>
+		_value="Configure contacts and autocompletion here"/>
 
 	<oaf_attribute name="evolution2:config_item:icon_name" type="string"
 		value="preferences-autocompletion"/>
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 9773f5bd5b..ebb2381e1e 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -39,6 +39,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "e-util/e-datetime-format.h"
+
 
 typedef struct {
 	EvolutionConfigControl *config_control;
@@ -159,7 +161,7 @@ autocompletion_config_control_new (void)
 {
 	AutocompletionConfig *ac;
 	CORBA_Environment ev;
-	GtkWidget *scrolledwin, *vbox, *itembox, *w;
+	GtkWidget *scrolledwin, *vbox, *itembox, *w, *table;
 
 	ac = g_new0 (AutocompletionConfig, 1);
 
@@ -177,6 +179,11 @@ autocompletion_config_control_new (void)
 	g_signal_connect (w, "toggled", (GCallback)show_address_check_toggled_cb, ac);
 	gtk_box_pack_start (GTK_BOX (itembox), w, FALSE, FALSE, 0);
 
+	itembox = add_section (vbox, _("Date/Time Format"), FALSE);
+	table = gtk_table_new (1, 3, FALSE);
+	gtk_box_pack_start (GTK_BOX (itembox), table, TRUE, TRUE, 0);
+	e_datetime_format_add_setup_widget (table, 0, "addressbook", "table",  DTFormatKindDateTime, _("Table column:"));
+
 	itembox = add_section (vbox, _("Look up in address books"), TRUE);
 
 	ac->source_list =  e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources");
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 25e55666d4..283b25f89f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -26,6 +26,7 @@
 #include <glib/gi18n.h>
 #include <table/e-table-scrolled.h>
 #include <table/e-table-model.h>
+#include <table/e-cell-date.h>
 #include <misc/e-gui-utils.h>
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <filter/rule-editor.h>
@@ -1281,18 +1282,26 @@ static void
 create_table_view (EABView *view)
 {
 	ETableModel *adapter;
+	ETableExtras *extras;
+	ECell *cell;
 	GtkWidget *table;
 	gchar *etspecfile;
 
 	adapter = eab_table_adapter_new(view->model);
 
+	extras = e_table_extras_new ();
+
+	/* set proper format component for a default 'date' cell renderer */
+	cell = e_table_extras_get_cell (extras, "date");
+	e_cell_date_set_format_component (E_CELL_DATE (cell), "addressbook");
+
 	/* Here we create the table.  We give it the three pieces of
 	   the table we've created, the header, the model, and the
 	   initial layout.  It does the rest.  */
 	etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
 				       "e-addressbook-view.etspec",
 				       NULL);
-	table = e_table_scrolled_new_from_spec_file (adapter, NULL, etspecfile, NULL);
+	table = e_table_scrolled_new_from_spec_file (adapter, extras, etspecfile, NULL);
 	g_free (etspecfile);
 
 	view->object = G_OBJECT(adapter);