* Replaced a gtk_dialog_run by a gtk_widget_show + connect to response
[modest] / src / hildon2 / modest-msg-edit-window.c
index 752350f..c9ce780 100644 (file)
@@ -156,10 +156,6 @@ static void on_account_removed (TnyAccountStore *account_store,
                                TnyAccount *account,
                                gpointer user_data);
 
-static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void set_zoom_do_nothing (ModestWindow *window, gdouble zoom);
-static gdouble get_zoom_do_nothing (ModestWindow *window);
-
 static void init_window (ModestMsgEditWindow *obj);
 
 gboolean scroll_drag_timeout (gpointer userdata);
@@ -173,6 +169,7 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer,
                                  ModestMsgEditWindow *userdata);
 static void on_message_settings (GtkAction *action,
                                 ModestMsgEditWindow *window);
+static void setup_menu (ModestMsgEditWindow *self);
 
 static void DEBUG_BUFFER (WPTextBuffer *buffer)
 {
@@ -214,7 +211,7 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
 }
 
 static const GtkActionEntry hildon2_msg_edit_action_entries [] = {
-       { "MessageSettings", NULL, N_("TODO: settings..."), NULL, NULL, G_CALLBACK (on_message_settings)},
+       { "MessageSettings", NULL, N_("mcen_me_message_settings"), NULL, NULL, G_CALLBACK (on_message_settings)},
 };
 
 
@@ -263,7 +260,7 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *font_tool_button_label;
        GSList      *size_items_group;
        GtkWidget   *size_tool_button_label;
-       
+
        GtkWidget   *find_toolbar;
        gchar       *last_search;
 
@@ -280,7 +277,7 @@ struct _ModestMsgEditWindowPrivate {
        gint images_count;
 
        TnyHeaderFlags priority_flags;
-       
+
        gboolean    can_undo, can_redo;
        gulong      clipboard_change_handler_id;
        gulong      default_clipboard_change_handler_id;
@@ -293,6 +290,10 @@ struct _ModestMsgEditWindowPrivate {
        gchar       *msg_uid;
 
        gboolean    sent;
+
+       GtkWidget   *app_menu;
+       GtkWidget   *cc_button;
+       GtkWidget   *bcc_button;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -321,7 +322,7 @@ modest_msg_edit_window_get_type (void)
                        (GInstanceInitFunc) modest_msg_edit_window_init,
                        NULL
                };
-               my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+               my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
                                                  "ModestMsgEditWindow",
                                                  &my_info, 0);
 
@@ -369,10 +370,6 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_msg_edit_window_finalize;
 
-       modest_window_class->set_zoom_func = set_zoom_do_nothing;
-       modest_window_class->get_zoom_func = get_zoom_do_nothing;
-       modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
-       modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
        modest_window_class->save_state_func = save_state;
        modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals;
@@ -425,6 +422,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->last_upper = 0.0;
 
        priv->font_dialog = NULL;
+       priv->app_menu = NULL;
 
        if (!is_wp_text_buffer_started) {
                is_wp_text_buffer_started = TRUE;
@@ -636,9 +634,9 @@ connect_signals (ModestMsgEditWindow *obj)
        g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj);
        g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), obj);
 
-       g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
        g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj);
-
+       g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
        priv->clipboard_change_handler_id = 
                g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
                                  G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
@@ -1117,7 +1115,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        TnyHeaderFlags priority_flags;
        TnyFolder *msg_folder;
        gboolean is_html = FALSE;
-       GtkAction *action;
        gboolean field_view_set;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
@@ -1136,7 +1133,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu");
        field_view_set = TRUE;
        if (cc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
@@ -1147,10 +1143,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
                gtk_widget_hide (priv->cc_caption);
                field_view_set = FALSE;
        }
-       if (action)
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set);
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), field_view_set);
 
-       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu");
        field_view_set = TRUE;
        if (bcc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
@@ -1161,8 +1155,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
                gtk_widget_hide (priv->bcc_caption);
                field_view_set = FALSE;
        }
-       if (action)
-               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set);
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), field_view_set);
 
 
        if (subject)
@@ -1323,7 +1316,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        /* font color */
        priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
        priv->font_color_button = hildon_color_button_new ();
-       GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+       GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
        GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
        gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
