Remove warning in editor after removing send tool 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 70c9f8f..409cc25 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -31,6 +31,7 @@
 #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>
 #include <modest-window-priv.h>
 #include <modest-signal-mgr.h>
@@ -164,9 +165,9 @@ static void update_sort_button (ModestHeaderWindow *self);
 static GtkWindowClass *parent_class = NULL;
 
 #define EMPTYVIEW_XALIGN 0.5
-#define EMPTYVIEW_YALIGN 0.0
+#define EMPTYVIEW_YALIGN 0.5
 #define EMPTYVIEW_XSPACE 1.0
-#define EMPTYVIEW_YSPACE 0.0
+#define EMPTYVIEW_YSPACE 1.0
 
 
 
@@ -357,15 +358,24 @@ connect_signals (ModestHeaderWindow *self)
                                           G_CALLBACK (modest_ui_actions_on_new_msg), self);
 }
 
+static void
+folder_refreshed_cb (ModestMailOperation *mail_op,
+                    TnyFolder *folder,
+                    gpointer user_data)
+{
+       /* Update the view (folder could be empty) */
+       update_view (MODEST_HEADER_WINDOW (user_data), NULL);
+}
+
 static GtkWidget *
 create_header_view (ModestWindow *self, TnyFolder *folder)
 {
        GtkWidget *header_view;
 
        header_view  = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
-       modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, 
-                                      TRUE, self, NULL, NULL);
-       modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), 
+       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),
                                       MODEST_HEADER_VIEW_FILTER_NONE);
        modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view),
                                      MODEST_CONF_HEADER_VIEW_KEY);
@@ -376,6 +386,7 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
 static GtkWidget *
 create_empty_view (ModestWindow *self)
 {
+       GtkWidget *viewport = NULL;
        GtkWidget *label = NULL;
        GtkWidget *align = NULL;
        GtkWidget *vbox = NULL;
@@ -386,6 +397,8 @@ create_empty_view (ModestWindow *self)
 
        align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE);
        label = gtk_label_new (_("mcen_ia_nomessages"));
+       hildon_helper_set_logical_font (label, "LargeSystemFont");
+       gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
        gtk_widget_show (label);
        gtk_widget_show (align);
        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);  
@@ -409,7 +422,11 @@ create_empty_view (ModestWindow *self)
                          "clicked",
                          G_CALLBACK (modest_ui_actions_on_new_msg), self);
 
-       return vbox;
+       viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0), 
+                                    (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0));
+       gtk_container_add (GTK_CONTAINER (viewport), vbox);
+
+       return viewport;
 }
 
 static void
@@ -425,7 +442,7 @@ on_vertical_movement (HildonPannableArea *area,
 
 
 ModestWindow *
-modest_header_window_new (TnyFolder *folder, const gchar *account_name)
+modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox)
 {
        ModestHeaderWindow *self = NULL;        
        ModestHeaderWindowPrivate *priv = NULL;
@@ -436,6 +453,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
        ModestServerAccountSettings *store_settings = NULL;
        GtkWidget *action_area_box;
        GdkPixbuf *new_message_pixbuf;
+       GtkWidget *alignment;
        
        self  = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
@@ -443,6 +461,10 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
        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),
+                                  0, 0,
+                                  HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 
        /* We need to do this here to properly listen for mail
           operations because create_header_view launches a mail
@@ -482,10 +504,12 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
        setup_menu (self);
 
         priv->top_vbox = gtk_vbox_new (FALSE, 0);
-       gtk_box_pack_end (GTK_BOX (priv->top_vbox), priv->contents_view, TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (alignment), priv->contents_view);
+       gtk_box_pack_end (GTK_BOX (priv->top_vbox), alignment, TRUE, TRUE, 0);
 
        gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
 
+       gtk_widget_show (alignment);
        gtk_widget_show (priv->contents_view);
        gtk_widget_show (priv->top_vbox);
 
@@ -539,6 +563,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
 
 
        modest_window_set_active_account (MODEST_WINDOW (self), account_name);
+       modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox);
        mgr = modest_runtime_get_account_mgr ();
        settings = modest_account_mgr_load_account_settings (mgr, account_name);
        if (settings) {
@@ -594,6 +619,8 @@ static void setup_menu (ModestHeaderWindow *self)
        g_signal_connect (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);
        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,
@@ -869,6 +896,8 @@ update_progress_hint (ModestHeaderWindow *self)
 
        if (has_active_operations (self)) {
                priv->progress_hint = TRUE;
+       } else {
+               priv->progress_hint = FALSE;
        }
 
        if (!priv->progress_hint && priv->current_store_account) {