Proper alignment in outgoing details page of wizard

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

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index d7a6054..04aaf87 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -45,6 +45,7 @@
 #include <modest-window.h>
 #include <hildon/hildon-program.h>
 #include <hildon/hildon-banner.h>
+#include <hildon/hildon-button.h>
 #include <tny-account-store-view.h>
 #include <modest-header-window.h>
 #include <modest-ui-dimming-rules.h>
@@ -97,6 +98,7 @@ struct _ModestFolderWindowPrivate {
 
        GtkWidget *folder_view;
        GtkWidget *top_vbox;
+       GtkWidget *new_message_button;
 
        /* signals */
        GSList *sighandlers;
@@ -215,11 +217,20 @@ on_visible_account_changed (ModestFolderView *folder_view,
                                                                     account_id);
                if (acc) {
                        const gchar *name;
+                       const gchar *mailbox;
                        gchar *title = NULL;
+                       ModestFolderWindowPrivate *priv;
 
-                       name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
-                       title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
-                                                                    name);
+                       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
+
+                       mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view));
+                       if (mailbox) {
+                               title = g_strdup (mailbox);
+                       } else {
+                               name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
+                               title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
+                                                                            name);
+                       }
                        if (title) {
                                gtk_window_set_title (GTK_WINDOW (user_data), title);
                                g_free (title);
@@ -254,6 +265,13 @@ connect_signals (ModestFolderWindow *self)
                                                       G_OBJECT (priv->folder_view),
                                                       "visible-account-changed",
                                                       G_CALLBACK (on_visible_account_changed), self);
+
+       priv->sighandlers = 
+               modest_signal_mgr_connect (priv->sighandlers,
+                                          G_OBJECT (priv->new_message_button),
+                                          "clicked",
+                                          G_CALLBACK (modest_ui_actions_on_new_msg), self);
+
 }
 
 ModestWindow *
@@ -264,6 +282,12 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        HildonProgram *app;
        GdkPixbuf *window_icon;
        GtkWidget *pannable;
+       GtkWidget *action_area_box;
+       GdkPixbuf *new_message_pixbuf;
+       guint accel_key;
+       GdkModifierType accel_mods;
+       GtkAccelGroup *accel_group;
+       GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
@@ -278,6 +302,18 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        g_signal_connect (G_OBJECT (self), "edit-mode-changed",
                          G_CALLBACK (edit_mode_changed), (gpointer) self);
 
+       action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->folder_view));
+       priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+       hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
+       new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
+       hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
+       g_object_unref (new_message_pixbuf);
+
+       gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
+       gtk_widget_show_all (priv->new_message_button);
+       hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->folder_view), TRUE);
+       
        setup_menu (self);
 
        /* Set account store */
@@ -285,14 +321,20 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                                                  TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
        priv->top_vbox = gtk_vbox_new (0, FALSE);
+       top_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (top_alignment),
+                                  0, 0,
+                                  HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 
        gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view);
-       gtk_box_pack_end (GTK_BOX (priv->top_vbox), pannable, TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (top_alignment), pannable);
+       gtk_box_pack_end (GTK_BOX (priv->top_vbox), top_alignment, TRUE, TRUE, 0);
        gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
 
        gtk_widget_show (priv->folder_view);
        gtk_widget_show (pannable);
        gtk_widget_show (priv->top_vbox);
+       gtk_widget_show (top_alignment);
 
        connect_signals (MODEST_FOLDER_WINDOW (self));
 
@@ -347,6 +389,12 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                          G_OBJECT (self));
        update_progress_hint (self);
 
+       accel_group = gtk_accel_group_new ();
+       gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
+       gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
+                                   accel_key, accel_mods, 0);
+       gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
+
        return MODEST_WINDOW(self);
 }
 
@@ -405,6 +453,19 @@ free_refs:
 
 }
 
+void
+modest_folder_window_set_mailbox (ModestFolderWindow *self,
+                                 const gchar *mailbox)
+{
+       ModestFolderWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
+       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+       modest_folder_view_set_mailbox (MODEST_FOLDER_VIEW (priv->folder_view), mailbox);
+
+}
+
 static void
 setup_menu (ModestFolderWindow *self)
 {
@@ -434,13 +495,6 @@ setup_menu (ModestFolderWindow *self)
        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));
-       /* new message */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), 
-                                          _("mcen_me_new_message"), 
-                                          "<Ctrl>n",
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
-                                          NULL);
-
 }
 
 static void
@@ -543,6 +597,7 @@ edit_mode_changed (ModestFolderWindow *folder_window,
                break;
        }
 
+       hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->folder_view), !enabled);
        if (enabled) {
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
                                               filter);