@@ -1451,7 +1444,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
        GObject *obj;
        ModestWindowPrivate *parent_priv;
        ModestMsgEditWindowPrivate *priv;
-       ModestDimmingRulesGroup *menu_rules_group = NULL;
        ModestDimmingRulesGroup *toolbar_rules_group = NULL;
        ModestDimmingRulesGroup *clipboard_rules_group = NULL;
        ModestWindowMgr *mgr = NULL;
@@ -1467,8 +1459,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
        parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
 
        /* Menubar. Update the state of some toggles */
-       parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar");
-       hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
        priv->from_field_protos = get_transports ();
        modest_selector_picker_set_pair_list (MODEST_SELECTOR_PICKER (priv->from_field), priv->from_field_protos);
        modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
@@ -1489,15 +1479,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
 
        priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL;
 
-       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
-       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
        toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
        clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
        /* Add common dimming rules */
-       modest_dimming_rules_group_add_rules (menu_rules_group, 
-                                             modest_msg_edit_window_menu_dimming_entries,
-                                             G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
-                                             MODEST_WINDOW (obj));
        modest_dimming_rules_group_add_rules (toolbar_rules_group, 
                                              modest_msg_edit_window_toolbar_dimming_entries,
                                              G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
@@ -1512,11 +1496,13 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
                                                    G_CALLBACK (modest_ui_dimming_rules_on_set_style),
                                                    MODEST_WINDOW (obj));
        /* Insert dimming rules group for this window */
-       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
        modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
        modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
+
+       /* Setup app menu */
+       setup_menu (MODEST_MSG_EDIT_WINDOW (obj));
+
         /* Checks the dimming rules */
-       g_object_unref (menu_rules_group);
        g_object_unref (toolbar_rules_group);
        g_object_unref (clipboard_rules_group);
        set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
@@ -2233,66 +2219,80 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 
 }
 
-void
-modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
-{      
-       GtkWidget *dialog = NULL;
-       gint response = 0;
+static void
+on_attach_file_response (GtkDialog *dialog,
+                        gint       arg1,
+                        gpointer   user_data)
+{
        GSList *uris = NULL;
        GSList *uri_node;
        GnomeVFSFileSize total_size, allowed_size;
+       ModestMsgEditWindow *window;
        ModestMsgEditWindowPrivate *priv;
        gint att_num;
        guint64 att_size;
 
-       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window));
-               
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
-       if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
-               return;
-       
-       dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
-       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
-       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window));
-
-       response = gtk_dialog_run (GTK_DIALOG (dialog));
-       switch (response) {
+       switch (arg1) {
        case GTK_RESPONSE_OK:
                uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
                break;
        default:
                break;
        }
-       gtk_widget_destroy (dialog);
+
+       window = MODEST_MSG_EDIT_WINDOW (user_data);
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        /* allowed size is the maximum size - what's already there */
-       modest_attachments_view_get_sizes (
-               MODEST_ATTACHMENTS_VIEW (priv->attachments_view), 
-               &att_num, &att_size);
+       modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                          &att_num, &att_size);
        allowed_size = MODEST_MAX_ATTACHMENT_SIZE - att_size;
 
        total_size = 0;
        for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
 
                const gchar *uri = (const gchar *) uri_node->data;
-               
-               total_size += modest_msg_edit_window_attach_file_one 
-                       (window, uri, allowed_size);
-               
+
+               total_size += 
+                       modest_msg_edit_window_attach_file_one (window, uri, allowed_size);
+
                if (total_size > allowed_size) {
                        g_warning ("%s: total size: %u", 
                                   __FUNCTION__, (unsigned int)total_size);
                        break;
                }
-
                allowed_size -= total_size;
-               
-
        }
        g_slist_foreach (uris, (GFunc) g_free, NULL);
        g_slist_free (uris);
+
+       gtk_widget_destroy (dialog);
+}
+
+void
+modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
+{
+       GtkWidget *dialog = NULL;
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
+               return;
+
+       dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), 
+                                                GTK_FILE_CHOOSER_ACTION_OPEN);
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
+       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                    GTK_WINDOW (dialog), GTK_WINDOW (window));
+
+       /* Connect to response & show */
+       g_signal_connect (dialog, "response", 
+                         G_CALLBACK (on_attach_file_response), window);
+       gtk_widget_show (dialog);
 }
 
 
