X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=f5317712ba294e42b2a117fb4c862dc0052f4ce0;hb=fbb938b07d9c0efd4664d713048729423fa4e770;hp=889e6114e48db27e9fe2c66fb8364d73315a3571;hpb=5089d780b87849c0a8309e495c49558a95acc65c;p=modest
diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 889e611..f531771 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -88,6 +88,7 @@
#define SUBJECT_MAX_LENGTH 1000
#define IMAGE_MAX_WIDTH 560
#define DEFAULT_FONT_SCALE 1.5
+#define ATTACHMENT_BUTTON_WIDTH 118
static gboolean is_wp_text_buffer_started = FALSE;
@@ -171,6 +172,8 @@ static void on_message_settings (GtkAction *action,
ModestMsgEditWindow *window);
static void setup_menu (ModestMsgEditWindow *self);
+static void from_field_changed (HildonPickerButton *button,
+ ModestMsgEditWindow *self);
static void DEBUG_BUFFER (WPTextBuffer *buffer)
{
#ifdef DEBUG
@@ -211,7 +214,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)},
};
@@ -235,6 +238,7 @@ struct _ModestMsgEditWindowPrivate {
ModestPairList *from_field_protos;
GtkWidget *from_field;
+ gchar *last_from_account;
gchar *original_account_name;
GtkWidget *to_field;
@@ -260,13 +264,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 +282,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 +299,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 +424,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 +499,22 @@ 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;
-
+ 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);
@@ -518,6 +524,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
@@ -619,6 +646,8 @@ connect_signals (ModestMsgEditWindow *obj)
g_signal_connect (G_OBJECT (priv->add_attachment_button), "clicked",
G_CALLBACK (modest_msg_edit_window_add_attachment_clicked), obj);
+ g_signal_connect (G_OBJECT (priv->from_field), "value-changed",
+ G_CALLBACK (from_field_changed), obj);
g_signal_connect (G_OBJECT (priv->msg_body), "focus-in-event",
G_CALLBACK (msg_body_focus), obj);
@@ -635,9 +664,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);
@@ -760,34 +789,36 @@ init_window (ModestMsgEditWindow *obj)
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
gtk_box_pack_start (GTK_BOX (subject_box), priv->subject_field, TRUE, TRUE, 0);
- priv->add_attachment_button = gtk_button_new ();
+ priv->add_attachment_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+ gtk_widget_set_size_request (priv->add_attachment_button, ATTACHMENT_BUTTON_WIDTH, -1);
GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS);
- gtk_button_set_relief (GTK_BUTTON (priv->add_attachment_button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE);
- gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 0.5);
attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, HILDON_ICON_SIZE_FINGER);
- gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon);
+ hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon);
gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, 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);
priv->header_box = gtk_vbox_new (FALSE, 0);
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 +868,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 +946,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;
@@ -1308,6 +1345,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
/* Toolbar */
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE);
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
/* Font color placeholder */
@@ -1317,7 +1356,8 @@ 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_set_size_request (priv->font_color_button, -1, 48);
+ 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);
@@ -1334,11 +1374,16 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
/* font_size */
tool_item = GTK_WIDGET (gtk_menu_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");
+ hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_FG,
+ GTK_STATE_INSENSITIVE, "SecondaryTextColor");
snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
markup = g_strconcat ("",
size_text,"", 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;
@@ -1367,17 +1412,22 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
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);
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), TRUE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
priv->font_size_toolitem = tool_item;
/* font face */
tool_item = GTK_WIDGET (gtk_menu_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);
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;
@@ -1410,8 +1460,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
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);
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), TRUE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
priv->font_face_toolitem = tool_item;
@@ -1463,6 +1513,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
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);
+ priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
hildon_button_set_title (HILDON_BUTTON (priv->from_field),
_("mail_va_from"));
hildon_button_set_value (HILDON_BUTTON (priv->from_field),
@@ -1480,7 +1531,6 @@ 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 ();
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 */
@@ -2175,31 +2225,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 ++;
@@ -2221,66 +2272,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);
}
@@ -2296,9 +2361,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;
@@ -2337,7 +2402,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
@@ -2347,7 +2412,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);
@@ -2392,7 +2457,12 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
if (att_list == NULL) {
- att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+ att_list = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+ if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list)) {
+ g_object_unref (att_list);
+ return;
+ }
+
} else {
g_object_ref (att_list);
}
@@ -2425,19 +2495,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)) {
@@ -3103,22 +3174,27 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
return FALSE;
}
+ g_object_ref (window);
if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+ g_object_unref (window);
return FALSE;
}
if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
+ g_object_unref (window);
return FALSE;
}
if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
+ g_object_unref (window);
return FALSE;
}
if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+ g_object_unref (window);
return TRUE;
@@ -3271,10 +3347,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);
}
@@ -3296,7 +3370,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
@@ -3380,7 +3453,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;
}
@@ -3396,14 +3469,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 */
@@ -3418,17 +3491,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)
{
@@ -3448,8 +3510,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)
{
@@ -3589,114 +3657,121 @@ on_account_removed (TnyAccountStore *account_store,
}
}
+static void
+from_field_changed (HildonPickerButton *button,
+ ModestMsgEditWindow *self)
+{
+ ModestMsgEditWindowPrivate *priv;
+ gboolean has_old_signature, has_new_signature;
+ GtkTextIter iter;
+ GtkTextIter match_start, match_end;
+ ModestAccountMgr *mgr;
+ gchar *signature;
+ gchar *full_signature;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+ gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
+ mgr = modest_runtime_get_account_mgr ();
+ signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_old_signature);
+ if (has_old_signature) {
+ full_signature = g_strconcat ("\n--\n", signature, NULL);
+ if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) {
+ gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end);
+ iter = match_start;
+ } else if (gtk_text_iter_forward_search (&iter, _("mcen_ia_editor_original_message"), 0,
+ &match_start, &match_end, NULL)) {
+ iter = match_start;
+ }
+ g_free (full_signature);
+ }
+ g_free (signature);
+
+ priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_new_signature);
+ if (has_new_signature) {
+ full_signature = g_strconcat ("\n--\n", signature, NULL);
+ gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
+ g_free (full_signature);
+ }
+ g_free (signature);
+}
+
typedef struct _MessageSettingsHelper {
ModestMsgEditWindow *window;
GSList *priority_group;
- GtkWidget *align_picker;
+ GSList *format_group;
+ GtkToggleButton *current_priority;
+ GtkToggleButton *current_format;
} 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"));
}
-
-
+ helper->current_priority = button;
} 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;
- 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);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window);
+ 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);
+ }
+ }
+ helper->current_format = button;
+ } 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
@@ -3708,12 +3783,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 *align_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);
@@ -3723,122 +3796,119 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
title_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
value_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- dialog = gtk_dialog_new ();
+ dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL,
+ 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);
gtk_widget_show (vbox);
/* 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);
-
- /* alignment selector */
- align_selector = hildon_touch_selector_new_text ();
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_left"));
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_centred"));
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_right"));
- helper.align_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (helper.align_picker), HILDON_TOUCH_SELECTOR (align_selector));
- modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
- _("mcen_me_editor_align"), helper.align_picker);
- gtk_widget_show_all (helper.align_picker);
- gtk_box_pack_start (GTK_BOX (vbox), helper.align_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);
+ gtk_widget_show (format_hbox);
+ gtk_box_pack_start (GTK_BOX (vbox), format_hbox, FALSE, FALSE, 0);
+
+
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
- gtk_window_set_title (GTK_WINDOW (dialog), _("TODO: Message settings"));
-
+
/* 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);
+ helper.current_priority = GTK_TOGGLE_BUTTON (high_toggle);
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);
+ helper.current_priority = GTK_TOGGLE_BUTTON (low_toggle);
break;
default:
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (medium_toggle), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (medium_toggle), TRUE);
+ helper.current_priority = GTK_TOGGLE_BUTTON (medium_toggle);
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);
+ helper.current_format = GTK_TOGGLE_BUTTON (text_toggle);
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);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (html_toggle), TRUE);
+ helper.current_format = GTK_TOGGLE_BUTTON (html_toggle);
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 */
-
+ 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);
+
+ /* Save settings if the user clicked on done */
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+ TnyHeaderFlags flags;
+ ModestMsgEditFormat old_format, new_format;
+
+ /* Set priority flags */
+ flags = (TnyHeaderFlags) g_object_get_data (G_OBJECT (helper.current_priority), "priority");
+ if (priv->priority_flags != flags)
+ modest_msg_edit_window_set_priority_flags (window, flags);
+
+ /* Set edit format */
+ old_format = modest_msg_edit_window_get_format (window);
+ new_format = (ModestMsgEditFormat) g_object_get_data (G_OBJECT (helper.current_format), "format");
+ if (old_format != new_format) {
+ gint file_format = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (helper.current_format), "file-format"));
+ modest_msg_edit_window_set_file_format (window, file_format);
+ }
+ }
+
gtk_widget_destroy (dialog);
g_slist_free (helper.priority_group);
-
}
-static void on_message_settings (GtkAction *action,
- ModestMsgEditWindow *window)
+static void
+on_message_settings (GtkAction *action,
+ ModestMsgEditWindow *window)
{
modest_msg_edit_window_show_msg_settings_dialog (window);
}
@@ -3863,16 +3933,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)
{
@@ -3883,10 +3943,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));
@@ -3907,22 +3967,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), _("TODO: 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);
}