X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=40b0049cd9870c08ac17f36b1bb413dadb1c4787;hp=6f9019006ce99a4498c9be7ba48812dd302aba16;hb=e9e2bac4ba8052305253fcf4fc9c2dab8266b1ac;hpb=a4703e7a3ab041bcc15f1154440508408a498859 diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 6f90190..40b0049 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -28,8 +28,6 @@ */ #include -#include -#include #include #include #include @@ -73,12 +71,11 @@ struct _ModestHeaderWindowPrivate { GtkWidget *contents_view; GtkWidget *top_vbox; GtkWidget *new_message_button; + GtkWidget *show_more_button; /* state bar */ ContentsState contents_state; - TnyFolder *folder; - /* autoscroll */ gboolean autoscroll; @@ -89,6 +86,8 @@ struct _ModestHeaderWindowPrivate { /* signals */ GSList *sighandlers; gulong queue_change_handler; + gulong sort_column_handler; + gulong notify_model; /* progress hint */ gboolean progress_hint; @@ -101,6 +100,9 @@ struct _ModestHeaderWindowPrivate { GtkWidget *csm_menu; gdouble x_coord; gdouble y_coord; + + /* weak refs */ + GtkTreeModel *model_weak_ref; }; #define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_HEADER_WINDOW, \ @@ -110,6 +112,7 @@ struct _ModestHeaderWindowPrivate { 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); @@ -170,6 +173,12 @@ static void on_horizontal_movement (HildonPannableArea *hildonpannable, gdouble initial_x, gdouble initial_y, 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; @@ -217,6 +226,7 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass) 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)); @@ -238,17 +248,20 @@ modest_header_window_init (ModestHeaderWindow *obj) priv->top_vbox = NULL; priv->contents_view = NULL; priv->contents_state = CONTENTS_STATE_NONE; - priv->folder = NULL; priv->updating_banner = NULL; priv->updating_banner_timeout = 0; priv->autoscroll = TRUE; priv->progress_hint = FALSE; priv->queue_change_handler = 0; + priv->sort_column_handler = 0; + priv->model_weak_ref = NULL; 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), @@ -256,16 +269,43 @@ modest_header_window_init (ModestHeaderWindow *obj) } static void +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); - tny_folder_sync_async (TNY_FOLDER (priv->folder), - FALSE, NULL, NULL, NULL); + if (priv->model_weak_ref) { + g_object_weak_unref ((GObject *) priv->model_weak_ref, + on_header_view_model_destroyed, + obj); + if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler); + } + on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref); + } + + modest_header_window_disconnect_signals (MODEST_WINDOW (obj)); - g_object_unref (priv->folder); g_object_unref (priv->header_view); g_object_unref (priv->empty_view); @@ -274,10 +314,6 @@ modest_header_window_finalize (GObject *obj) priv->current_store_account = NULL; } - /* Sanity check: shouldn't be needed, the window mgr should - call this function before */ - modest_header_window_disconnect_signals (MODEST_WINDOW (obj)); - if (priv->updating_banner_timeout > 0) { g_source_remove (priv->updating_banner_timeout); priv->updating_banner_timeout = 0; @@ -294,12 +330,34 @@ static void modest_header_window_disconnect_signals (ModestWindow *self) { ModestHeaderWindowPrivate *priv; + 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)) + priv->queue_change_handler)) { g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), priv->queue_change_handler); + priv->queue_change_handler = 0; + } + + if (priv->header_view) { + GtkTreeModel *sortable; + + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)); + if (sortable) { + if (g_signal_handler_is_connected (G_OBJECT (sortable), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (sortable), + priv->sort_column_handler); + priv->sort_column_handler = 0; + } + } + } modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers); priv->sighandlers = NULL; @@ -308,11 +366,8 @@ modest_header_window_disconnect_signals (ModestWindow *self) static void connect_signals (ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv; - GtkTreeSortable *sortable; - - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); +{ + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); /* header view */ @@ -337,15 +392,6 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_expose_event), self); - sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); - - priv->sighandlers = - modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (sortable), - "sort-column-changed", - G_CALLBACK (on_sort_column_changed), - self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (self), @@ -371,6 +417,12 @@ connect_signals (ModestHeaderWindow *self) "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) { @@ -381,6 +433,10 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_horizontal_movement), self); } + + + g_signal_connect(G_OBJECT(self), "key-press-event", + G_CALLBACK(on_key_press), self); } static void @@ -429,6 +485,9 @@ tap_and_hold_query_cb (GtkWidget *header_view, gtk_widget_hide (mark_unread_item); } g_object_unref (header); + } else { + /* Do not show the CSM if there is no header below */ + return TRUE; } } @@ -529,6 +588,56 @@ on_mark_unread_csm_activated (GtkMenuItem *item, } } +static void +on_header_view_model_destroyed (gpointer user_data, + GObject *model) +{ + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + if (!GTK_IS_WIDGET (self)) + return; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + priv->model_weak_ref = NULL; + + priv->sort_column_handler = 0; +} + +static void +on_header_view_model_changed (GObject *gobject, + GParamSpec *arg1, + gpointer user_data) +{ + ModestHeaderWindow *self = (ModestHeaderWindow *) user_data; + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (gobject)); + + if (priv->model_weak_ref ) { + g_object_weak_unref ((GObject *) priv->model_weak_ref, + on_header_view_model_destroyed, + self); + if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler); + } + on_header_view_model_destroyed (self, (GObject *) priv->model_weak_ref); + } + + if (!model) + return; + + /* Connect the signal. Listen to object destruction to disconnect it */ + priv->sort_column_handler = g_signal_connect ((GObject *) model, + "sort-column-changed", + G_CALLBACK (on_sort_column_changed), + self); + priv->model_weak_ref = model; + g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self); +} + static GtkWidget * create_header_view (ModestWindow *self, TnyFolder *folder) { @@ -537,6 +646,11 @@ create_header_view (ModestWindow *self, TnyFolder *folder) ModestHeaderWindowPrivate *priv; header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); + 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_header_view_set_filter (MODEST_HEADER_VIEW (header_view), @@ -545,7 +659,6 @@ create_header_view (ModestWindow *self, TnyFolder *folder) 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")); @@ -650,8 +763,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL)); priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); - priv->folder = g_object_ref (folder); - priv->contents_view = hildon_pannable_area_new (); alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), @@ -689,8 +800,13 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc 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); @@ -709,10 +825,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc 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 (); @@ -808,7 +920,12 @@ static void setup_menu (ModestHeaderWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "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_move_messages"), NULL, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), + dngettext(GETTEXT_PACKAGE, + "mcen_me_move_message", + "mcen_me_move_messages", + 2), + NULL, APP_MENU_CALLBACK (set_moveto_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to)); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL, @@ -820,8 +937,8 @@ static void setup_menu (ModestHeaderWindow *self) priv->sort_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL); hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort")); - g_signal_connect (G_OBJECT (priv->sort_button), "clicked", - G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self); + g_signal_connect_after (G_OBJECT (priv->sort_button), "clicked", + G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self); hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER); hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); @@ -843,10 +960,17 @@ update_view (ModestHeaderWindow *self, gboolean refilter = FALSE; gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; + TnyFolder *folder; + gchar *show_more_value; + guint visible; + guint all_count; g_return_if_fail (MODEST_IS_HEADER_WINDOW(self)); priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - g_return_if_fail (priv->folder); + + folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view); + if (!folder) + return; if (change != NULL) { TnyFolderChangeChanged changed; @@ -854,15 +978,18 @@ update_view (ModestHeaderWindow *self, changed = tny_folder_change_get_changed (change); /* If something changes */ if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) - folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0); + all_count = (guint) tny_folder_change_get_new_all_count (change); else - folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0); + all_count = (guint) tny_folder_get_all_count (folder); + folder_empty = (all_count == 0); if ((changed) & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) refilter = TRUE; } else { - folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0); + all_count = (guint) tny_folder_get_all_count (folder); + folder_empty = (all_count == 0); } + g_object_unref (folder); /* Check if all messages are marked to be deleted */ all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW (priv->header_view)); @@ -873,6 +1000,13 @@ update_view (ModestHeaderWindow *self, if (refilter) modest_header_view_refilter (MODEST_HEADER_VIEW (priv->header_view)); + + visible = gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)), + NULL); + show_more_value = g_strdup_printf (_("TODO: %d of %d shown"), visible, all_count); + + hildon_button_set_value (HILDON_BUTTON (priv->show_more_button), + show_more_value); } static void @@ -1282,6 +1416,12 @@ update_sort_button (ModestHeaderWindow *self) const gchar *value = NULL; priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + /* This could happen as the first time the model is set the + header_view is still not assigned to priv->header_view */ + if (!priv->header_view) + return; + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); if (!gtk_tree_sortable_get_sort_column_id (sortable, @@ -1371,3 +1511,53 @@ on_horizontal_movement (HildonPannableArea *hildonpannable, 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); + update_view (self, NULL); + } +}