Show count of visible messages in show more button.

[modest] / src / hildon2 / modest-header-window.c

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 6490842..40b0049 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -28,8 +28,6 @@
  */
 
 #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>
@@ -73,6 +71,7 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *contents_view;
        GtkWidget *top_vbox;
        GtkWidget *new_message_button;
+       GtkWidget *show_more_button;
 
        /* state bar */
        ContentsState contents_state;
@@ -179,6 +178,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;
@@ -258,6 +258,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;
@@ -416,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) {
@@ -478,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;
                }
        }
 
@@ -636,6 +646,7 @@ 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);
@@ -789,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);
@@ -809,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 ();
 
@@ -949,6 +961,9 @@ 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));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
@@ -963,14 +978,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);
 
@@ -983,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 
@@ -1519,3 +1543,21 @@ 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)) + 50);
+               update_view (self, NULL);
+       }
+}