@@ -2308,9 +2308,9 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
        GnomeVFSFileSize size = 0;
        g_return_val_if_fail (window, 0);
        g_return_val_if_fail (uri, 0);
-               
+
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-       
+
        result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
        if (result == GNOME_VFS_OK) {
                TnyMimePart *mime_part;
@@ -3286,7 +3286,6 @@ subject_field_insert_text (GtkEditable *editable,
                                                dgettext("hildon-common-strings",
                                                         "ckdg_ib_maximum_characters_reached"));
        }
-       
        g_string_free (result, TRUE);
 }
 
@@ -3308,7 +3307,6 @@ modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
                gtk_widget_hide_all (priv->find_toolbar);
                gtk_widget_grab_focus (priv->msg_body);
        }
-    
 }
 
 static gboolean 
@@ -3430,18 +3428,6 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
        g_free (current_search);
 }
 
-static void
-modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
-                                          ModestMsgEditWindow *window)
-{
-       GtkToggleAction *toggle;
-       ModestWindowPrivate *parent_priv;
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-
-       toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
-       gtk_toggle_action_set_active (toggle, FALSE);
-}
-
 gboolean 
 modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
 {
@@ -3461,8 +3447,14 @@ modest_msg_edit_window_set_sent (ModestMsgEditWindow *window,
        priv->sent = sent;
 }
 
+static void
+modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+                                          ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_toggle_find_toolbar (window, FALSE);
+}
 
-void            
+void
 modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
                                  TnyMsg *draft)
 {
@@ -3602,43 +3594,114 @@ on_account_removed (TnyAccountStore *account_store,
        }
 }
 
-static gboolean
-on_zoom_minus_plus_not_implemented (ModestWindow *window)
+typedef struct _MessageSettingsHelper {
+       ModestMsgEditWindow *window;
+       GSList *priority_group;
+       GtkWidget *align_picker;
+} MessageSettingsHelper;
+
+static void
+on_priority_toggle (GtkToggleButton *button, 
+                   MessageSettingsHelper *helper)
 {
-       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+       GSList *node;
+       ModestMsgEditWindowPrivate *priv;
 
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
-       return FALSE;
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window);
+       if (gtk_toggle_button_get_active (button)) {
+
+               for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
+                       GtkToggleButton *node_button = (GtkToggleButton *) node->data;
+                       if ((node_button != button) &&
+                           gtk_toggle_button_get_active (node_button)) {
+                               gtk_toggle_button_set_active (node_button, FALSE);
+                       }
+                       if (priv->priority_flags != (TnyHeaderFlags) g_object_get_data (G_OBJECT (button), "priority"))
+                               modest_msg_edit_window_set_priority_flags (helper->window,
+                                                                          (TnyHeaderFlags) 
+                                                                          g_object_get_data (G_OBJECT (button), 
+                                                                                             "priority"));
+               }
 
+               
+       } else {
+               gboolean found = FALSE;
+               /* If no one is active, activate it again */
+               for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
+                       GtkToggleButton *node_button = (GtkToggleButton *) node->data;
+                       if (gtk_toggle_button_get_active (node_button)) {
+                               found = TRUE;
+                               break;
+                       }
+               }
+               if (!found) {
+                       gtk_toggle_button_set_active (button, TRUE);
+               }
+       }
 }
 
 static void
-set_zoom_do_nothing (ModestWindow *window,
-                                gdouble zoom)
+on_format_picker_value_changed (HildonPickerButton *button,
+                               MessageSettingsHelper *helper)
 {
-}
+       ModestMsgEditFormat new_format, old_format;
+       gint file_format;
 
