X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-recpt-editor.c;h=e77a981eb7db4dd527f9fea9ad409317c020420a;hb=6d11595dfdc07450d9a48bff06a0544ca03a3d56;hp=73be435586020b1bc5e7bf030029b58a1b73f16c;hpb=84c2681caafc791433135f704227111272e45203;p=modest diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c index 73be435..e77a981 100644 --- a/src/widgets/modest-recpt-editor.c +++ b/src/widgets/modest-recpt-editor.c @@ -42,6 +42,7 @@ #include #include #include +#include static GObjectClass *parent_class = NULL; @@ -98,7 +99,7 @@ static gunichar iter_previous_char (GtkTextIter *iter); static GtkTextTag *prev_iter_has_recipient (GtkTextIter *iter); /* static GtkTextTag *next_iter_has_recipient (GtkTextIter *iter); */ static void select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag); - +static gboolean quote_opened (GtkTextIter *iter); /** * modest_recpt_editor_new: @@ -230,6 +231,52 @@ modest_recpt_editor_add_resolved_recipient (ModestRecptEditor *recpt_editor, GSL } +void +modest_recpt_editor_replace_with_resolved_recipient (ModestRecptEditor *recpt_editor, + GtkTextIter *start, GtkTextIter *end, + GSList *email_list, const gchar * recipient_id) +{ + ModestRecptEditorPrivate *priv; + GtkTextBuffer *buffer; + GtkTextTag *tag; + GSList *node; + gboolean is_first_recipient = TRUE; + + g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor)); + priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor); + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view)); + g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor); + + gtk_text_buffer_delete (buffer, start, end); + + tag = gtk_text_buffer_create_tag (buffer, NULL, + "underline", PANGO_UNDERLINE_SINGLE, + "wrap-mode", GTK_WRAP_NONE, + "editable", TRUE, NULL); + + g_object_set_data (G_OBJECT (tag), "recipient-tag-id", GINT_TO_POINTER (RECIPIENT_TAG_ID)); + g_object_set_data_full (G_OBJECT (tag), "recipient-id", g_strdup (recipient_id), (GDestroyNotify) g_free); + + for (node = email_list; node != NULL; node = g_slist_next (node)) { + gchar *recipient = (gchar *) node->data; + + if ((recipient) && (strlen (recipient) != 0)) { + + if (!is_first_recipient) + gtk_text_buffer_insert (buffer, start, "\n", -1); + + gtk_text_buffer_insert_with_tags (buffer, start, recipient, -1, tag, NULL); + + if (node->next != NULL) + gtk_text_buffer_insert (buffer, start, ";", -1); + is_first_recipient = FALSE; + } + } + g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor); + +} + const gchar * modest_recpt_editor_get_recipients (ModestRecptEditor *recpt_editor) @@ -253,9 +300,10 @@ modest_recpt_editor_get_recipients (ModestRecptEditor *recpt_editor) gtk_text_buffer_get_end_iter (buffer, &end); priv->recipients = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); - for (c = priv->recipients; *c == '\0'; c++) { - if (*c == '\n') + for (c = priv->recipients; *c != '\0'; c = g_utf8_next_char (c)) { + if (*c == '\n') { *c = ' '; + } } return priv->recipients; @@ -276,12 +324,14 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class) gtk_button_set_focus_on_click (GTK_BUTTON (priv->abook_button), FALSE); GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS); gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0); - abook_icon = gtk_image_new_from_icon_name ("qgn_list_gene_contacts", GTK_ICON_SIZE_BUTTON); + abook_icon = gtk_image_new_from_icon_name ("qgn_list_addressbook", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon); priv->text_view = gtk_text_view_new (); + priv->scrolled_window = modest_scroll_text_new (GTK_TEXT_VIEW (priv->text_view), 5); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_SHADOW_IN); /* gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->text_view); */ @@ -358,7 +408,6 @@ modest_recpt_editor_on_button_release_event (GtkWidget *widget, buffer = modest_recpt_editor_get_buffer (recpt_editor); mark = gtk_text_buffer_get_insert (buffer); gtk_text_buffer_get_iter_at_mark (buffer, &location, mark); - g_message ("RELEASE OFFSET %d", gtk_text_iter_get_offset (&location)); gtk_text_buffer_get_selection_bounds (buffer, &start, &end); @@ -387,7 +436,6 @@ modest_recpt_editor_on_focus_in (GtkTextView *text_view, ModestRecptEditor *editor) { ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor); - modest_recpt_editor_move_cursor_to_end (editor); gtk_text_view_place_cursor_onscreen (GTK_TEXT_VIEW (priv->text_view)); } @@ -416,7 +464,7 @@ modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer, return; prev_char = gtk_text_iter_get_char (&prev); g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor); - if (prev_char == ';'||prev_char == ',') { + if ((prev_char == ';'||prev_char == ',')&&(!quote_opened(location))) { GtkTextMark *insert; gtk_text_buffer_insert (buffer, location, "\n",-1); insert = gtk_text_buffer_get_insert (buffer); @@ -501,6 +549,31 @@ select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag) gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &start, &end); } +static gboolean +quote_opened (GtkTextIter *iter) +{ + GtkTextIter start; + GtkTextBuffer *buffer; + gboolean opened = FALSE; + + buffer = gtk_text_iter_get_buffer (iter); + gtk_text_buffer_get_start_iter (buffer, &start); + + while (!gtk_text_iter_equal (&start, iter)) { + gunichar current_char = gtk_text_iter_get_char (&start); + if (current_char == '"') + opened = !opened; + else if (current_char == '\\') + gtk_text_iter_forward_char (&start); + if (!gtk_text_iter_equal (&start, iter)) + gtk_text_iter_forward_char (&start); + + } + return opened; + +} + + static gboolean modest_recpt_editor_on_key_press_event (GtkTextView *text_view, GdkEventKey *key, @@ -542,7 +615,6 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view, gboolean cursor_ready = FALSE; while (!cursor_ready) { if (iter_previous_char (&location) == '\n') { - g_message ("INTRO FOUND"); gtk_text_iter_backward_char (&location); } else { cursor_ready = TRUE; @@ -629,15 +701,22 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view, break; case GDK_BackSpace: { + #if GTK_CHECK_VERSION(2, 10, 0) /* gtk_text_buffer_get_has_selection is only available in GTK+ 2.10 */ if (gtk_text_buffer_get_has_selection (buffer)) { gtk_text_buffer_delete_selection (buffer, TRUE, TRUE); return TRUE; } + #else + if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)) { + gtk_text_buffer_delete_selection (buffer, TRUE, TRUE); + return TRUE; + } + #endif + tag = prev_iter_has_recipient (&location); if (tag != NULL) { GtkTextIter iter_in_tag; iter_in_tag = location; - g_message ("DELETE PREV SELECTION"); gtk_text_iter_backward_char (&iter_in_tag); select_tag_of_iter (&iter_in_tag, tag); gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);