X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=eba8dbc5bd550ebb0679c81d3ed6c774a5651505;hp=9abe2b05e97a88df3b3adddd9997ac0af9f1d294;hb=10f5f523434f5204cf6b2c2ee5302f964af0559c;hpb=4eed73e6ad57291561801592a3d81f6d584c47e9 diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 9abe2b0..eba8dbc 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 @@ -52,8 +50,11 @@ #include #include #include +#include #include +#define SHOW_LATEST_SIZE 250 + typedef enum { CONTENTS_STATE_NONE = 0, CONTENTS_STATE_EMPTY = 1, @@ -73,6 +74,7 @@ struct _ModestHeaderWindowPrivate { GtkWidget *contents_view; GtkWidget *top_vbox; GtkWidget *new_message_button; + GtkWidget *show_more_button; /* state bar */ ContentsState contents_state; @@ -113,6 +115,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); @@ -178,6 +181,7 @@ static void on_header_view_model_destroyed (gpointer user_data, 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; @@ -225,6 +229,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)); @@ -256,6 +261,7 @@ modest_header_window_init (ModestHeaderWindow *obj) 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; @@ -266,13 +272,29 @@ modest_header_window_init (ModestHeaderWindow *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, @@ -285,12 +307,6 @@ modest_header_window_finalize (GObject *obj) 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); @@ -404,6 +420,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) { @@ -466,6 +488,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; } } @@ -622,9 +647,26 @@ create_header_view (ModestWindow *self, TnyFolder *folder) GtkWidget *header_view; GtkWidget *delete_item, *mark_read_item, *mark_unread_item; ModestHeaderWindowPrivate *priv; + TnyAccount *account; + ModestProtocolType protocol_type; + gboolean limit_headers; - header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); + + account = modest_tny_folder_get_account (folder); + limit_headers = FALSE; + if (account) { + protocol_type = modest_tny_account_get_protocol_type (account); + if (modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), + protocol_type, + MODEST_PROTOCOL_REGISTRY_STORE_LIMIT_HEADER_WINDOW)) { + limit_headers = TRUE; + } + } + modest_header_view_set_show_latest (MODEST_HEADER_VIEW (header_view), limit_headers?SHOW_LATEST_SIZE:0); + priv->notify_model = g_signal_connect ((GObject*) header_view, "notify::model", G_CALLBACK (on_header_view_model_changed), self); @@ -671,8 +713,12 @@ create_empty_view (ModestWindow *self) GtkWidget *label = NULL; GtkWidget *align = NULL; GtkWidget *vbox = NULL; + GtkWidget *hbox = NULL; GtkWidget *button = NULL; GdkPixbuf *new_message_pixbuf; + ModestHeaderWindowPrivate *priv; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); vbox = gtk_vbox_new (0, FALSE); @@ -695,7 +741,11 @@ create_empty_view (ModestWindow *self) gtk_image_new_from_pixbuf (new_message_pixbuf)); g_object_unref (new_message_pixbuf); gtk_widget_show_all (button); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + + 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 (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (vbox); @@ -797,10 +847,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 (); @@ -896,6 +942,9 @@ 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_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", @@ -920,9 +969,16 @@ static void setup_menu (ModestHeaderWindow *self) 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)); @@ -937,8 +993,17 @@ update_view (ModestHeaderWindow *self, 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)); + + /* It could happen when some event is received and the window + was previously closed */ + if (!MODEST_IS_HEADER_WINDOW (self)) + return; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view); @@ -951,14 +1016,16 @@ 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 (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 (folder)) == 0); + all_count = (guint) tny_folder_get_all_count (folder); + folder_empty = (all_count == 0); } g_object_unref (folder); @@ -971,6 +1038,24 @@ update_view (ModestHeaderWindow *self, if (refilter) modest_header_view_refilter (MODEST_HEADER_VIEW (priv->header_view)); + + visible = modest_header_view_get_show_latest (MODEST_HEADER_VIEW (priv->header_view)); + + if (visible > 0 && all_count > 0 && visible < all_count && folder_empty) { + modest_header_view_set_show_latest (MODEST_HEADER_VIEW (priv->header_view), visible + SHOW_LATEST_SIZE); + } + + if (visible > all_count) + visible = all_count; + if (visible == 0 || visible == all_count) { + gtk_widget_hide_all (priv->show_more_button); + } else { + gtk_widget_show_all (priv->show_more_button); + } + 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); } static void @@ -1507,3 +1592,22 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) 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)) + + SHOW_LATEST_SIZE); + update_view (self, NULL); + } +}