Change default show latest size to 250

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

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index eaf6471..f89121f 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -52,6 +52,8 @@
 #include <modest-tny-folder.h>
 #include <tny-simple-list.h>
 
+#define SHOW_LATEST_SIZE 250
+
 typedef enum {
        CONTENTS_STATE_NONE = 0,
        CONTENTS_STATE_EMPTY = 1,
@@ -806,7 +808,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc
        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);
+       gtk_widget_hide_all (priv->show_more_button);
        hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE);
        
        setup_menu (self);
@@ -961,6 +963,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);
@@ -975,14 +980,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);
 
@@ -995,6 +1002,18 @@ 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 > all_count)
+               visible = all_count;
+       if (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 (_("TODO: %d of %d shown"), visible, all_count);
+
+       hildon_button_set_value (HILDON_BUTTON (priv->show_more_button),
+                                show_more_value);
 }
 
 static void 
@@ -1546,5 +1565,6 @@ modest_header_window_show_more (GtkAction *action, ModestWindow *win)
        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);
        }
 }