Now we also show mailboxes window from dbus calls for show account

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

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 6816dde..1b08bdc 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>
@@ -108,7 +109,7 @@ static void connect_signals (ModestHeaderWindow *self);
 static void modest_header_window_disconnect_signals (ModestWindow *self);
 
 static void setup_menu (ModestHeaderWindow *self);
-static GtkWidget *create_empty_view (void);
+static GtkWidget *create_empty_view (ModestWindow *self);
 static GtkWidget *create_header_view (ModestWindow *progress_window,
                                      TnyFolder *folder);
 
@@ -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
 
 
 
@@ -235,6 +236,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->queue_change_handler = 0;
        priv->current_store_account = NULL;
        priv->sort_button = NULL;
+       priv->new_message_button = NULL;
        
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
                                            GTK_WINDOW(obj),
@@ -373,19 +375,49 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
 }
 
 static GtkWidget *
-create_empty_view (void)
+create_empty_view (ModestWindow *self)
 {
+       GtkWidget *viewport = NULL;
        GtkWidget *label = NULL;
        GtkWidget *align = NULL;
+       GtkWidget *vbox = NULL;
+       GtkWidget *button = NULL;
+       GdkPixbuf *new_message_pixbuf;
+
+       vbox = gtk_vbox_new (0, FALSE);
 
        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);  
        gtk_container_add (GTK_CONTAINER (align), label);
+       gtk_box_pack_end (GTK_BOX (vbox), align, TRUE, TRUE, 0);
+
+       button = hildon_button_new (MODEST_EDITABLE_SIZE, 
+                                   HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+       hildon_button_set_title (HILDON_BUTTON (button), _("mcen_ti_new_message"));
+       new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
+       hildon_button_set_image (HILDON_BUTTON (button), 
+                                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);
+
+       gtk_widget_show (vbox);
+
+       g_signal_connect (button,
+                         "clicked",
+                         G_CALLBACK (modest_ui_actions_on_new_msg), self);
 
-       return align;
+       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
@@ -401,7 +433,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;
@@ -412,6 +444,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);
@@ -419,6 +452,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
@@ -430,7 +467,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name)
                                  self);
 
        priv->header_view  = create_header_view (MODEST_WINDOW (self), folder);
-       priv->empty_view = create_empty_view ();
+       priv->empty_view = create_empty_view (MODEST_WINDOW (self));
 
        /* Transform the floating reference in a "hard" reference. We
           need to do this because the widgets could be added/removed
@@ -458,10 +495,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);
 
@@ -515,6 +554,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) {
@@ -845,6 +885,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) {