Moved "Send&Receive" menu item to the first row.
[modest] / src / hildon2 / modest-header-window.c
index 40b0049..eba8dbc 100644 (file)
 #include <hildon/hildon-banner.h>
 #include <modest-ui-dimming-rules.h>
 #include <modest-tny-folder.h>
+#include <modest-tny-account.h>
 #include <tny-simple-list.h>
 
+#define SHOW_LATEST_SIZE 250
+
 typedef enum {
        CONTENTS_STATE_NONE = 0,
        CONTENTS_STATE_EMPTY = 1,
@@ -644,10 +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);
-       modest_header_view_set_show_latest (MODEST_HEADER_VIEW (header_view), 50);
        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);
 
@@ -694,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);
 
@@ -718,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);
 
@@ -800,13 +827,8 @@ 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);
@@ -920,6 +942,9 @@ static void setup_menu (ModestHeaderWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>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",
@@ -944,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));
@@ -966,6 +998,12 @@ update_view (ModestHeaderWindow *self,
        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);
@@ -1001,9 +1039,20 @@ 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);
+       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);
@@ -1557,7 +1606,8 @@ 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);
+                                                   modest_header_view_get_show_latest (MODEST_HEADER_VIEW (priv->header_view)) + 
+                                                   SHOW_LATEST_SIZE);
                update_view (self, NULL);
        }
 }