Now header window edit toolbar is outside the pannable.

Things done:
   * Remove new message button from header window
   * Now the contents view embeds directly the header view in header
     window

pmo-drop-split-view-r6740

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 9277e15..26721e8 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -68,7 +68,7 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *header_view;
        GtkWidget *empty_view;
        GtkWidget *contents_view;
-       GtkWidget *new_message_button;
+       GtkWidget *top_vbox;
        GtkWidget *edit_toolbar;
 
        /* state bar */
@@ -202,6 +202,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
        
        priv->header_view = NULL;
        priv->empty_view = NULL;
+       priv->top_vbox = NULL;
        priv->edit_mode = FALSE;
        priv->edit_command = EDIT_MODE_COMMAND_NONE;
        priv->edit_toolbar = NULL;
@@ -279,11 +280,6 @@ connect_signals (ModestHeaderWindow *self)
        
        /* TODO: connect header view activate */
 
-       /* new message button */
-
-       g_signal_connect (G_OBJECT (priv->new_message_button), "clicked",
-                         G_CALLBACK (modest_ui_actions_on_new_msg), (gpointer) self);
-       
        /* window */
 
        /* we don't register this in sighandlers, as it should be run after disconnecting all signals,
@@ -341,39 +337,27 @@ modest_header_window_new (TnyFolder *folder)
        ModestHeaderWindowPrivate *priv = NULL;
        HildonProgram *app;
        GdkPixbuf *window_icon;
-       GtkWidget *pannable;
        
        self  = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
 
        priv->folder = g_object_ref (folder);
 
-       pannable = hildon_pannable_area_new ();
+       priv->contents_view = hildon_pannable_area_new ();
 
        priv->header_view  = create_header_view (MODEST_WINDOW (self), folder);
        priv->empty_view = create_empty_view ();
        g_object_ref (priv->header_view);
        g_object_ref (priv->empty_view);
-       priv->contents_view = gtk_vbox_new (FALSE, 0);
-       priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE,
-                                                     HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
-       hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_me_viewer_newemail"));
-       hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), 
-                                gtk_image_new_from_stock (MODEST_STOCK_NEW_MAIL, HILDON_ICON_SIZE_TOOLBAR));
-       hildon_button_set_title_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5);
-       hildon_button_set_image_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5);
-       hildon_button_set_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5, 1.0, 0.0);
-       hildon_button_set_image_position (HILDON_BUTTON (priv->new_message_button), GTK_POS_LEFT);
-
        setup_menu (self);
 
-       gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->new_message_button, FALSE, FALSE, 0);
-       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->contents_view);
-       gtk_container_add (GTK_CONTAINER (self), pannable);
+        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 (self), priv->top_vbox);
 
        gtk_widget_show (priv->contents_view);
-       gtk_widget_show (pannable);
-       gtk_widget_show (priv->new_message_button);
+       gtk_widget_show (priv->top_vbox);
 
        connect_signals (MODEST_HEADER_WINDOW (self));
 
@@ -553,11 +537,11 @@ set_contents_state (ModestHeaderWindow *self,
        /* Add the new content */
        switch (state) {
        case CONTENTS_STATE_EMPTY:
-               gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->empty_view, TRUE, TRUE, 0);
+               gtk_container_add (GTK_CONTAINER (priv->contents_view), priv->empty_view);
                gtk_widget_show (priv->empty_view);
                break;
        case CONTENTS_STATE_HEADERS:
-               gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->header_view, TRUE, TRUE, 0);
+               gtk_container_add (GTK_CONTAINER (priv->contents_view), priv->header_view);
                gtk_widget_show (priv->header_view);
                break;
        case CONTENTS_STATE_NONE:
@@ -716,7 +700,7 @@ set_edit_mode (ModestHeaderWindow *self,
                        case EDIT_MODE_COMMAND_NONE:
                                g_assert ("Shouldn't reach");
                        }
-                       gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->edit_toolbar, FALSE, FALSE, 0);
+                       gtk_box_pack_start (GTK_BOX (priv->top_vbox), priv->edit_toolbar, FALSE, FALSE, 0);
                        g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked",
                                          G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self);
                        g_signal_connect (G_OBJECT (priv->edit_toolbar), "arrow-clicked",