X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=18b16802da65626b8d40402209d08dd7282ac1dd;hp=81b26b4030e3fd8084d2887bcbca93deda356fee;hb=83cfbd96aa351d1ffc91d409cacb26ad1ec7df2d;hpb=bbbfe0a671f48798d6c085fe60e5a1c914d180a6 diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 81b26b4..18b1680 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -260,13 +260,14 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *font_tool_button_label; GSList *size_items_group; GtkWidget *size_tool_button_label; - + GtkWidget *find_toolbar; gchar *last_search; GtkWidget *font_dialog; GtkWidget *pannable; + guint correct_scroll_idle; guint scroll_drag_timeout_id; gdouble last_upper; @@ -277,7 +278,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; @@ -294,7 +295,6 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *app_menu; GtkWidget *cc_button; GtkWidget *bcc_button; - GtkWidget *find_toolbar_button; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -420,6 +420,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->sent = FALSE; priv->scroll_drag_timeout_id = 0; + priv->correct_scroll_idle = 0; priv->last_upper = 0.0; priv->font_dialog = NULL; @@ -494,21 +495,19 @@ scroll_drag_timeout (gpointer userdata) return FALSE; } -static void -correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused) +static gboolean +correct_scroll_without_drag_check_idle (gpointer userdata) { + ModestMsgEditWindow *w = (ModestMsgEditWindow *) userdata; ModestMsgEditWindowPrivate *priv; - GtkTextMark *insert; GtkTextIter iter; GdkRectangle rectangle; gdouble new_value; gint offset; + GtkTextMark *insert; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); - - if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) - return; - + insert = gtk_text_buffer_get_insert (priv->text_buffer); gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert); @@ -518,6 +517,27 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu new_value = (offset + rectangle.y); hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value); + + priv->correct_scroll_idle = 0; + return FALSE; +} + +static void +correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); + + if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) + return; + + if (priv->correct_scroll_idle > 0) { + return; + } + + priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle, + (gpointer) w); } static void @@ -635,9 +655,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); @@ -774,20 +794,21 @@ init_window (ModestMsgEditWindow *obj) to_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, - _("mail_va_to"), priv->to_field, + _("mail_va_to"), FALSE, priv->to_field, HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, - _("mail_va_cc"), priv->cc_field, + _("mail_va_cc"), FALSE, priv->cc_field, HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, - _("mail_va_hotfix1"), priv->bcc_field, + _("mail_va_hotfix1"), FALSE, priv->bcc_field, HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH); subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group, - _("mail_va_subject"), subject_box); + _("mail_va_subject"), FALSE, subject_box); priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, _("mail_va_attachment"), + FALSE, priv->attachments_view, HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_AUTO_HEIGHT); @@ -837,6 +858,8 @@ init_window (ModestMsgEditWindow *obj) gtk_box_pack_start (GTK_BOX(main_vbox), priv->frame, TRUE, TRUE, 0); hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), main_vbox); + 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)); window_box = gtk_vbox_new (FALSE, 0); @@ -913,6 +936,10 @@ modest_msg_edit_window_finalize (GObject *obj) g_object_unref (priv->outbox_msg); priv->outbox_msg = NULL; } + if (priv->correct_scroll_idle > 0) { + g_source_remove (priv->correct_scroll_idle); + priv->correct_scroll_idle = 0; + } if (priv->scroll_drag_timeout_id > 0) { g_source_remove (priv->scroll_drag_timeout_id); priv->scroll_drag_timeout_id = 0; @@ -2174,31 +2201,32 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) mime_part = tny_platform_factory_new_mime_part (modest_runtime_get_platform_factory ()); - + TnyStream *stream = create_stream_for_uri (uri); if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); - + modest_platform_information_banner (NULL, NULL, + _FM("sfil_ib_opening_not_allowed")); + g_object_unref (mime_part); gnome_vfs_file_info_unref (info); continue; } tny_mime_part_construct (mime_part, stream, mime_type, "base64"); - + content_id = g_strdup_printf ("%d", priv->next_cid); tny_mime_part_set_content_id (mime_part, content_id); g_free (content_id); priv->next_cid++; - + basename = g_path_get_basename (filename); tny_mime_part_set_filename (mime_part, basename); g_free (basename); pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size); - + if (pixbuf != NULL) { priv->images_size += stream_size; priv->images_count ++; @@ -2220,66 +2248,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 (GTK_WIDGET (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); } @@ -2295,9 +2337,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; @@ -2336,7 +2378,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, size = info->size; if (size > allowed_size) { modest_platform_information_banner (NULL, NULL, - dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); + _FM("sfil_ib_opening_not_allowed")); return 0; } } else @@ -2346,7 +2388,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, dgettext("hildon-fm", "sfil_ib_opening_not_allowed")); + modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); g_object_unref (mime_part); gnome_vfs_file_info_unref (info); @@ -2424,19 +2466,20 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, } else { filename = g_strdup (""); } - message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments", + message = g_strdup_printf (ngettext("emev_nc_delete_attachment", + "emev_nc_delete_attachments", tny_list_get_length (att_list)), filename); g_free (filename); - dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), message); + dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), + message); g_free (message); if (dialog_response != GTK_RESPONSE_OK) { g_object_unref (att_list); return; } - hildon_banner_show_information (NULL, NULL, _("mcen_me_inbox_remove_attachments")); - + for (iter = tny_list_create_iterator (att_list); !tny_iterator_is_done (iter); tny_iterator_next (iter)) { @@ -3270,10 +3313,8 @@ subject_field_insert_text (GtkEditable *editable, if (result_len + old_length > 1000) { hildon_banner_show_information (GTK_WIDGET (window), NULL, - dgettext("hildon-common-strings", - "ckdg_ib_maximum_characters_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } - g_string_free (result, TRUE); } @@ -3295,7 +3336,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 @@ -3379,7 +3419,7 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, g_free (priv->last_search); priv->last_search = NULL; /* Information banner about empty search */ - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text")); + hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text")); return; } @@ -3395,14 +3435,14 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete")); + hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete")); } else { GtkTextIter buffer_start; gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start); result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches")); + hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches")); } /* Mark as selected the string found in search */ @@ -3417,17 +3457,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) -{ - ModestMsgEditWindowPrivate *priv; - - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); - - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), FALSE); -} - gboolean modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) { @@ -3447,8 +3476,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) { @@ -3591,111 +3626,87 @@ on_account_removed (TnyAccountStore *account_store, typedef struct _MessageSettingsHelper { ModestMsgEditWindow *window; GSList *priority_group; - GtkWidget *align_picker; + GSList *format_group; } MessageSettingsHelper; static void -on_priority_toggle (HildonCheckButton *button, +on_priority_toggle (GtkToggleButton *button, MessageSettingsHelper *helper) { GSList *node; ModestMsgEditWindowPrivate *priv; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window); - if (hildon_check_button_get_active (button)) { + if (gtk_toggle_button_get_active (button)) { for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) { - HildonCheckButton *node_button = (HildonCheckButton *) node->data; + GtkToggleButton *node_button = (GtkToggleButton *) node->data; if ((node_button != button) && - hildon_check_button_get_active (node_button)) { - hildon_check_button_set_active (node_button, FALSE); + 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")); } - + 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)) { - HildonCheckButton *node_button = (HildonCheckButton *) node->data; - if (hildon_check_button_get_active (node_button)) { + GtkToggleButton *node_button = (GtkToggleButton *) node->data; + if (gtk_toggle_button_get_active (node_button)) { found = TRUE; break; } } if (!found) { - hildon_check_button_set_active (button, TRUE); + gtk_toggle_button_set_active (button, TRUE); } } } static void -on_format_picker_value_changed (HildonPickerButton *button, - MessageSettingsHelper *helper) +on_format_toggle (GtkToggleButton *button, + MessageSettingsHelper *helper) { - ModestMsgEditFormat new_format, old_format; - gint file_format; - - 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; - } + GSList *node; + ModestMsgEditWindowPrivate *priv; + ModestMsgEditFormat old_format; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window); 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); + if (gtk_toggle_button_get_active (button)) { - 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; + for (node = helper->format_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 (old_format != (ModestMsgEditFormat) g_object_get_data (G_OBJECT (button), "format")) { + modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window), + GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "file-format"))); + } + + } else { + gboolean found = FALSE; + /* If no one is active, activate it again */ + for (node = helper->format_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 -on_align_picker_value_changed (HildonPickerButton *button, - MessageSettingsHelper *helper) -{ - GtkJustification new_justify; - ModestMsgEditFormatState *format_state = NULL; - - 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 @@ -3707,11 +3718,10 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) GtkWidget *high_toggle, *medium_toggle, *low_toggle; GtkWidget *captioned; GtkSizeGroup *title_sizegroup, *value_sizegroup; - GtkWidget *format_picker; - GtkWidget *format_selector; + GtkWidget *format_hbox; + GtkWidget *html_toggle, *text_toggle; 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); @@ -3728,38 +3738,46 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) /* Priority toggles */ priority_hbox = gtk_hbox_new (TRUE, 0); - high_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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_check_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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_check_button_new (HILDON_SIZE_FINGER_HEIGHT); + 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, 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); + 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, - _("mcen_me_editor_message_priority"), priority_hbox); + _("mcen_me_editor_message_priority"), FALSE, 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); + /* format toggles */ + format_hbox = gtk_hbox_new (TRUE, 0); + html_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + gtk_button_set_label (GTK_BUTTON (html_toggle), _("mcen_me_editor_formatted_text")); + helper.format_group = g_slist_prepend (helper.format_group, html_toggle); + g_object_set_data (G_OBJECT (html_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_HTML)); + g_object_set_data (G_OBJECT (html_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_FORMATTED_TEXT)); + text_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT); + gtk_button_set_label (GTK_BUTTON (text_toggle), _("mcen_me_editor_plain_text")); + helper.format_group = g_slist_prepend (helper.format_group, text_toggle); + g_object_set_data (G_OBJECT (text_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_TEXT)); + g_object_set_data (G_OBJECT (text_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_PLAIN_TEXT)); + gtk_box_pack_start (GTK_BOX (format_hbox), html_toggle, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (format_hbox), text_toggle, TRUE, TRUE, 0); + gtk_widget_show_all (format_hbox); + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + _("mcen_me_editor_format"), FALSE, format_hbox); + gtk_widget_show (captioned); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); g_object_unref (title_sizegroup); @@ -3769,50 +3787,32 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window) /* Set current values */ switch (priv->priority_flags) { case TNY_HEADER_FLAG_HIGH_PRIORITY: - hildon_check_button_set_active (HILDON_CHECK_BUTTON (high_toggle), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (high_toggle), TRUE); break; case TNY_HEADER_FLAG_LOW_PRIORITY: - hildon_check_button_set_active (HILDON_CHECK_BUTTON (low_toggle), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (low_toggle), TRUE); break; default: - hildon_check_button_set_active (HILDON_CHECK_BUTTON (medium_toggle), TRUE); + 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); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (text_toggle), TRUE); 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); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (html_toggle), 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); + g_signal_connect (G_OBJECT (html_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper); + g_signal_connect (G_OBJECT (text_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -3849,16 +3849,6 @@ on_bcc_button_toggled (HildonCheckButton *button, hildon_check_button_get_active (button)); } -static void -on_find_toolbar_button_toggled (HildonCheckButton *button, - ModestMsgEditWindow *window) -{ - g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); - modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window), - hildon_check_button_get_active (button)); - -} - static void setup_menu (ModestMsgEditWindow *self) { @@ -3869,10 +3859,10 @@ setup_menu (ModestMsgEditWindow *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"), + 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"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "z", APP_MENU_CALLBACK (modest_ui_actions_on_undo), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo)); @@ -3893,22 +3883,17 @@ setup_menu (ModestMsgEditWindow *self) 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"), + 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"), + 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"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL, APP_MENU_CALLBACK (on_message_settings), NULL); - priv->find_toolbar_button = hildon_check_button_new (0); - gtk_button_set_label (GTK_BUTTON (priv->find_toolbar_button), _("mcen_me_viewer_find")); - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), - FALSE); - modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->find_toolbar_button), - NULL); - g_signal_connect (G_OBJECT (priv->find_toolbar_button), "toggled", - G_CALLBACK (on_find_toolbar_button_toggled), (gpointer) self); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "f", + APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page), + NULL); }