*/
#include <modest-header-window.h>
-#include <modest-osso-state-saving.h>
-#include <libosso.h>
#include <hildon/hildon-pannable-area.h>
#include <hildon/hildon-helper.h>
#include <modest-window-mgr.h>
GtkWidget *contents_view;
GtkWidget *top_vbox;
GtkWidget *new_message_button;
+ GtkWidget *show_more_button;
/* state bar */
ContentsState contents_state;
GSList *sighandlers;
gulong queue_change_handler;
gulong sort_column_handler;
+ gulong notify_model;
/* progress hint */
gboolean progress_hint;
static void modest_header_window_class_init (ModestHeaderWindowClass *klass);
static void modest_header_window_init (ModestHeaderWindow *obj);
static void modest_header_window_finalize (GObject *obj);
+static void modest_header_window_dispose (GObject *obj);
static void connect_signals (ModestHeaderWindow *self);
static void modest_header_window_disconnect_signals (ModestWindow *self);
gpointer user_data);
static void on_header_view_model_destroyed (gpointer user_data,
GObject *model);
+static gboolean on_key_press(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
+static void modest_header_window_show_more (GtkAction *action, ModestWindow *win);
/* globals */
static GtkWindowClass *parent_class = NULL;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_header_window_finalize;
+ gobject_class->dispose = modest_header_window_dispose;
g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate));
priv->current_store_account = NULL;
priv->sort_button = NULL;
priv->new_message_button = NULL;
+ priv->show_more_button = NULL;
priv->x_coord = 0;
priv->y_coord = 0;
+ priv->notify_model = 0;
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
}
static void
-modest_header_window_finalize (GObject *obj)
+modest_header_window_dispose (GObject *obj)
{
ModestHeaderWindowPrivate *priv;
TnyFolder *folder;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
+ folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
+ if (folder) {
+ tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
+ g_object_unref (folder);
+ }
+
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
+modest_header_window_finalize (GObject *obj)
+{
+ ModestHeaderWindowPrivate *priv;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
+
if (priv->model_weak_ref) {
g_object_weak_unref ((GObject *) priv->model_weak_ref,
on_header_view_model_destroyed,
on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref);
}
- folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
- if (folder) {
- tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
- g_object_unref (folder);
- }
-
modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
g_object_unref (priv->header_view);
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+ if (g_signal_handler_is_connected ((GObject*) priv->header_view, priv->notify_model)) {
+ g_signal_handler_disconnect ((GObject*) priv->header_view, priv->notify_model);
+ priv->notify_model = 0;
+ }
+
if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
priv->queue_change_handler)) {
g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
"clicked",
G_CALLBACK (modest_ui_actions_on_new_msg), self);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->show_more_button),
+ "clicked",
+ G_CALLBACK (modest_header_window_show_more), self);
+
/* Delete using horizontal gesture */
/* DISABLED because it's unreliabile */
if (FALSE) {
G_CALLBACK (on_horizontal_movement),
self);
}
+
+
+ g_signal_connect(G_OBJECT(self), "key-press-event",
+ G_CALLBACK(on_key_press), self);
}
static void
gtk_widget_hide (mark_unread_item);
}
g_object_unref (header);
+ } else {
+ /* Do not show the CSM if there is no header below */
+ return TRUE;
}
}
ModestHeaderWindowPrivate *priv;
header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
- g_signal_connect ((GObject*) header_view, "notify::model",
- G_CALLBACK (on_header_view_model_changed), self);
+ modest_header_view_set_show_latest (MODEST_HEADER_VIEW (header_view), 50);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+ priv->notify_model = g_signal_connect ((GObject*) header_view, "notify::model",
+ G_CALLBACK (on_header_view_model_changed), self);
modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder,
TRUE, self, folder_refreshed_cb, self);
MODEST_CONF_HEADER_VIEW_KEY);
/* Create CSM menu */
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
priv->csm_menu = gtk_menu_new ();
delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
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), _("TODO: show 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_show_all (priv->show_more_button);
hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE);
setup_menu (self);
update_view (self, NULL);
- /* Load previous osso state, for instance if we are being restored from
- * hibernation: */
- modest_osso_load_state ();
-
/* Get device name */
modest_maemo_utils_get_device_name ();
g_object_unref (header);
}
}
+
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+ ModestHeaderWindowPrivate *priv;
+ HildonPannableArea *pannable;
+ /* FIXME: set scroll_speed depends on for how long the key was pressed */
+ gint scroll_speed = 3;
+
+ if (event->type == GDK_KEY_RELEASE)
+ return FALSE;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(user_data);
+
+ pannable = HILDON_PANNABLE_AREA (priv->contents_view);
+
+ switch (event->keyval) {
+
+ case GDK_Up:
+ priv->autoscroll = FALSE;
+ modest_maemo_utils_scroll_pannable(pannable, 0, -scroll_speed);
+ break;
+
+ case GDK_Down:
+ priv->autoscroll = FALSE;
+ modest_maemo_utils_scroll_pannable(pannable, 0, scroll_speed);
+ break;
+ }
+
+ return FALSE;
+}
+
+static void
+modest_header_window_show_more (GtkAction *action, ModestWindow *win)
+{
+ ModestHeaderWindow *self;
+ ModestHeaderWindowPrivate *priv = NULL;
+
+ self = MODEST_HEADER_WINDOW (win);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+ if (!priv->header_view)
+ return;
+
+ if (modest_header_view_get_not_latest (MODEST_HEADER_VIEW (priv->header_view)) > 0) {
+ modest_header_view_set_show_latest (MODEST_HEADER_VIEW (priv->header_view),
+ modest_header_view_get_show_latest (MODEST_HEADER_VIEW (priv->header_view)) + 50);
+ }
+}
projects / modest / blobdiff