#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,
/* 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, \
static void update_progress_hint (ModestHeaderWindow *self);
static void on_header_view_model_destroyed (gpointer user_data,
GObject *model);
+#ifdef MODEST_TOOLKIT_HILDON2
static gboolean on_key_press(GtkWidget *widget,
GdkEventKey *event,
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;
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestHeaderWindow",
&my_info, 0);
priv->y_coord = 0;
priv->notify_model = 0;
- modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
- GTK_WINDOW(obj),
- "applications_email_headerview");
}
static void
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);
}
G_OBJECT (modest_runtime_get_window_mgr ()),
"progress-list-changed",
G_CALLBACK (on_progress_list_changed), self);
+
+#ifdef MODEST_TOOLKIT_HILDON2
priv->sighandlers =
modest_signal_mgr_connect (priv->sighandlers,
G_OBJECT (priv->new_message_button),
"clicked",
G_CALLBACK (modest_ui_actions_on_new_msg), self);
-#ifdef MODEST_TOOLKIT_HILDON2
/* Delete using horizontal gesture */
/* DISABLED because it's unreliabile */
if (HILDON_IS_PANNABLE_AREA (priv->contents_view)) {
#endif
+#ifdef MODEST_TOOLKIT_HILDON2
g_signal_connect(G_OBJECT(self), "key-press-event",
G_CALLBACK(on_key_press), self);
+#endif
}
static void
update_view (MODEST_HEADER_WINDOW (user_data), NULL);
}
+#ifdef MAEMO_CHANGES
static gboolean
tap_and_hold_query_cb (GtkWidget *header_view,
GdkEvent *event,
return FALSE;
}
+#endif
static void
delete_header (GtkWindow *parent,
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);
}
}
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);
}
}
/* Create CSM menu */
priv->csm_menu = gtk_menu_new ();
- delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
+ delete_item = gtk_menu_item_new_with_label (_HL_DELETE);
mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
mark_unread_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_unread"));
gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item);
gtk_widget_show_all (priv->csm_menu);
/* Connect signals */
+#ifdef MAEMO_CHANGES
g_signal_connect ((GObject *) header_view, "tap-and-hold-query",
G_CALLBACK (tap_and_hold_query_cb), self);
+#endif
g_signal_connect ((GObject *) delete_item, "activate",
G_CALLBACK (on_delete_csm_activated), self);
g_signal_connect ((GObject *) mark_read_item, "activate",
/* setup edit modes */
#ifdef MODEST_TOOLKIT_HILDON2
modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
- _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"),
+ _("mcen_ti_edit_delete"), _HL_DELETE,
GTK_TREE_VIEW (priv->header_view),
GTK_SELECTION_MULTIPLE,
EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
- _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
+ _("mcen_ti_edit_move"), _HL_MOVE,
GTK_TREE_VIEW (priv->header_view),
GTK_SELECTION_MULTIPLE,
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);
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL,
MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+#else
+ modest_window_add_to_menu (MODEST_WINDOW (self),
+ dngettext(GETTEXT_PACKAGE,
+ "mcen_me_move_message",
+ "mcen_me_move_messages",
+ 2),
+ NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_move_to),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_delete_message),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
#endif
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_folder_details"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
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_window_add_item_to_menu (MODEST_WINDOW (self), GTK_BUTTON (priv->show_more_button),
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->show_more_button,
NULL);
gtk_widget_hide_all (priv->show_more_button);
#endif
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
gdk_threads_enter ();
priv->updating_banner =
modest_platform_animation_banner (GTK_WIDGET (user_data), NULL,
- _CS ("ckdg_pb_updating"));
+ _CS_UPDATING);
/* We need this because banners in Maemo could be
destroyed by dialogs so we need to properly update
gpointer user_data)
{
ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
- ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+#ifdef MODEST_TOOLKIT_HILDON2
+ ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
if (priv->autoscroll)
modest_scrollable_jump_to (MODEST_SCROLLABLE (priv->contents_view), 0.0, 0.0);
+#endif
return FALSE;
}
}
#endif
+#ifdef MODEST_TOOLKIT_HILDON2
static gboolean
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)));
+
+}
projects / modest / blobdiff