Message settings dialog layout

[modest] / src / hildon2 / modest-msg-edit-window.c

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 8acc49f..2822ec5 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -233,7 +233,6 @@ enum {
 typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate;
 struct _ModestMsgEditWindowPrivate {
        GtkWidget   *msg_body;
-       GtkWidget   *frame;
        GtkWidget   *header_box;
        
        ModestPairList *from_field_protos;
@@ -390,7 +389,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
 
        priv->msg_body      = NULL;
-       priv->frame         = NULL;
        priv->from_field    = NULL;
        priv->to_field      = NULL;
        priv->cc_field      = NULL;
@@ -707,6 +705,7 @@ init_window (ModestMsgEditWindow *obj)
        GtkSizeGroup *value_size_group;
        GtkWidget *attachment_icon;
        GtkWidget *window_box;
+       GtkWidget *window_align;
 #if (GTK_MINOR_VERSION >= 10)
        GdkAtom deserialize_type;
 #endif
@@ -866,12 +865,14 @@ init_window (ModestMsgEditWindow *obj)
        priv->pannable = hildon_pannable_area_new ();
        
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
+       window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
-       priv->frame = gtk_frame_new (NULL);
-       gtk_box_pack_start (GTK_BOX(main_vbox), priv->frame, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
 
-       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), main_vbox);
+       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
        gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), 
                                             hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)));
        gtk_widget_show_all (GTK_WIDGET(priv->pannable));
@@ -881,8 +882,6 @@ init_window (ModestMsgEditWindow *obj)
 
        gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0);
 
-       gtk_container_add (GTK_CONTAINER (priv->frame), priv->msg_body);
-
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG); 
        if (window_icon) {
@@ -3785,6 +3784,7 @@ static void
 modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
 {
        GtkWidget *dialog;
+       GtkWidget *align;
        GtkWidget *vbox;
        GtkWidget *priority_hbox;
        GtkWidget *high_toggle, *medium_toggle, *low_toggle;
@@ -3799,6 +3799,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
        helper.window = window;
        helper.priority_group = NULL;
+       helper.format_group = NULL;
 
        title_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
        value_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -3807,7 +3808,11 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
                                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                              _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
        vbox = gtk_vbox_new (FALSE, 0);
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+       gtk_container_add (GTK_CONTAINER (align), vbox);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), align);
+       gtk_widget_show (align);
        gtk_widget_show (vbox);
 
        /* Priority toggles */