#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;
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
ModestPairList *from_field_protos;
GtkWidget *from_field;
+ gchar *last_from_account;
gchar *original_account_name;
GtkWidget *to_field;
GtkTextMark *insert;
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);
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);
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);
/* 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 */
priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
priv->font_color_button = hildon_color_button_new ();
+ 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);
/* 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 ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
size_text,"</span>", 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;
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 ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", 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;
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;
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),
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);
}
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;
}
}
+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;
GSList *format_group;
+ GtkToggleButton *current_priority;
+ GtkToggleButton *current_format;
} MessageSettingsHelper;
static void
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 */
{
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 (gtk_toggle_button_get_active (button)) {
for (node = helper->format_group; node != NULL; node = g_slist_next (node)) {
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")));
- }
-
+ helper->current_format = button;
} else {
gboolean found = FALSE;
/* If no one is active, activate it again */
switch (priv->priority_flags) {
case TNY_HEADER_FLAG_HIGH_PRIORITY:
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:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (low_toggle), TRUE);
+ helper.current_priority = GTK_TOGGLE_BUTTON (low_toggle);
break;
default:
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:
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:
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (html_toggle), TRUE);
+ helper.current_format = GTK_TOGGLE_BUTTON (html_toggle);
break;
}
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);
- /* Show */
- gtk_dialog_run (GTK_DIALOG (dialog));
+ /* 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
+static void
on_message_settings (GtkAction *action,
ModestMsgEditWindow *window)
{
projects / modest / blobdiff