#include <gtk/gtktreeselection.h>
#include <gtk/gtkentry.h>
#include <modest-maemo-utils.h>
+#include <modest-toolkit-utils.h>
static OssoABookContactModel *contact_model = NULL;
static EBook *book = NULL;
static GSList *select_email_addrs_for_contact(GList * email_addr_list);
static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, GSList **contact_id, gboolean *canceled);
static gchar *unquote_string (const gchar *str);
+static void set_contact_from_display_name (EContact *contact, const gchar *display_name);
static gboolean
open_addressbook ()
name_label = gtk_label_new(contact_name);
gtk_misc_set_alignment(GTK_MISC(name_label), 0.0, 0.5);
cptn_cntrl =
- modest_maemo_utils_create_captioned (size_group, NULL,
- _("mcen_ia_add_email_name"), FALSE,
- name_label);
+ modest_toolkit_utils_create_captioned (size_group, NULL,
+ _("mcen_ia_add_email_name"), FALSE,
+ name_label);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(add_email_addr_to_contact_dlg)->vbox), cptn_cntrl,
FALSE, FALSE, 0);
email_entry = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
- cptn_cntrl = modest_maemo_utils_create_captioned (size_group, NULL,
- _("mcen_fi_add_email_name"), FALSE,
- email_entry);
+ cptn_cntrl = modest_toolkit_utils_create_captioned (size_group, NULL,
+ _("mcen_fi_add_email_name"), FALSE,
+ email_entry);
hildon_gtk_entry_set_input_mode(GTK_ENTRY(email_entry), HILDON_GTK_INPUT_MODE_FULL);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(add_email_addr_to_contact_dlg)->vbox), cptn_cntrl,
TRUE, TRUE, 0);
if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) {
gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset);
gchar *message = g_strdup_printf(
- _CS("ckdg_ib_illegal_characters_entered"),
+ _CS_ILLEGAL_CHARACTERS_ENTERED,
char_in_string);
g_free (char_in_string);
hildon_banner_show_information (
if (display_address) {
modest_text_utils_get_display_address (display_address);
if ((display_address[0] != '\0') && (strlen (display_address) != strlen (address)))
- e_contact_set (contact, E_CONTACT_FULL_NAME, (const gpointer)display_address);
+ set_contact_from_display_name (contact, (const gchar *) display_address);
g_free (display_address);
}
if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
gchar *message =
- g_strdup_printf(_CS("ckdg_ib_illegal_characters_entered"),
+ g_strdup_printf(_CS_ILLEGAL_CHARACTERS_ENTERED,
char_in_string);
g_free (char_in_string);
hildon_banner_show_information (NULL, NULL, message );
gchar *unquoted;
GetContactsInfo *info;
EBookQuery *queries[10];
+ gint i;
if (name == NULL)
return NULL;
unquoted = unquote_string (name);
- queries[0] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[1] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[2] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[3] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[4] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[5] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[6] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[7] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[8] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[9] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- book_query = e_book_query_or (10, queries, TRUE);
+ i = 0;
+ queries[i++] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ if (strchr (name, '@')) {
+ queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ }
+ queries[i] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+ book_query = e_book_query_or (i, queries, TRUE);
g_free (unquoted);
return result;
}
+static void
+set_contact_from_display_name (EContact *contact, const gchar *disp_name)
+{
+ const gchar *parent_open;
+ const gchar *comma_separator;
+ GString *buffer;
+ gchar *display_name;
+
+ display_name = unquote_string (disp_name);
+ buffer = g_string_new ("");
+
+ /* First we remove part in () */
+ parent_open = g_strstr_len (display_name, -1, "(");
+ if (parent_open) {
+ const gchar *parent_close;
+
+ parent_close = g_strstr_len (parent_open, -1, ")");
+
+ buffer = g_string_append_len (buffer, display_name, parent_open - display_name);
+ if (parent_close) {
+ buffer = g_string_append (buffer, parent_close + 1);
+ }
+ } else {
+ buffer = g_string_append (buffer, display_name);
+ }
+
+ comma_separator = g_strstr_len (buffer->str, -1, ", ");
+ if (comma_separator) {
+ gchar *surname, *name;
+ surname = g_strndup (buffer->str, comma_separator - buffer->str);
+ name = g_strdup (comma_separator + 2);
+
+ e_contact_set (contact, E_CONTACT_FAMILY_NAME, (const gpointer) surname);
+ e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) name);
+ g_free (name);
+ g_free (surname);
+ } else {
+ e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) buffer->str);
+ }
+
+ g_string_free (buffer, TRUE);
+ g_free (display_name);
+}
static GList *
select_contacts_for_name_dialog (const gchar *name)
e_book_query_unref (composite_query);
}
+static void
+selector_on_response (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ if (response_id == GTK_RESPONSE_OK) {
+ gchar *current_selection = NULL;
+ GtkTreePath *selected_row = NULL;
+ HildonTouchSelector *selector;
+
+ selector = hildon_picker_dialog_get_selector (HILDON_PICKER_DIALOG (dialog));
+ selected_row = hildon_touch_selector_get_last_activated_row (selector, 0);
+ if (selected_row) {
+ GtkTreeIter iter;
+ GtkTreeModel *model = hildon_touch_selector_get_model (selector, 0);
+ if (gtk_tree_model_get_iter (model, &iter, selected_row)) {
+ gtk_tree_model_get (model, &iter, 0, ¤t_selection, -1);
+ modest_address_book_add_address (current_selection, user_data);
+ g_debug ("Current selection : %s", current_selection);
+ g_free (current_selection);
+ }
+ }
+ }
+
+ if (response_id != GTK_RESPONSE_DELETE_EVENT)
+ gtk_widget_destroy ((GtkWidget *) dialog);
+}
+
+static void
+selector_selection_changed (HildonTouchSelector * selector,
+ gint column,
+ gpointer *user_data)
+{
+ /* Close the dialog */
+ gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
+}
+
void
modest_address_book_add_address_list_with_selector (GSList *address_list, GtkWindow *parent)
{
GtkWidget *picker_dialog;
- GtkWidget *selector;
+ HildonTouchSelector *selector;
GSList *node;
- gchar *selected = NULL;
+ GtkTreeModel *model;
gboolean contacts_to_add = FALSE;
- selector = hildon_touch_selector_new_text ();
- g_object_ref (selector);
+ /* We cannot use hildon_touch_selector_new_text() because
+ there is a bug in hildon that does not retrieve the current
+ selected text when using MODES_NORMAL. So we need a
+ temporary workaround here */
+ selector = (HildonTouchSelector*) hildon_touch_selector_new ();
+
+ model = (GtkTreeModel *) gtk_list_store_new (1, G_TYPE_STRING);
+ hildon_touch_selector_append_text_column (selector, model, TRUE);
+ hildon_touch_selector_set_hildon_ui_mode (selector, HILDON_UI_MODE_NORMAL);
+ g_object_unref (model);
for (node = address_list; node != NULL; node = g_slist_next (node)) {
const gchar *recipient = (const gchar *) node->data;
if (modest_text_utils_validate_recipient (recipient, NULL)) {
if (!modest_address_book_has_address (recipient)) {
- hildon_touch_selector_append_text ((HildonTouchSelector *) selector,
- recipient);
+ GtkTreeIter iter;
+ gtk_list_store_append ((GtkListStore *) model, &iter);
+ gtk_list_store_set ((GtkListStore *) model, &iter, 0, recipient, -1);
contacts_to_add = TRUE;
}
}
}
if (contacts_to_add) {
- gint picker_result;
-
picker_dialog = hildon_picker_dialog_new (parent);
gtk_window_set_title (GTK_WINDOW (picker_dialog), _("mcen_me_viewer_addtocontacts"));
hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (picker_dialog),
- HILDON_TOUCH_SELECTOR (selector));
+ selector);
- picker_result = gtk_dialog_run (GTK_DIALOG (picker_dialog));
-
- if (picker_result == GTK_RESPONSE_OK) {
- selected = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector));
- }
- gtk_widget_destroy (picker_dialog);
+ g_signal_connect ((GObject*) selector, "changed",
+ G_CALLBACK (selector_selection_changed), picker_dialog);
- if (selected)
- modest_address_book_add_address (selected, parent);
- g_free (selected);
+ g_signal_connect ((GObject*) picker_dialog, "response",
+ G_CALLBACK (selector_on_response), parent);
+ gtk_widget_show (picker_dialog);
} else {
- g_object_unref (selector);
+ gtk_widget_destroy ((GtkWidget *) selector);
}
}
projects / modest / blobdiff