-static gdouble
-get_zoom_do_nothing (ModestWindow *window)
-{
-       return 1.0;
+       switch (hildon_picker_button_get_active (button)) {
+       case 1:
+               new_format = MODEST_MSG_EDIT_FORMAT_HTML;
+               file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT;
+               break;
+       case 0:
+       default:
+               new_format = MODEST_MSG_EDIT_FORMAT_TEXT;
+               file_format = MODEST_FILE_FORMAT_PLAIN_TEXT;
+               break;
+       }
+
+       old_format = modest_msg_edit_window_get_format (helper->window);
+       if (new_format != old_format) {
+               modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window), file_format);
+
+               switch (modest_msg_edit_window_get_format (helper->window)) {
+               case MODEST_MSG_EDIT_FORMAT_TEXT:
+                       hildon_picker_button_set_active (button, 0);
+                       gtk_widget_set_sensitive (helper->align_picker, FALSE);
+                       break;
+               case MODEST_MSG_EDIT_FORMAT_HTML:
+               default:
+                       hildon_picker_button_set_active (button, 1);
+                       gtk_widget_set_sensitive (helper->align_picker, TRUE);
+                       break;
+               }
+       }
 }
 
 static void
-on_priority_toggle (HildonCheckButton *button, 
-                   GSList *priority_group)
+on_align_picker_value_changed (HildonPickerButton *button,
+                               MessageSettingsHelper *helper)
 {
-       if (hildon_check_button_get_active (button)) {
-               GSList *node;
+       GtkJustification new_justify;
+       ModestMsgEditFormatState *format_state = NULL;
 
-               for (node = priority_group; node != NULL; node = g_slist_next (node)) {
-                       HildonCheckButton *node_button = (HildonCheckButton *) node->data;
-                       if ((node_button != button) &&
-                           hildon_check_button_get_active (node_button)) {
-                               hildon_check_button_set_active (node_button, FALSE);
-                       }
-               }
+       switch (hildon_picker_button_get_active (button)) {
+       case 1:
+               new_justify = GTK_JUSTIFY_CENTER;
+               break;
+       case 2:
+               new_justify = GTK_JUSTIFY_RIGHT;
+               break;
+       case 0:
+       default:
+               new_justify = GTK_JUSTIFY_LEFT;
+               break;
        }
+
+       format_state = modest_msg_edit_window_get_format_state (helper->window);
+       if (format_state->justification != new_justify)
+               format_state->justification = new_justify;
+       modest_msg_edit_window_set_format_state (helper->window, format_state);
+       g_free (format_state);
 }
 
 static void
@@ -3650,7 +3713,16 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
        GtkWidget *high_toggle, *medium_toggle, *low_toggle;
        GtkWidget *captioned;
        GtkSizeGroup *title_sizegroup, *value_sizegroup;
-       GSList *priority_group = NULL;
+       GtkWidget *format_picker;
+       GtkWidget *format_selector;
+       ModestMsgEditWindowPrivate *priv;
+       MessageSettingsHelper helper = {0,};
+       ModestMsgEditFormatState *format_state = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       helper.window = window;
+       helper.priority_group = NULL;
 
        title_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
        value_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -3660,39 +3732,100 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
        gtk_widget_show (vbox);
 
-       priority_hbox = gtk_hbox_new (0, TRUE);
-       high_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
-       gtk_button_set_label (GTK_BUTTON (high_toggle), _("TDHigh"));
-       priority_group = g_slist_prepend (priority_group, high_toggle);
-       medium_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
-       gtk_button_set_label (GTK_BUTTON (medium_toggle), _("TDMedium"));
-       priority_group = g_slist_prepend (priority_group, medium_toggle);
-       low_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
-       gtk_button_set_label (GTK_BUTTON (low_toggle), _("TDLow"));
-       priority_group = g_slist_prepend (priority_group, low_toggle);
-       gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, FALSE, FALSE, 0);
-       g_signal_connect (G_OBJECT (high_toggle), "toggled", G_CALLBACK (on_priority_toggle), priority_group);
-       g_signal_connect (G_OBJECT (medium_toggle), "toggled", G_CALLBACK (on_priority_toggle), priority_group);
-       g_signal_connect (G_OBJECT (low_toggle), "toggled", G_CALLBACK (on_priority_toggle), priority_group);
+       /* Priority toggles */
+       priority_hbox = gtk_hbox_new (TRUE, 0);
+       high_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (high_toggle), _("mcen_me_editor_priority_high"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, high_toggle);
+       g_object_set_data (G_OBJECT (high_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_HIGH_PRIORITY));
+       medium_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (medium_toggle), _("mcen_me_editor_priority_normal"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, medium_toggle);
+       g_object_set_data (G_OBJECT (medium_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_NORMAL_PRIORITY));
+       low_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
+       gtk_button_set_label (GTK_BUTTON (low_toggle), _("mcen_me_editor_priority_low"));
+       helper.priority_group = g_slist_prepend (helper.priority_group, low_toggle);
+       g_object_set_data (G_OBJECT (low_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_LOW_PRIORITY));
+       gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, TRUE, TRUE, 0);
        gtk_widget_show_all (priority_hbox);
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                                        _("TODO: Priority"), priority_hbox);
+                                                        _("mcen_me_editor_message_priority"), priority_hbox);
        gtk_widget_show (captioned);
        gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
