Add bottom send button in editor. It's only shown when the top button is

[modest] / src / widgets / modest-header-window.c

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index 0809147..d163a76 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -51,6 +51,7 @@
 #include <modest-tny-folder.h>
 #include <tny-simple-list.h>
 #include <gdk/gdkkeysyms.h>
+#include <modest-isearch-toolbar.h>
 
 typedef enum {
        CONTENTS_STATE_NONE = 0,
@@ -101,6 +102,8 @@ struct _ModestHeaderWindowPrivate {
 
        /* weak refs */
        GtkTreeModel *model_weak_ref;
+
+       GtkWidget   *isearch_toolbar;
 };
 #define MODEST_HEADER_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                          MODEST_TYPE_HEADER_WINDOW, \
@@ -182,6 +185,15 @@ static gboolean on_key_press(GtkWidget *widget,
                                        gpointer user_data);
 #endif
 
+static void  show_isearch_toolbar   (GtkWidget *obj, gpointer data);
+static void  isearch_toolbar_close  (GtkWidget *widget,
+                                    ModestHeaderWindow *obj);
+static void  isearch_toolbar_search (GtkWidget *widget,
+                                    ModestHeaderWindow *obj);
+static void  toggle_isearch_toolbar (GtkWidget *obj,
+                                    gpointer data);
+
+
 /* globals */
 static GtkWindowClass *parent_class = NULL;
 
@@ -550,7 +562,11 @@ on_mark_read_csm_activated (GtkMenuItem *item,
                                                       priv->x_coord, priv->y_coord);
 
        if (header) {
+               gchar *uid;
                tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+               uid = modest_tny_folder_get_header_unique_id (header);
+               modest_platform_emit_msg_read_changed_signal (uid, TRUE);
+               g_free (uid);
                g_object_unref (header);
        }
 }
@@ -570,7 +586,11 @@ on_mark_unread_csm_activated (GtkMenuItem *item,
                                                       priv->x_coord, priv->y_coord);
 
        if (header) {
+               gchar *uid;
                tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
+               uid = modest_tny_folder_get_header_unique_id (header);
+               modest_platform_emit_msg_read_changed_signal (uid, FALSE);
+               g_free (uid);
                g_object_unref (header);
        }
 }
@@ -848,6 +868,14 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
 #endif
 
+       priv->isearch_toolbar = modest_toolkit_factory_create_isearch_toolbar (modest_runtime_get_toolkit_factory (),
+                                                                              NULL);
+       modest_window_add_toolbar (MODEST_WINDOW (self), GTK_TOOLBAR (priv->isearch_toolbar));
+       g_signal_connect (G_OBJECT (priv->isearch_toolbar), "isearch-close", 
+                         G_CALLBACK (isearch_toolbar_close), self);
+       g_signal_connect (G_OBJECT (priv->isearch_toolbar), "isearch-search", 
+                         G_CALLBACK (isearch_toolbar_search), self);
+
 
        modest_window_set_active_account (MODEST_WINDOW (self), account_name);
        modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox);
@@ -957,6 +985,8 @@ static void setup_menu (ModestHeaderWindow *self)
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_cancel_send),
                                   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _HL("wdgt_bd_search"), "<Control>f",
+                                  MODEST_WINDOW_MENU_CALLBACK (toggle_isearch_toolbar), NULL);
 }
 
 static void 
@@ -1476,3 +1506,57 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
        return FALSE;
 }
 #endif
+
+/* Used for the Ctrl+F accelerator */
+static void
+toggle_isearch_toolbar (GtkWidget *obj,
+                       gpointer data)
+{
+       ModestHeaderWindow *window = MODEST_HEADER_WINDOW (data);
+       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (window);
+
+       if (GTK_WIDGET_VISIBLE (priv->isearch_toolbar)) {
+               isearch_toolbar_close (obj, data);
+       } else {
+               show_isearch_toolbar (obj, data);
+       }
+}
+
+/* Handler for menu option */
+static void
+show_isearch_toolbar (GtkWidget *obj,
+                     gpointer data)
+{
+       ModestHeaderWindow *window = MODEST_HEADER_WINDOW (data);
+       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (window);
+
+       gtk_widget_show (priv->isearch_toolbar);
+       modest_isearch_toolbar_highlight_entry (MODEST_ISEARCH_TOOLBAR (priv->isearch_toolbar), TRUE);
+}
+
+/* Handler for click on the "X" close button in isearch toolbar */
+static void
+isearch_toolbar_close (GtkWidget *widget,
+                      ModestHeaderWindow *obj)
+{
+       ModestHeaderWindowPrivate *priv;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (obj);
+
+       /* Hide toolbar */
+       gtk_widget_hide (priv->isearch_toolbar);
+
+       modest_header_view_set_filter_string (MODEST_HEADER_VIEW (priv->header_view), NULL);
+}
+
+static void
+isearch_toolbar_search (GtkWidget *widget,
+                       ModestHeaderWindow *obj)
+{
+       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (obj);
+
+       /* TODO: set filter */
+       modest_header_view_set_filter_string (MODEST_HEADER_VIEW (priv->header_view), 
+                                             modest_isearch_toolbar_get_search (MODEST_ISEARCH_TOOLBAR (priv->isearch_toolbar)));
+
+}