#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
+#include <modest-ui-constants.h>
/* FIXNE: we should have no maemo-deps in widgets/ */
#ifndef MODEST_TOOLKIT_GTK
-#include "maemo/modest-hildon-includes.h"
+#include "modest-hildon-includes.h"
#endif /*!MODEST_TOOLKIT_GTK*/
+#define RECPT_BUTTON_WIDTH_HILDON2 118
+
static GObjectClass *parent_class = NULL;
GtkWidget *abook_button;
GtkWidget *scrolled_window;
gchar *recipients;
-
+ gulong on_mark_set_handler;
};
#define MODEST_RECPT_EDITOR_GET_PRIVATE(o) \
/* widget events */
static void modest_recpt_editor_on_abook_clicked (GtkButton *button,
ModestRecptEditor *editor);
-static gboolean modest_recpt_editor_on_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- ModestRecptEditor *editor);
static void modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor);
-static void modest_recpt_editor_on_focus_in (GtkTextView *text_view,
+static gboolean modest_recpt_editor_on_focus_in (GtkTextView *text_view,
GdkEventFocus *event,
ModestRecptEditor *editor);
+static void modest_recpt_editor_on_mark_set (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextMark *mark,
+ ModestRecptEditor *editor);
static void modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer,
GtkTextIter *location,
gchar *text,
{
ModestRecptEditor *self = g_object_new (MODEST_TYPE_RECPT_EDITOR,
"homogeneous", FALSE,
- "spacing", 1,
+ "spacing", MODEST_MARGIN_NONE,
NULL);
return GTK_WIDGET (self);
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
valid_recipients = create_valid_text (recipients, -1);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
if (recipients == NULL)
return;
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
if (gtk_text_buffer_get_char_count (buffer) > 0) {
string_to_add = g_strconcat (";\n", recipients, NULL);
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
gtk_text_buffer_get_bounds (buffer, &start, &end);
GtkTextIter *start, GtkTextIter *end,
GSList *email_list, const gchar * recipient_id)
{
+ GSList *email_lists_list;
+ GSList *recipient_ids_list;
+
+ email_lists_list = g_slist_append (NULL, email_list);
+ recipient_ids_list = g_slist_append (NULL, (gpointer) recipient_id);
+
+ modest_recpt_editor_replace_with_resolved_recipients (recpt_editor, start, end,
+ email_lists_list, recipient_ids_list);
+
+ g_slist_free (email_lists_list);
+ g_slist_free (recipient_ids_list);
+
+}
+
+void
+modest_recpt_editor_replace_with_resolved_recipients (ModestRecptEditor *recpt_editor,
+ GtkTextIter *start, GtkTextIter *end,
+ GSList *email_lists_list, GSList * recipient_ids_list)
+{
ModestRecptEditorPrivate *priv;
GtkTextBuffer *buffer;
GtkTextTag *tag;
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
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;
+ while (email_lists_list) {
+ gchar *recipient_id = (gchar *) recipient_ids_list->data;
+ GSList *email_list = (GSList *) email_lists_list->data;
+
+
+ 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;
+ }
}
+
+ email_lists_list = g_slist_next (email_lists_list);
+ recipient_ids_list = g_slist_next (recipient_ids_list);
}
g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
priv->recipients = NULL;
}
+#ifdef MODEST_TOOKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
{
ModestRecptEditorPrivate *priv;
GtkWidget *abook_icon;
+ GtkWidget *abook_align;
GtkTextBuffer *buffer;
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
priv->abook_button = gtk_button_new ();
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_widget_set_size_request (priv->abook_button, RECPT_BUTTON_WIDTH_HILDON2, -1);
+#else
gtk_button_set_relief (GTK_BUTTON (priv->abook_button), GTK_RELIEF_NONE);
+#endif
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);
+ gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 0.5, 0.5);
+#ifdef MODEST_TOOLKIT_HILDON2
+ abook_icon = gtk_image_new_from_icon_name ("general_contacts", HILDON_ICON_SIZE_FINGER);
+#else
abook_icon = gtk_image_new_from_icon_name ("qgn_list_addressbook", GTK_ICON_SIZE_BUTTON);
+#endif
gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon);
+#ifdef MODEST_TOOLKIT_HILDON2
+ priv->text_view = hildon_text_view_new ();
+#else
priv->text_view = gtk_text_view_new ();
+#endif
/* Auto-capitalization is the default, so let's turn it off: */
#ifdef MAEMO_CHANGES
hildon_gtk_text_view_set_input_mode (GTK_TEXT_VIEW (priv->text_view),
priv->recipients = NULL;
+#ifdef MODEST_TOOLKIT_HILDON2
+ priv->scrolled_window = NULL;
+ gtk_box_pack_start (GTK_BOX (instance), priv->text_view, TRUE, TRUE, 0);
+#else
priv->scrolled_window = modest_scroll_text_new (GTK_TEXT_VIEW (priv->text_view), 1024);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start (GTK_BOX (instance), priv->scrolled_window, TRUE, TRUE, 0);
/* gtk_box_pack_start (GTK_BOX (instance), priv->text_view, TRUE, TRUE, 0); */
- gtk_box_pack_end (GTK_BOX (instance), priv->abook_button, FALSE, FALSE, 0);
+#endif
+ abook_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (abook_align), 0, 0, MODEST_MARGIN_DEFAULT, 0);
+ gtk_container_add (GTK_CONTAINER (abook_align), priv->abook_button);
+ gtk_box_pack_end (GTK_BOX (instance), abook_align, FALSE, FALSE, 0);
gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (priv->text_view), FALSE);
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (priv->text_view), TRUE);
gtk_widget_set_size_request (priv->text_view, 75, -1);
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
g_signal_connect (G_OBJECT (priv->abook_button), "clicked", G_CALLBACK (modest_recpt_editor_on_abook_clicked), instance);
- g_signal_connect (G_OBJECT (priv->text_view), "button-release-event", G_CALLBACK (modest_recpt_editor_on_button_release_event), instance);
g_signal_connect (G_OBJECT (priv->text_view), "key-press-event", G_CALLBACK (modest_recpt_editor_on_key_press_event), instance);
g_signal_connect (G_OBJECT (priv->text_view), "focus-in-event", G_CALLBACK (modest_recpt_editor_on_focus_in), instance);
g_signal_connect (G_OBJECT (buffer), "insert-text", G_CALLBACK (modest_recpt_editor_on_insert_text), instance);
-/* gtk_container_set_focus_child (GTK_CONTAINER (instance), priv->text_view); */
+ priv->on_mark_set_handler = g_signal_connect (G_OBJECT (buffer), "mark-set",
+ G_CALLBACK (modest_recpt_editor_on_mark_set),
+ instance);
return;
}
g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_size_group_add_widget (size_group, priv->text_view);
+#else
gtk_size_group_add_widget (size_group, priv->scrolled_window);
+#endif
}
GtkTextBuffer *
g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), NULL);
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ return hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
return gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
}
static void
g_signal_emit_by_name (G_OBJECT (editor), "open-addressbook");
}
-static gboolean
-modest_recpt_editor_on_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- ModestRecptEditor *recpt_editor)
+static void
+modest_recpt_editor_on_mark_set (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextMark *mark,
+ ModestRecptEditor *recpt_editor)
{
ModestRecptEditorPrivate *priv;
- GtkTextIter location, start, end;
- GtkTextMark *mark;
- GtkTextBuffer *buffer;
+ GtkTextIter start, end;
+ GtkTextMark *selection_bound;
GtkTextTag *tag;
gboolean selection_changed = FALSE;
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
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);
+ selection_bound = gtk_text_buffer_get_selection_bound (buffer);
+
+ if (mark != selection_bound)
+ return;
gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
}
if (selection_changed) {
+ /* We block this signal handler in order to prevent a
+ stack overflow caused by recursive calls to this
+ handler as the select_range call could issue a
+ "mark-set" signal */
+ g_signal_handler_block (recpt_editor, priv->on_mark_set_handler);
gtk_text_buffer_select_range (buffer, &start, &end);
- } else {
- GTK_TEXT_VIEW (priv->text_view)->pending_place_cursor_button = 0;
+ g_signal_handler_unblock (recpt_editor, priv->on_mark_set_handler);
}
-
- return FALSE;
}
-static void
+static gboolean
modest_recpt_editor_on_focus_in (GtkTextView *text_view,
GdkEventFocus *event,
ModestRecptEditor *editor)
{
ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
gtk_text_view_place_cursor_onscreen (GTK_TEXT_VIEW (priv->text_view));
+
+ return FALSE;
}
static gboolean
GtkTextIter location, selection_loc;
GtkTextTag *tag;
+#ifdef MODEST_TOOLKIT_HILDON2
+ buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (text_view));
+#else
buffer = gtk_text_view_get_buffer (text_view);
+#endif
insert = gtk_text_buffer_get_insert (buffer);
selection = gtk_text_buffer_get_selection_bound (buffer);
modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor)
{
ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
+#ifdef MODEST_TOOLKIT_HILDON2
+ GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
+#else
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
+#endif
GtkTextIter start, end;
gtk_text_buffer_get_end_iter (buffer, &start);
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
- gtk_widget_grab_focus (priv->text_view);
+ if (GTK_WIDGET_VISIBLE (recpt_editor)) {
+ gtk_widget_grab_focus (priv->text_view);
+ }
}
gboolean
g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
- return gtk_widget_is_focus (priv->text_view);
+ return GTK_WIDGET_VISIBLE (priv->text_view) &&
+ gtk_widget_is_focus (priv->text_view);
}
static void
ModestRecptEditorPrivate *priv;
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (object);
+ if (g_signal_handler_is_connected (object, priv->on_mark_set_handler))
+ g_signal_handler_disconnect (object, priv->on_mark_set_handler);
+ priv->on_mark_set_handler = 0;
+
if (priv->recipients) {
g_free (priv->recipients);
priv->recipients = NULL;
projects / modest / blobdiff