-       
+
+       /* format selector */
+       format_selector = hildon_touch_selector_new_text ();
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_plain_text"));
+       hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_formatted_text"));
+       format_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
+                                                 HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+       hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (format_picker), HILDON_TOUCH_SELECTOR (format_selector));
+       modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+                                              _("mcen_me_editor_format"), format_picker);
+       gtk_widget_show_all (format_picker);
+       gtk_box_pack_start (GTK_BOX (vbox), format_picker, FALSE, FALSE, 0);
+
+
        g_object_unref (title_sizegroup);
        g_object_unref (value_sizegroup);
-       
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_me_message_settings"));
+
        /* Set current values */
+       switch (priv->priority_flags) {
+       case TNY_HEADER_FLAG_HIGH_PRIORITY:
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (high_toggle), TRUE);
+               break;
+       case TNY_HEADER_FLAG_LOW_PRIORITY:
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (low_toggle), TRUE);
+               break;
+       default:
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (medium_toggle), TRUE);
+               break;
+       }
+
+       switch (modest_msg_edit_window_get_format (window)) {
+       case MODEST_MSG_EDIT_FORMAT_TEXT:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 0);
+               gtk_widget_set_sensitive (helper.align_picker, FALSE);
+               break;
+       case MODEST_MSG_EDIT_FORMAT_HTML:
+       default:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 1);
+               gtk_widget_set_sensitive (helper.align_picker, TRUE);
+               break;
+       }
+
+       format_state = modest_msg_edit_window_get_format_state (window);
+       switch (format_state->justification) {
+       case GTK_JUSTIFY_RIGHT:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 2);
+               break;
+       case GTK_JUSTIFY_CENTER:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 1);
+               break;
+       default:
+               hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 0);
+               break;
+       
+       }
+       g_free (format_state);
+
+       /* Signal connects */
+       g_signal_connect (G_OBJECT (high_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (medium_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (low_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
+       g_signal_connect (G_OBJECT (format_picker), "value-changed", G_CALLBACK (on_format_picker_value_changed), &helper);
+       g_signal_connect (G_OBJECT (helper.align_picker), "value-changed", 
+                         G_CALLBACK (on_align_picker_value_changed), &helper);
        
        gtk_dialog_run (GTK_DIALOG (dialog));
        
        /* Read new values */
        
        gtk_widget_destroy (dialog);
-       g_slist_free (priority_group);
+       g_slist_free (helper.priority_group);
        
 }
 
@@ -3701,3 +3834,72 @@ static void on_message_settings (GtkAction *action,
 {
        modest_msg_edit_window_show_msg_settings_dialog (window);
 }
+
+static void
+on_cc_button_toggled (HildonCheckButton *button,
+                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window),
+                                       hildon_check_button_get_active (button));
+}
+
+static void
+on_bcc_button_toggled (HildonCheckButton *button,
+                     ModestMsgEditWindow *window)
+{
+       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+       modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
+                                       hildon_check_button_get_active (button));
+}
+
+static void 
+setup_menu (ModestMsgEditWindow *self)
+{
+       ModestMsgEditWindowPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       /* Settings menu buttons */
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_check_names),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_undo),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
+
+       priv->cc_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
+                                       FALSE);
+       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->cc_button),
+                                                 NULL);
+       g_signal_connect (G_OBJECT (priv->cc_button), "toggled",
+                         G_CALLBACK (on_cc_button_toggled), (gpointer) self);
+       priv->bcc_button = hildon_check_button_new (0);
+       gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc"));
+       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button),
+                                       FALSE);
+       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->bcc_button),
+                                                 NULL);
+       g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
+                         G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
+
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_insert_image),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL,
+                                          APP_MENU_CALLBACK (on_message_settings),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
+                                          NULL);
+}
+