X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=5314544b1da9a6f870219cf0d76c06fc86928165;hb=677c8e18b3f237a33f2361b7744bbb9d90aa64d2;hp=a2ceb08dc2cdd8653c58686ca89ad561cab39fdc;hpb=ab4fbe16b46dfecc481d67d1b99b9afd358de587;p=modest diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index a2ceb08..5314544 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -61,9 +61,11 @@ #include "modest-address-book.h" #include "modest-text-utils.h" #include -#include +#include #include #include +#include +#include #include "modest-msg-edit-window-ui-dimming.h" #include "modest-hildon-includes.h" @@ -115,10 +117,6 @@ static void subject_field_insert_text (GtkEditable *editable, ModestMsgEditWindow *window); static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, gpointer userdata); -static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, - gpointer userdata); -static void modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, - gpointer userdata); static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window); static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, @@ -174,6 +172,10 @@ static void setup_menu (ModestMsgEditWindow *self); static void from_field_changed (HildonPickerButton *button, ModestMsgEditWindow *self); +static void font_size_clicked (GtkToolButton *button, + ModestMsgEditWindow *window); +static void font_face_clicked (GtkToolButton *button, + ModestMsgEditWindow *window); static void DEBUG_BUFFER (WPTextBuffer *buffer) { #ifdef DEBUG @@ -233,7 +235,6 @@ enum { typedef struct _ModestMsgEditWindowPrivate ModestMsgEditWindowPrivate; struct _ModestMsgEditWindowPrivate { GtkWidget *msg_body; - GtkWidget *frame; GtkWidget *header_box; ModestPairList *from_field_protos; @@ -262,8 +263,11 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_color_button; GtkWidget *font_color_toolitem; GSList *font_items_group; + GtkTreeModel *faces_model; + gint current_face_index; GtkWidget *font_tool_button_label; - GSList *size_items_group; + GtkTreeModel *sizes_model; + gint current_size_index; GtkWidget *size_tool_button_label; GtkWidget *find_toolbar; @@ -390,7 +394,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; @@ -507,24 +510,24 @@ correct_scroll_without_drag_check_idle (gpointer userdata) ModestMsgEditWindowPrivate *priv; GtkTextIter iter; GdkRectangle rectangle; - gdouble new_value; - gint offset; + gint offset_min, offset_max; GtkTextMark *insert; + GtkAdjustment *vadj; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); - if (!gtk_widget_is_focus (priv->msg_body)) - return FALSE; - insert = gtk_text_buffer_get_insert (priv->text_buffer); gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert); gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &iter, &rectangle); - offset = priv->msg_body->allocation.y; + offset_min = priv->msg_body->allocation.y + rectangle.y; + offset_max = offset_min + rectangle.height; - new_value = (offset + rectangle.y); + vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)); + offset_min = MAX (offset_min - 48, 0); + offset_max = MIN (offset_max + 48, vadj->upper); - hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value); + gtk_adjustment_clamp_page (vadj, (gdouble) offset_min, (gdouble) offset_max); priv->correct_scroll_idle = 0; return FALSE; @@ -696,6 +699,7 @@ init_window (ModestMsgEditWindow *obj) { GtkWidget *to_caption, *subject_caption; GtkWidget *main_vbox; + GtkWidget *add_attachment_align; ModestMsgEditWindowPrivate *priv; GtkActionGroup *action_group; ModestWindowPrivate *parent_priv; @@ -706,6 +710,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 @@ -795,7 +800,10 @@ init_window (ModestMsgEditWindow *obj) gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE); attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER); hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon); - gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->add_attachment_button, FALSE, FALSE, 0); + add_attachment_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (add_attachment_align), 0, 0, MODEST_MARGIN_DEFAULT, 0); + gtk_container_add (GTK_CONTAINER (add_attachment_align), priv->add_attachment_button); + gtk_box_pack_start (GTK_BOX (priv->subject_box), add_attachment_align, FALSE, FALSE, 0); priv->attachments_view = modest_attachments_view_new (NULL); modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS); @@ -838,7 +846,7 @@ init_window (ModestMsgEditWindow *obj) init_wp_text_view_style (); - priv->msg_body = wp_text_view_new (); + priv->msg_body = modest_wp_text_view_new (); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->msg_body), GTK_WRAP_WORD_CHAR); @@ -862,12 +870,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)); @@ -877,8 +887,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) { @@ -962,8 +970,8 @@ modest_msg_edit_window_finalize (GObject *obj) g_free (priv->original_account_name); g_free (priv->msg_uid); g_free (priv->last_search); - g_slist_free (priv->font_items_group); - g_slist_free (priv->size_items_group); + g_object_unref (priv->faces_model); + g_object_unref (priv->sizes_model); g_object_unref (priv->attachments); g_object_unref (priv->images); @@ -1287,25 +1295,6 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) } static void -menu_tool_button_clicked_popup (GtkMenuToolButton *item, - gpointer data) -{ - GList *item_children, *node; - GtkWidget *bin_child; - - bin_child = gtk_bin_get_child (GTK_BIN(item)); - - item_children = gtk_container_get_children (GTK_CONTAINER (bin_child)); - - for (node = item_children; node != NULL; node = g_list_next (node)) { - if (GTK_IS_TOGGLE_BUTTON (node->data)) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (node->data), TRUE); - } - } - g_list_free (item_children); -} - -static void menu_tool_button_dont_expand (GtkMenuToolButton *item) { GtkWidget *box; @@ -1339,9 +1328,12 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gint font_index; GtkWidget *sizes_menu; GtkWidget *fonts_menu; - GSList *radio_group = NULL; - GSList *node = NULL; gchar *markup; + gchar ldots[8]; + gint ldots_len; + + ldots_len = g_unichar_to_utf8 (0x2026, ldots); + ldots[ldots_len] = '\0'; /* Toolbar */ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); @@ -1372,7 +1364,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes"); insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); /* font_size */ - tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL)); + tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); priv->size_tool_button_label = gtk_label_new (NULL); hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_TEXT, GTK_STATE_INSENSITIVE, "SecondaryTextColor"); @@ -1380,37 +1372,29 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) GTK_STATE_INSENSITIVE, "SecondaryTextColor"); snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]); markup = g_strconcat ("", - size_text,"", NULL); + size_text, ldots, "", NULL); gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); g_free (markup); hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont"); gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label); sizes_menu = gtk_menu_new (); - priv->size_items_group = NULL; - radio_group = NULL; + priv->sizes_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING)); for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) { - GtkWidget *size_menu_item; + GtkTreeIter iter; snprintf(size_text, sizeof(size_text), "%d", wp_font_size[size_index]); - size_menu_item = gtk_radio_menu_item_new_with_label (radio_group, size_text); - radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (size_menu_item)); - gtk_menu_shell_append (GTK_MENU_SHELL (sizes_menu), size_menu_item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (size_menu_item), (wp_font_size[size_index] == 12)); - gtk_widget_show (size_menu_item); + gtk_list_store_append (GTK_LIST_STORE (priv->sizes_model), &iter); - priv->size_items_group = g_slist_prepend (priv->size_items_group, size_menu_item); - - } + gtk_list_store_set (GTK_LIST_STORE (priv->sizes_model), &iter, + 0, size_text, + -1); - for (node = radio_group; node != NULL; node = g_slist_next (node)) { - GtkWidget *item = (GtkWidget *) node->data; - g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change), - window); + if (wp_font_size[size_index] == 12) + priv->current_size_index = size_index; + } - priv->size_items_group = g_slist_reverse (priv->size_items_group); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu); - g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL); + g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_size_clicked), window); gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE); @@ -1418,47 +1402,32 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) priv->font_size_toolitem = tool_item; /* font face */ - tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL)); + tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); priv->font_tool_button_label = gtk_label_new (NULL); hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_TEXT, GTK_STATE_INSENSITIVE, "SecondaryTextColor"); hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_FG, GTK_STATE_INSENSITIVE, "SecondaryTextColor"); - markup = g_strconcat ("Tt", NULL); + markup = g_strconcat ("Tt",ldots,"", NULL); gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); g_free(markup); hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont"); gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label); fonts_menu = gtk_menu_new (); - priv->font_items_group = NULL; - radio_group = NULL; + priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING)); for (font_index = 0; font_index < wp_get_font_count (); font_index++) { - GtkWidget *font_menu_item; - GtkWidget *child_label; - - font_menu_item = gtk_radio_menu_item_new_with_label (radio_group, ""); - child_label = gtk_bin_get_child (GTK_BIN (font_menu_item)); - markup = g_strconcat ("", - wp_get_font_name (font_index), "", NULL); - gtk_label_set_markup (GTK_LABEL (child_label), markup); - g_free (markup); - - radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (font_menu_item)); - gtk_menu_shell_append (GTK_MENU_SHELL (fonts_menu), font_menu_item); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (font_menu_item), (font_index == DEFAULT_FONT)); - gtk_widget_show (font_menu_item); + GtkTreeIter iter; - priv->font_items_group = g_slist_prepend (priv->font_items_group, font_menu_item); - - } - for (node = radio_group; node != NULL; node = g_slist_next (node)) { - GtkWidget *item = (GtkWidget *) node->data; - g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change), - window); + gtk_list_store_append (GTK_LIST_STORE (priv->faces_model), &iter); + + gtk_list_store_set (GTK_LIST_STORE (priv->faces_model), &iter, + 0, wp_get_font_name (font_index), + -1); + + if (font_index == DEFAULT_FONT) + priv->current_face_index = font_index; } - priv->font_items_group = g_slist_reverse (priv->font_items_group); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu); - g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL); + g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_face_clicked), window); gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE); @@ -1927,12 +1896,15 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo GtkAction *action; ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; - GtkWidget *new_size_menuitem; - GtkWidget *new_font_menuitem; + gchar ldots[8]; + gint ldots_len; parent_priv = MODEST_WINDOW_GET_PRIVATE (window); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + ldots_len = g_unichar_to_utf8 (0x2026, ldots); + ldots[ldots_len] = '\0'; + if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) { action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"); if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) @@ -1981,42 +1953,45 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo G_CALLBACK (modest_msg_edit_window_color_button_change), window); - new_size_menuitem = GTK_WIDGET ((g_slist_nth (priv->size_items_group, - buffer_format->font_size))->data); - if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_size_menuitem))) { - GtkWidget *label; - gchar *markup; + if (priv->current_size_index != buffer_format->font_size) { + GtkTreeIter iter; + GtkTreePath *path; - label = gtk_bin_get_child (GTK_BIN (new_size_menuitem)); - markup = g_strconcat ("", gtk_label_get_text (GTK_LABEL (label)), "", NULL); - gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); - g_free (markup); - g_signal_handlers_block_by_func (G_OBJECT (new_size_menuitem), - G_CALLBACK (modest_msg_edit_window_size_change), - window); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_size_menuitem), TRUE); - g_signal_handlers_unblock_by_func (G_OBJECT (new_size_menuitem), - G_CALLBACK (modest_msg_edit_window_size_change), - window); - } - - new_font_menuitem = GTK_WIDGET ((g_slist_nth (priv->font_items_group, - buffer_format->font))->data); - if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_font_menuitem))) { - GtkWidget *label; - gchar *markup; + path = gtk_tree_path_new_from_indices (buffer_format->font_size, -1); + if (gtk_tree_model_get_iter (priv->sizes_model, &iter, path)) { + gchar *size_text; + gchar *markup; + + priv->current_size_index = buffer_format->font_size; + + gtk_tree_model_get (priv->sizes_model, &iter, 0, &size_text, -1); + markup = g_strconcat ("", + size_text, ldots, "", NULL); + + gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); + g_free (markup); + g_free (size_text); + } + gtk_tree_path_free (path); + } + + if (priv->current_face_index != buffer_format->font) { + GtkTreeIter iter; + GtkTreePath *path; + + path = gtk_tree_path_new_from_indices (buffer_format->font, -1); + if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) { + gchar *face_name; + gchar *markup; + + priv->current_face_index = buffer_format->font; + gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1); + markup = g_strconcat ("Tt", ldots, "", NULL); + gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); + g_free (face_name); + g_free (markup); + } - label = gtk_bin_get_child (GTK_BIN (new_font_menuitem)); - markup = g_strconcat ("Tt", NULL); - gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); - g_free (markup); - g_signal_handlers_block_by_func (G_OBJECT (new_font_menuitem), - G_CALLBACK (modest_msg_edit_window_font_change), - window); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_font_menuitem), TRUE); - g_signal_handlers_unblock_by_func (G_OBJECT (new_font_menuitem), - G_CALLBACK (modest_msg_edit_window_font_change), - window); } g_free (buffer_format); @@ -2460,7 +2435,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, if (att_list == NULL) { att_list = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); - if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list)) { + if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list, TRUE)) { g_object_unref (att_list); return; } @@ -2562,74 +2537,115 @@ modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window, } static void -modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item, - gpointer userdata) +font_size_clicked (GtkToolButton *button, + ModestMsgEditWindow *window) { ModestMsgEditWindowPrivate *priv; - gint new_size_index; - ModestMsgEditWindow *window; - GtkWidget *label; + GtkWidget *selector, *dialog; - window = MODEST_MSG_EDIT_WINDOW (userdata); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); - if (gtk_check_menu_item_get_active (menu_item)) { + selector = hildon_touch_selector_new (); + hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector), priv->sizes_model, TRUE); + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, priv->current_size_index); + + dialog = hildon_picker_dialog_new (GTK_WINDOW (window)); + hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector)); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + gint new_index; + gchar *size_text; gchar *markup; WPTextBufferFormat format; + gchar ldots[8]; + gint ldots_len; + + new_index = hildon_touch_selector_get_active (HILDON_TOUCH_SELECTOR (selector), 0); memset (&format, 0, sizeof (format)); wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &format, FALSE); - label = gtk_bin_get_child (GTK_BIN (menu_item)); - - new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label))); format.cs.font_size = TRUE; format.cs.text_position = TRUE; format.cs.font = TRUE; - format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE); + format.font_size = new_index; /* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */ if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, - GINT_TO_POINTER (wp_get_font_size_index (new_size_index, 12)))) + GINT_TO_POINTER (new_index))) wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window)); - markup = g_strconcat ("", gtk_label_get_text (GTK_LABEL (label)), "", NULL); + size_text = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)); + ldots_len = g_unichar_to_utf8 (0x2026, ldots); + ldots[ldots_len] = '\0'; + markup = g_strconcat ("", + size_text, ldots, "", NULL); + g_free (size_text); gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); g_free (markup); + } + gtk_widget_destroy (dialog); + + gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); + } static void -modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item, - gpointer userdata) +font_face_clicked (GtkToolButton *button, + ModestMsgEditWindow *window) { ModestMsgEditWindowPrivate *priv; - gint new_font_index; - ModestMsgEditWindow *window; - GtkWidget *label; + GtkWidget *selector, *dialog; + GtkCellRenderer *renderer; - window = MODEST_MSG_EDIT_WINDOW (userdata); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); - if (gtk_check_menu_item_get_active (menu_item)) { - gchar *markup; + selector = hildon_touch_selector_new (); + renderer = gtk_cell_renderer_text_new (); + hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), priv->faces_model, + renderer, "family", 0, "text", 0, NULL); + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, priv->current_face_index); - label = gtk_bin_get_child (GTK_BIN (menu_item)); - - new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT); + dialog = hildon_picker_dialog_new (GTK_WINDOW (window)); + hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector)); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { + gint new_font_index; + GtkTreePath *path; + GtkTreeIter iter; + + new_font_index = hildon_touch_selector_get_active (HILDON_TOUCH_SELECTOR (selector), 0); + path = gtk_tree_path_new_from_indices (new_font_index, -1); + if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) { + gchar *face_name; + gchar *markup; + gchar ldots[8]; + gint ldots_len; + + gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1); + + if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, + GINT_TO_POINTER(new_font_index))) + wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); + + ldots_len = g_unichar_to_utf8 (0x2026, ldots); + ldots[ldots_len] = '\0'; + markup = g_strconcat ("Tt", ldots, "", NULL); + gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); + + text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window)); + g_free (face_name); + g_free (markup); + } + gtk_tree_path_free (path); - if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, - GINT_TO_POINTER(new_font_index))) - wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); - - text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window)); - markup = g_strconcat ("Tt", NULL); - gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); - g_free (markup); } + gtk_widget_destroy (dialog); + + gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body)); + } void @@ -3781,6 +3797,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; @@ -3795,6 +3812,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); @@ -3803,7 +3821,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 */