*/
#include <modest-header-window.h>
+#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon.h>
+#include <modest-maemo-utils.h>
+#endif
#include <modest-scrollable.h>
#include <modest-window-mgr.h>
#include <modest-window-priv.h>
#include <modest-signal-mgr.h>
#include <modest-runtime.h>
#include <modest-platform.h>
-#include <modest-maemo-utils.h>
#include <modest-icon-names.h>
#include <modest-ui-constants.h>
#include <modest-account-mgr.h>
#include <modest-ui-dimming-rules.h>
#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,
CONTENTS_STATE_HEADERS = 2
} ContentsState;
+#ifdef MODEST_TOOLKIT_HILDON2
typedef enum {
EDIT_MODE_COMMAND_MOVE = 1,
EDIT_MODE_COMMAND_DELETE = 2,
} EditModeCommand;
+#endif
typedef struct _ModestHeaderWindowPrivate ModestHeaderWindowPrivate;
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, \
static void on_updating_msg_list (ModestHeaderView *header_view,
gboolean starting,
gpointer user_data);
+#ifdef MODEST_TOOLKIT_HILDON2
static void set_delete_edit_mode (GtkButton *button,
ModestHeaderWindow *self);
static void set_moveto_edit_mode (GtkButton *button,
ModestHeaderWindow *self);
+#endif
static gboolean on_expose_event(GtkTreeView *header_view,
GdkEventExpose *event,
gpointer user_data);
ModestMailOperation *mail_op,
ModestMailOperationQueueNotification type,
ModestHeaderWindow *self);
-static void modest_header_window_pack_toolbar (ModestHildon2Window *self,
+static void modest_header_window_pack_toolbar (ModestWindow *self,
GtkPackType pack_type,
GtkWidget *toolbar);
+#ifdef MODEST_TOOLKIT_HILDON2
static void edit_mode_changed (ModestHeaderWindow *header_window,
gint edit_mode_id,
gboolean enabled,
ModestHeaderWindow *self);
+#endif
static void on_progress_list_changed (ModestWindowMgr *mgr,
ModestHeaderWindow *self);
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 isearch_toolbar_close (GtkWidget *widget,
+ ModestHeaderWindow *obj);
+static void isearch_toolbar_search (GtkWidget *widget,
+ ModestHeaderWindow *obj);
+#ifndef MODEST_TOOLKIT_HILDON2
+static void show_isearch_toolbar (GtkWidget *obj, gpointer data);
+static void toggle_isearch_toolbar (GtkWidget *obj,
+ gpointer data);
+#endif
+
/* globals */
-static GtkWindowClass *parent_class = NULL;
+static ModestWindowParentClass *parent_class = NULL;
#define EMPTYVIEW_XALIGN 0.5
#define EMPTYVIEW_YALIGN 0.5
(GInstanceInitFunc) modest_header_window_init,
NULL
};
- my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
+ my_type = g_type_register_static (
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_TYPE_HILDON2_WINDOW,
+#else
+ MODEST_TYPE_SHELL_WINDOW,
+#endif
"ModestHeaderWindow",
&my_info, 0);
}
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
- ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_header_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate));
modest_window_class->disconnect_signals_func = modest_header_window_disconnect_signals;
- modest_hildon2_window_class->pack_toolbar_func = modest_header_window_pack_toolbar;
+ modest_window_class->pack_toolbar_func = modest_header_window_pack_toolbar;
}
static void
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);
}
-static gboolean
-tap_and_hold_query_cb (GtkWidget *header_view,
- GdkEvent *event,
- gpointer user_data)
-{
- ModestHeaderWindow *self;
- ModestHeaderWindowPrivate *priv;
-
- self = (ModestHeaderWindow *) user_data;
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-
- if (event->type == GDK_BUTTON_PRESS) {
- TnyHeader *header;
-
- priv->x_coord = ((GdkEventButton*)event)->x;
- priv->y_coord = ((GdkEventButton*)event)->y;
-
- /* Enable/Disable mark as (un)read */
- header = modest_header_view_get_header_at_pos ((ModestHeaderView *) header_view,
- priv->x_coord, priv->y_coord);
- if (header) {
- GList *children;
- GtkWidget *mark_read_item, *mark_unread_item;
-
- /* Show "mark as read" or "mark as unread" */
- children = gtk_container_get_children (GTK_CONTAINER (priv->csm_menu));
- mark_read_item = (GtkWidget *) g_list_nth_data (children, 1);
- mark_unread_item = (GtkWidget *) g_list_nth_data (children, 2);
-
- if (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN) {
- gtk_widget_show (mark_unread_item);
- gtk_widget_hide (mark_read_item);
- } else {
- gtk_widget_show (mark_read_item);
- gtk_widget_hide (mark_unread_item);
- }
- g_object_unref (header);
- } else {
- /* Do not show the CSM if there is no header below */
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
static void
delete_header (GtkWindow *parent,
TnyHeader *header)
header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
priv->x_coord, priv->y_coord);
if (header) {
- delete_header ((GtkWindow *) self, header);
+ GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) self);
+ delete_header ((GTK_WIDGET_TOPLEVEL (toplevel)) ? toplevel : NULL, header);
g_object_unref (header);
}
}
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);
}
}
g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self);
}
+/* Returns TRUE if the user clicked over a valid TnyHeader instance */
+static gboolean
+show_context_menu (ModestHeaderWindow *self,
+ GdkEventButton *event)
+{
+ ModestHeaderWindowPrivate *priv;
+ TnyHeader *header;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ priv->x_coord = event->x;
+ priv->y_coord = event->y;
+
+ /* Enable/Disable mark as (un)read */
+ header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view,
+ priv->x_coord, priv->y_coord);
+ if (header) {
+ GList *children;
+ GtkWidget *mark_read_item, *mark_unread_item;
+
+ /* Show "mark as read" or "mark as unread" */
+ children = gtk_container_get_children (GTK_CONTAINER (priv->csm_menu));
+ mark_read_item = (GtkWidget *) g_list_nth_data (children, 1);
+ mark_unread_item = (GtkWidget *) g_list_nth_data (children, 2);
+
+ if (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN) {
+ gtk_widget_show (mark_unread_item);
+ gtk_widget_hide (mark_read_item);
+ } else {
+ gtk_widget_show (mark_read_item);
+ gtk_widget_hide (mark_unread_item);
+ }
+ g_object_unref (header);
+ } else {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+
+#ifdef MAEMO_CHANGES
+static gboolean
+tap_and_hold_query_cb (GtkWidget *header_view,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ /* Ignore other clicks but right button single clicks */
+ if (event->type != GDK_BUTTON_PRESS)
+ return FALSE;
+
+ return !show_context_menu ((ModestHeaderWindow *) user_data,
+ (GdkEventButton *) event);
+}
+#else
+static gboolean
+on_button_press_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ /* Ignore other clicks but right button single clicks */
+ if (event->type != GDK_BUTTON_PRESS || event->button != 3)
+ return FALSE;
+
+ if (show_context_menu ((ModestHeaderWindow *) user_data, event)) {
+ ModestHeaderWindowPrivate *priv;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (user_data);
+ gtk_menu_popup ((GtkMenu *) priv->csm_menu, NULL, NULL,
+ NULL, NULL, event->button, event->time);
+ }
+
+ return FALSE;
+}
+#endif
+
static GtkWidget *
create_header_view (ModestWindow *self, TnyFolder *folder)
{
/* 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_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_read_item);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_unread_item);
+#ifdef MAEMO_CHANGES
hildon_gtk_widget_set_theme_size (delete_item, MODEST_EDITABLE_SIZE);
hildon_gtk_widget_set_theme_size (mark_unread_item, MODEST_EDITABLE_SIZE);
hildon_gtk_widget_set_theme_size (mark_read_item, MODEST_EDITABLE_SIZE);
+#endif
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);
+#else
+ g_signal_connect ((GObject *) header_view, "button-press-event",
+ G_CALLBACK (on_button_press_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",
G_CALLBACK (on_mark_unread_csm_activated), self);
/* Add tap&hold handling */
+#ifdef MAEMO_CHANGES
gtk_widget_tap_and_hold_setup (header_view, priv->csm_menu, NULL, 0);
+#endif
return header_view;
}
GtkWidget *label = NULL;
GtkWidget *align = NULL;
GtkWidget *vbox = NULL;
- GtkWidget *button = NULL;
- GdkPixbuf *new_message_pixbuf;
vbox = gtk_vbox_new (0, FALSE);
align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE);
label = gtk_label_new (_("mcen_ia_nomessages"));
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_helper_set_logical_font (label, "LargeSystemFont");
+#endif
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_widget_show (label);
gtk_widget_show (align);
gtk_container_add (GTK_CONTAINER (align), label);
gtk_box_pack_end (GTK_BOX (vbox), align, TRUE, TRUE, 0);
+#ifdef MODEST_TOOLKIT_HILDON2
+ GdkPixbuf *new_message_pixbuf;
+ GtkWidget *button = NULL;
button = hildon_button_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
g_object_unref (new_message_pixbuf);
gtk_widget_show_all (button);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+#endif
gtk_widget_show (vbox);
+#ifdef MODEST_TOOLKIT_HILDON2
g_signal_connect (button,
"clicked",
G_CALLBACK (modest_ui_actions_on_new_msg), self);
+#endif
viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0),
(GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0));
{
ModestHeaderWindow *self = NULL;
ModestHeaderWindowPrivate *priv = NULL;
- HildonProgram *app;
GdkPixbuf *window_icon;
ModestAccountMgr *mgr;
ModestAccountSettings *settings = NULL;
ModestServerAccountSettings *store_settings = NULL;
- GtkWidget *action_area_box;
- GdkPixbuf *new_message_pixbuf;
GtkWidget *alignment;
gchar *account_display_name = NULL;
-
+#ifdef MODEST_TOOLKIT_HILDON2
+ GtkWidget *live_search;
+#endif
+
self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
priv->contents_view = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
- HILDON_MARGIN_HALF, 0,
- HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
+ MODEST_MARGIN_HALF, 0,
+ MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
/* We need to do this here to properly listen for mail
operations because create_header_view launches a mail
self);
priv->header_view = create_header_view (MODEST_WINDOW (self), folder);
+#ifdef MODEST_TOOLKIT_HILDON2
+ live_search = modest_header_view_setup_live_search (MODEST_HEADER_VIEW (priv->header_view));
+ hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->header_view);
+#endif
priv->empty_view = create_empty_view (MODEST_WINDOW (self));
/* Transform the floating reference in a "hard" reference. We
g_object_ref_sink (priv->header_view);
g_object_ref_sink (priv->empty_view);
+#ifdef MODEST_TOOLKIT_HILDON2
+ GdkPixbuf *new_message_pixbuf;
+ GtkWidget *action_area_box;
+
g_signal_connect (G_OBJECT (self), "edit-mode-changed",
G_CALLBACK (edit_mode_changed), (gpointer) self);
gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
gtk_widget_show_all (priv->new_message_button);
hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE);
+#endif
setup_menu (self);
priv->top_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (alignment), priv->contents_view);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_box_pack_end (GTK_BOX (priv->top_vbox), live_search, FALSE, FALSE, 0);
+#endif
gtk_box_pack_end (GTK_BOX (priv->top_vbox), alignment, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
update_view (self, NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ HildonProgram *app;
+
/* Get device name */
modest_maemo_utils_get_device_name ();
-
app = hildon_program_get_instance ();
hildon_program_add_window (app, HILDON_WINDOW (self));
+#endif
+
/* Set window icon */
window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG);
*/
/* 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_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+#ifdef MODEST_TOOLKIT_HILDON2
modest_window_add_to_menu (MODEST_WINDOW (self),
dngettext(GETTEXT_PACKAGE,
"mcen_me_move_message",
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),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_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));
+#ifndef MODEST_TOOLKIT_HILDON2
+ modest_window_add_to_menu (MODEST_WINDOW (self), _HL("wdgt_bd_search"), "<Control>f",
+ MODEST_WINDOW_MENU_CALLBACK (toggle_isearch_toolbar), NULL);
+#endif
}
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
}
}
+#ifdef MODEST_TOOLKIT_HILDON2
static void
set_delete_edit_mode (GtkButton *button,
ModestHeaderWindow *self)
{
modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE);
}
+#endif
static gboolean
on_expose_event(GtkTreeView *header_view,
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;
}
g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
if (priv->progress_hint) {
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+ modest_window_show_progress (MODEST_WINDOW (self), TRUE);
}
return FALSE;
}
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
if (GTK_WIDGET_VISIBLE (self)) {
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+ modest_window_show_progress (MODEST_WINDOW (self), priv->progress_hint?1:0);
}
}
}
static void
-modest_header_window_pack_toolbar (ModestHildon2Window *self,
+modest_header_window_pack_toolbar (ModestWindow *self,
GtkPackType pack_type,
GtkWidget *toolbar)
{
}
}
+#ifdef MODEST_TOOLKIT_HILDON2
static void
edit_mode_changed (ModestHeaderWindow *header_window,
gint edit_mode_id,
filter);
}
}
+#endif
#ifdef MODEST_TOOLKIT_HILDON2
static void
}
#endif
+#ifdef MODEST_TOOLKIT_HILDON2
static gboolean
on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
{
return FALSE;
}
+#endif
+
+#ifndef MODEST_TOOLKIT_HILDON2
+/* 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);
+}
+#endif
+
+/* 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