#include <hildon/hildon-button.h>
#include <hildon/hildon-program.h>
#include <hildon/hildon-banner.h>
+#include <hildon/hildon-find-toolbar.h>
#include <modest-ui-dimming-rules.h>
#include <modest-tny-folder.h>
#include <modest-tny-account.h>
#include <tny-simple-list.h>
+#include <gdk/gdkkeysyms.h>
#define SHOW_LATEST_SIZE 250
GtkWidget *top_vbox;
GtkWidget *new_message_button;
GtkWidget *show_more_button;
- GtkWidget *show_more_button2;
/* state bar */
ContentsState contents_state;
/* 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, \
gpointer user_data);
static void modest_header_window_show_more (GtkAction *action, ModestWindow *win);
+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;
priv->sort_button = NULL;
priv->new_message_button = NULL;
priv->show_more_button = NULL;
- priv->show_more_button2 = NULL;
priv->x_coord = 0;
priv->y_coord = 0;
priv->notify_model = 0;
folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
if (folder) {
- tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
+ tny_folder_sync_async (folder, TRUE, NULL, NULL, NULL);
g_object_unref (folder);
}
"clicked",
G_CALLBACK (modest_header_window_show_more), self);
- priv->sighandlers =
- modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT (priv->show_more_button2),
- "clicked",
- G_CALLBACK (modest_header_window_show_more), self);
-
/* Delete using horizontal gesture */
/* DISABLED because it's unreliabile */
if (FALSE) {
MODEST_PROTOCOL_REGISTRY_STORE_LIMIT_HEADER_WINDOW)) {
limit_headers = TRUE;
}
+ g_object_unref (account);
}
modest_header_view_set_show_latest (MODEST_HEADER_VIEW (header_view), limit_headers?SHOW_LATEST_SIZE:0);
g_object_unref (new_message_pixbuf);
gtk_widget_show_all (button);
- priv->show_more_button2 = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
- hildon_button_set_title (HILDON_BUTTON (priv->show_more_button2), _("mcen_va_more"));
- gtk_widget_hide_all (priv->show_more_button2);
-
hbox = gtk_hbox_new (TRUE, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->show_more_button2, TRUE, TRUE, 0);
-
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
ModestWindow *
modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox)
{
- ModestHeaderWindow *self = NULL;
+ ModestHeaderWindow *self = NULL;
ModestHeaderWindowPrivate *priv = NULL;
HildonProgram *app;
GdkPixbuf *window_icon;
GdkPixbuf *new_message_pixbuf;
GtkWidget *alignment;
gchar *account_display_name = NULL;
-
+
self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
g_object_unref (new_message_pixbuf);
- priv->show_more_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
- hildon_button_set_title (HILDON_BUTTON (priv->show_more_button), _("mcen_va_more"));
-
gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (action_area_box), priv->show_more_button, TRUE, TRUE, 0);
gtk_widget_show_all (priv->new_message_button);
- gtk_widget_hide_all (priv->show_more_button);
hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE);
-
+
setup_menu (self);
priv->top_vbox = gtk_vbox_new (FALSE, 0);
GTK_SELECTION_MULTIPLE,
EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
+ priv->isearch_toolbar = hildon_find_toolbar_new (NULL);
+ hildon_window_add_toolbar (HILDON_WINDOW (self), GTK_TOOLBAR (priv->isearch_toolbar));
+ g_signal_connect (G_OBJECT (priv->isearch_toolbar), "close",
+ G_CALLBACK (isearch_toolbar_close), self);
+ g_signal_connect (G_OBJECT (priv->isearch_toolbar), "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);
} else {
folder_name = modest_tny_folder_get_display_name (folder);
}
-
+
gtk_window_set_title (GTK_WINDOW (self), folder_name);
g_free (folder_name);
}
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
dngettext(GETTEXT_PACKAGE,
"mcen_me_move_message",
hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button),
modest_ui_dimming_rules_on_sort);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
- APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+
+ priv->show_more_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+ hildon_button_set_title (HILDON_BUTTON (priv->show_more_button), _("mcen_va_more"));
+ hildon_button_set_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5, 1.0, 1.0);
+ hildon_button_set_title_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5);
+ hildon_button_set_value_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5);
+ modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->show_more_button),
+ NULL);
+ gtk_widget_hide_all (priv->show_more_button);
+
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("Find..."), NULL,
+ APP_MENU_CALLBACK (toggle_isearch_toolbar), NULL);
}
static void
visible = all_count;
if (visible == 0 || visible == all_count) {
gtk_widget_hide_all (priv->show_more_button);
- gtk_widget_hide_all (priv->show_more_button2);
} else {
gtk_widget_show_all (priv->show_more_button);
- gtk_widget_show_all (priv->show_more_button2);
}
show_more_value = g_strdup_printf (_("mcen_va_more_toview"), visible, all_count);
hildon_button_set_value (HILDON_BUTTON (priv->show_more_button),
show_more_value);
- hildon_button_set_value (HILDON_BUTTON (priv->show_more_button2),
- show_more_value);
}
static void
update_view (self, NULL);
}
}
+
+/* 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);
+ hildon_find_toolbar_highlight_entry (HILDON_FIND_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);
+ gchar *current_search;
+
+ g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL);
+
+ if (current_search && *current_search == '\0') {
+ g_free (current_search);
+ current_search = NULL;
+ }
+
+ /* TODO: set filter */
+ modest_header_view_set_filter_string (MODEST_HEADER_VIEW (priv->header_view),
+ current_search);
+ g_free (current_search);
+}