This is a manual merge of branch drop split view intro trunk.

[modest] / src / widgets / modest-recpt-editor.c

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index c145a19..97e0ddd 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -46,7 +46,7 @@
 
 /* FIXNE: we should have no maemo-deps in widgets/ */
 #ifndef MODEST_TOOLKIT_GTK
 
 /* 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*/
 
 
 #endif /*!MODEST_TOOLKIT_GTK*/
 
 

@@ -135,7 +135,11 @@ modest_recpt_editor_set_recipients (ModestRecptEditor *recpt_editor, const gchar
        g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
        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));
        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);
 
        valid_recipients = create_valid_text (recipients, -1);
        g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);

@@ -161,7 +165,11 @@ modest_recpt_editor_add_recipients (ModestRecptEditor *recpt_editor, const gchar
        if (recipients == NULL)
                return;
 
        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));
        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);
 
        if (gtk_text_buffer_get_char_count (buffer) > 0) {
                string_to_add = g_strconcat (";\n", recipients, NULL);

@@ -196,7 +204,11 @@ modest_recpt_editor_add_resolved_recipient (ModestRecptEditor *recpt_editor, GSL
        g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
        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));
        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);
 
        g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
        gtk_text_buffer_get_bounds (buffer, &start, &end);

@@ -257,7 +269,11 @@ modest_recpt_editor_replace_with_resolved_recipient (ModestRecptEditor *recpt_ed
        g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
        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));
        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);
        g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
 
        gtk_text_buffer_delete (buffer, start, end);

@@ -306,7 +322,11 @@ modest_recpt_editor_get_recipients (ModestRecptEditor *recpt_editor)
                priv->recipients = NULL;
        }
 
                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));
        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);
 
        gtk_text_buffer_get_start_iter (buffer, &start);
        gtk_text_buffer_get_end_iter (buffer, &end);

@@ -337,13 +357,17 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS);
        gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0);
 #ifdef MODEST_TOOLKIT_HILDON2
        GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS);
        gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0);
 #ifdef MODEST_TOOLKIT_HILDON2

-       abook_icon = gtk_image_new_from_icon_name ("tasklaunch_contact_64", GTK_ICON_SIZE_BUTTON);
+       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);
 
 #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 ();
        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), 
        /* 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), 

@@ -352,6 +376,10 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        
        priv->recipients = NULL;
 
        
        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);
        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);

@@ -360,6 +388,7 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 
        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_start (GTK_BOX (instance), priv->scrolled_window, TRUE, TRUE, 0);
 /*     gtk_box_pack_start (GTK_BOX (instance), priv->text_view, TRUE, TRUE, 0); */

+#endif

        gtk_box_pack_end (GTK_BOX (instance), priv->abook_button, FALSE, FALSE, 0);
 
        gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (priv->text_view), FALSE);
        gtk_box_pack_end (GTK_BOX (instance), priv->abook_button, FALSE, FALSE, 0);
 
        gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (priv->text_view), FALSE);

@@ -371,7 +400,11 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 
        gtk_widget_set_size_request (priv->text_view, 75, -1);
 
 
        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));
        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->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);

@@ -392,7 +425,11 @@ modest_recpt_editor_set_field_size_group (ModestRecptEditor *recpt_editor, GtkSi
        g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
        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);
        gtk_size_group_add_widget (size_group, priv->scrolled_window);

+#endif

 }
 
 GtkTextBuffer *
 }
 
 GtkTextBuffer *

@@ -403,7 +440,11 @@ modest_recpt_editor_get_buffer (ModestRecptEditor *recpt_editor)
        g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), NULL);
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
        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));
        return gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));

+#endif

 }
 
 static void
 }
 
 static void

@@ -706,7 +747,11 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
        GtkTextIter location, selection_loc;
        GtkTextTag *tag;
      
        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);
        buffer = gtk_text_view_get_buffer (text_view);

+#endif

        insert = gtk_text_buffer_get_insert (buffer);
        selection = gtk_text_buffer_get_selection_bound (buffer);
 
        insert = gtk_text_buffer_get_insert (buffer);
        selection = gtk_text_buffer_get_selection_bound (buffer);
 

@@ -863,7 +908,11 @@ static void
 modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor)
 {
        ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
 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));
        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);
        GtkTextIter start, end;
 
        gtk_text_buffer_get_end_iter (buffer, &start);