#include "modest-msg-edit-window-ui-dimming.h"
#include "modest-hildon-includes.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-color-chooser.h>
-#endif
#include "widgets/modest-msg-edit-window-ui.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
#include <libgnomevfs/gnome-vfs-mime.h>
-#endif
#include <modest-utils.h>
#include "modest-maemo-utils.h"
#include <modest-ui-constants.h>
+#include "modest-color-button.h"
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+#include <calendar-ui-widgets.h>
+#endif
#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
GtkTextIter *iter,
GtkTextMark *mark,
ModestMsgEditWindow *userdata);
+static void on_show_toolbar_button_toggled (HildonCheckButton *button,
+ ModestMsgEditWindow *window);
static void on_message_settings (GtkAction *action,
ModestMsgEditWindow *window);
static void setup_menu (ModestMsgEditWindow *self);
GtkWidget *priority_icon;
GtkWidget *subject_box;
GtkWidget *send_button;
+ GtkWidget *bottom_send_button;
+ GtkWidget *bottom_send_button_container;
GtkWidget *cc_caption;
GtkWidget *bcc_caption;
GtkWidget *app_menu;
GtkWidget *cc_button;
GtkWidget *bcc_button;
+ GtkWidget *show_toolbar_button;
GtkWidget *max_chars_banner;
GtkWidget *brand_icon;
GtkWidget *brand_label;
GtkWidget *brand_container;
+
+ TnyList *custom_header_pairs;
};
#define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
priv->references = NULL;
priv->in_reply_to = NULL;
priv->max_chars_banner = NULL;
+ priv->custom_header_pairs = TNY_LIST (tny_simple_list_new ());
if (!is_wp_text_buffer_started) {
is_wp_text_buffer_started = TRUE;
GtkRequisition *req,
gpointer user_data)
{
+ ModestMsgEditWindowPrivate *priv;
+ GtkAdjustment *vadj;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(user_data);
+
/* Make sure the body always get at least 70 pixels */
if (req->height < 70)
req->height = 70;
+
+ vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
+ if (priv->header_box->allocation.height + req->height > GTK_WIDGET (user_data)->allocation.height) {
+ if (!GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
+ gtk_widget_show (priv->bottom_send_button_container);
+ }
+ } else {
+ if (GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
+ gtk_widget_hide (priv->bottom_send_button_container);
+ }
+ }
}
static void
g_signal_connect (G_OBJECT (priv->send_button), "clicked",
G_CALLBACK (modest_ui_actions_on_send), obj);
+ g_signal_connect (G_OBJECT (priv->bottom_send_button), "clicked",
+ G_CALLBACK (modest_ui_actions_on_send), obj);
+
g_signal_connect (G_OBJECT (priv->from_field), "value-changed",
G_CALLBACK (from_field_changed), obj);
priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE);
gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH);
g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
+ hildon_entry_set_placeholder ((HildonEntry *) priv->subject_field, _("mail_va_no_subject"));
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 (priv->subject_box), priv->subject_field, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon);
gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1);
+ priv->bottom_send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER);
+ gtk_container_add (GTK_CONTAINER (priv->bottom_send_button), send_icon);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->bottom_send_button), 148, -1);
+
+ priv->bottom_send_button_container = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (priv->bottom_send_button_container);
+ gtk_box_pack_end (GTK_BOX (priv->bottom_send_button_container), priv->bottom_send_button, FALSE, FALSE, 0);
+ gtk_widget_show (priv->bottom_send_button_container);
+
g_object_unref (title_size_group);
g_object_unref (value_size_group);
priv->find_toolbar = hildon_find_toolbar_new (NULL);
gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
-/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
-
priv->pannable = hildon_pannable_area_new ();
g_object_set (G_OBJECT (priv->pannable), "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
-
+
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_alignment_set_padding (GTK_ALIGNMENT (window_align), MODEST_MARGIN_HALF, 0,
+ MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), priv->bottom_send_button_container, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
gtk_widget_show_all (GTK_WIDGET(priv->pannable));
-
+
window_box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER(obj), window_box);
gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0);
/* Set window icon */
- window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
+ window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
if (window_icon) {
gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
g_object_unref (window_icon);
- }
+ }
}
-
+
static void
modest_msg_edit_window_disconnect_signals (ModestWindow *window)
{
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
+ g_object_unref (priv->custom_header_pairs);
+
if (priv->max_chars_banner) {
g_object_weak_unref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, obj);
priv->max_chars_banner = FALSE;
g_object_unref (iter);
}
+static gboolean
+remove_non_calendar_headers (TnyList *list,
+ GObject *item,
+ gpointer match_data)
+{
+ if (g_str_has_prefix (tny_pair_get_name (TNY_PAIR (item)), "X-as"))
+ return FALSE;
+ else
+ return TRUE;
+}
+
static void
set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
{
TnyFolder *msg_folder;
gboolean is_html = FALSE;
gboolean field_view_set;
+ TnyList *orig_header_pairs;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
g_return_if_fail (TNY_IS_MSG (msg));
TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
if (type == TNY_FOLDER_TYPE_INVALID)
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-
+
if (type == TNY_FOLDER_TYPE_DRAFTS)
priv->draft_msg = g_object_ref(msg);
if (type == TNY_FOLDER_TYPE_OUTBOX)
g_object_unref (msg_folder);
}
+ /* Copy orig headers used by ActiveSync calendar invitations */
+ orig_header_pairs = TNY_LIST (tny_simple_list_new ());
+ tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), orig_header_pairs);
+ tny_list_remove_matches (orig_header_pairs, remove_non_calendar_headers, NULL);
+ if (tny_list_get_length (orig_header_pairs) > 0)
+ modest_msg_edit_window_set_custom_header_pairs (self, orig_header_pairs);
+ g_object_unref (orig_header_pairs);
+
g_free (to);
g_free (subject);
g_free (cc);
g_free (bcc);
}
-
static void
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 ();
+ priv->font_color_button = modest_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);
tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
+ tool_item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsInsertImage");
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
/* Explicitelly show all the toolbar (a normal gtk_widget_show
will not show the tool items added to the placeholders) */
/* Set the no show all *after* showing all items. We do not
want the toolbar to be shown with a show all because it
- could go agains the gconf setting regarding showing or not
+ could go against the gconf setting regarding showing or not
the toolbar of the editor window */
gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
}
modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->send_button,
G_CALLBACK (modest_ui_dimming_rules_on_send),
MODEST_WINDOW (obj));
+ modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->bottom_send_button,
+ G_CALLBACK (modest_ui_dimming_rules_on_send),
+ MODEST_WINDOW (obj));
/* Insert dimming rules group for this window */
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
g_object_unref (att_iter);
data->priority_flags = priv->priority_flags;
+ data->custom_header_pairs = tny_list_copy (priv->custom_header_pairs);
return data;
}
g_free (data->account_name);
g_free (data->references);
g_free (data->in_reply_to);
+
+ g_object_unref (data->custom_header_pairs);
if (data->draft_msg != NULL) {
g_object_unref (data->draft_msg);
switch (format) {
case MODEST_MSG_EDIT_FORMAT_HTML:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
- if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar);
+ update_signature (self, priv->last_from_account, priv->last_from_account);
+ if (parent_priv->toolbar)
+ on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ MODEST_MSG_EDIT_WINDOW (self));
break;
case MODEST_MSG_EDIT_FORMAT_TEXT:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
- if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+ if (parent_priv->toolbar)
+ on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ MODEST_MSG_EDIT_WINDOW (self));
break;
default:
g_return_if_reached ();
}
-#ifdef MODEST_HILDON_VERSION_0
-void
-modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
-{
-
- WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
- ModestMsgEditWindowPrivate *priv;
- GtkWidget *dialog = NULL;
- gint response;
- GdkColor *new_color = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
-
- dialog = hildon_color_selector_new (GTK_WINDOW (window));
- hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog), &(buffer_format->color));
- g_free (buffer_format);
-
- if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
- new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
- if (new_color != NULL) {
- wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
- (gpointer) new_color);
- }
- }
- gtk_widget_destroy (dialog);
-}
-
void
-modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
-{
-
- ModestMsgEditWindowPrivate *priv;
- GtkWidget *dialog = NULL;
- gint response;
- GdkColor *old_color = NULL;
- const GdkColor *new_color = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
-
- dialog = hildon_color_selector_new (GTK_WINDOW (window));
- hildon_color_selector_set_color (HILDON_COLOR_SELECTOR (dialog),(GdkColor*)old_color);
-
- if (gtk_dialog_run (GTK_DIALOG (dialog) == GTK_RESPONSE_OK)) {
- new_color = hildon_color_selector_get_color (HILDON_COLOR_SELECTOR (dialog));
- if (new_color != NULL)
- wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), new_color);
- }
- gtk_widget_destroy (dialog);
-
-}
-
-#else
-void
modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
{
-
WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
ModestMsgEditWindowPrivate *priv;
GtkWidget *dialog = NULL;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
-
+
dialog = hildon_color_chooser_new ();
hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
g_free (buffer_format);
void
modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
{
-
ModestMsgEditWindowPrivate *priv;
GtkWidget *dialog = NULL;
GdkColor *old_color = NULL;
gtk_widget_destroy (dialog);
}
-#endif /*!MODEST_HILDON_VERSION_0*/
-
-
static TnyStream*
create_stream_for_uri (const gchar* uri)
gpointer userdata)
{
ModestMsgEditWindowPrivate *priv;
- GdkColor *new_color;
+ GdkColor new_color;
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
- new_color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->font_color_button));
-#else
- GdkColor col;
- hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &col);
- new_color = &col;
-#endif /*#ifdef MODEST_HAVE_HILDON0_WIDGETS*/
-
- wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) new_color);
-
- gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
+ hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &new_color);
+
+ wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) &new_color);
+
+ gtk_window_set_focus (GTK_WINDOW (window), priv->msg_body);
}
static void
} else {
gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
}
+ modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, show_toolbar, NULL);
+ if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button)) != show_toolbar) {
+ hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button), show_toolbar);
+ }
}
void
case MODEST_FILE_FORMAT_FORMATTED_TEXT:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+ update_signature (window, priv->last_from_account, priv->last_from_account);
if (parent_priv->toolbar)
- gtk_widget_show (parent_priv->toolbar);
+ on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ MODEST_MSG_EDIT_WINDOW (window));
break;
case MODEST_FILE_FORMAT_PLAIN_TEXT:
{
if (response == GTK_RESPONSE_OK) {
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
if (parent_priv->toolbar)
- gtk_widget_hide (parent_priv->toolbar);
+ on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ MODEST_MSG_EDIT_WINDOW (window));
} else {
GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"));
modest_utils_toggle_action_set_active_block_notify (action, TRUE);
is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
if (parent_priv->toolbar && was_rich_text != is_rich_text) {
- if (is_rich_text)
- gtk_widget_show (parent_priv->toolbar);
- else
- gtk_widget_hide (parent_priv->toolbar);
+ on_show_toolbar_button_toggled (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ MODEST_MSG_EDIT_WINDOW (window));
}
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
{
ModestMsgEditWindowPrivate *priv = NULL;
GSList *address_list = NULL;
+ gboolean no_to, no_cc, no_bcc;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
/* check if there's no recipient added */
- if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) &&
- (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) &&
- (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) {
+ no_to = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)));
+ no_cc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field)));
+ no_bcc = modest_text_utils_no_recipient (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field)));
+
+
+ if (no_to && no_cc && no_bcc) {
/* no recipient contents, then select contacts */
modest_msg_edit_window_open_addressbook (window, NULL);
return FALSE;
/* Check names */
g_object_ref (window);
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), &address_list)) {
+ if (!no_to && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
+ (add_to_addressbook) ? &address_list : NULL)) {
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), &address_list)) {
+ if (!no_cc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
+ (add_to_addressbook) ? &address_list : NULL)) {
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), &address_list)) {
+ if (!no_bcc && !modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
+ (add_to_addressbook) ? &address_list : NULL)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
g_object_unref (window);
return FALSE;
}
/* Add contacts to address book */
- if (address_list)
+ if (add_to_addressbook && address_list)
modest_address_book_add_address_list (address_list);
if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
}
+void
+modest_msg_edit_window_add_to_contacts (ModestMsgEditWindow *self)
+{
+ GSList *recipients = NULL;
+ ModestMsgEditWindowPrivate *priv;
+ gchar *joined, *after_remove, *to, *cc, *bcc;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+ /* First of all check names */
+ if (!modest_msg_edit_window_check_names (self, FALSE))
+ return;
+
+ if (!modest_msg_edit_window_has_pending_addresses (self))
+ return;
+
+ /* Don't add the from obviously */
+ to = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->to_field));
+ cc = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->cc_field));
+ bcc = g_strdup (modest_recpt_editor_get_recipients ((ModestRecptEditor *) priv->bcc_field));
+
+ joined = modest_text_utils_join_addresses (NULL, to, cc, bcc);
+ g_free (to);
+ g_free (cc);
+ g_free (bcc);
+
+ after_remove = modest_text_utils_remove_duplicate_addresses (joined);
+ g_free (joined);
+
+ recipients = modest_text_utils_split_addresses_list (after_remove);
+ g_free (after_remove);
+
+ if (recipients) {
+ /* Offer the user to add recipients to the address book */
+ modest_address_book_add_address_list_with_selector (recipients, (GtkWindow *) self);
+ g_slist_foreach (recipients, (GFunc) g_free, NULL); g_slist_free (recipients);
+ }
+}
+
static void
modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
ModestMsgEditWindow *window)
&match_start, &match_end, NULL)) {
iter = match_start;
}
+ } else {
+ gtk_text_buffer_get_end_iter (priv->text_buffer, &iter);
}
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_from_recipient (mgr, new_account, &has_new_signature);
if (has_new_signature) {
- gchar *full_signature = g_strconcat (MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
+ gboolean is_rich;
+
+ gchar *full_signature = g_strconcat ((gtk_text_iter_starts_line (&iter)) ? "" : "\n",
+ MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
signature, NULL);
- gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
- g_free (full_signature);
+ is_rich = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+ if (is_rich) {
+ WPTextBufferFormat *fmt;
+ GdkColor style_color;
+ if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ gdk_color_parse ("grey", &style_color);
+ }
+ fmt = g_new0 (WPTextBufferFormat, 1);
+ fmt->color = style_color;
+ fmt->cs.color = 0x1;
+ wp_text_buffer_insert_with_attribute (WP_TEXT_BUFFER (priv->text_buffer), &iter,
+ full_signature, -1,
+ fmt, TRUE);
+ g_free (fmt);
+ g_free (full_signature);
+ } else {
+ gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
+ }
}
g_free (signature);
gtk_text_buffer_end_user_action (priv->text_buffer);
}
static void
+on_show_toolbar_button_toggled (HildonCheckButton *button,
+ ModestMsgEditWindow *window)
+{
+ g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+ modest_msg_edit_window_show_toolbar (MODEST_WINDOW (window),
+ hildon_check_button_get_active (button));
+}
+
+static void
on_cc_button_toggled (HildonCheckButton *button,
ModestMsgEditWindow *window)
{
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
/* Settings menu buttons */
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
- APP_MENU_CALLBACK (modest_ui_actions_on_check_names),
- NULL);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
- APP_MENU_CALLBACK (modest_ui_actions_on_undo),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
priv->cc_button = hildon_check_button_new (0);
gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5);
gtk_button_set_alignment (GTK_BUTTON (priv->bcc_button), 0.5, 0.5);
- 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));
+ priv->show_toolbar_button = hildon_check_button_new (0);
+ gtk_button_set_label (GTK_BUTTON (priv->show_toolbar_button), _("mcen_bd_show_toolbar"));
+ hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->show_toolbar_button),
+ FALSE);
+ modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->show_toolbar_button),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar));
+ g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled",
+ G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self);
+ gtk_button_set_alignment (GTK_BUTTON (priv->show_toolbar_button), 0.5, 0.5);
+ gtk_button_set_alignment (GTK_BUTTON (priv->show_toolbar_button), 0.5, 0.5);
+
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL,
+ APP_MENU_CALLBACK (on_message_settings),
+ NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_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_editor_add_attachment"), NULL,
APP_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked),
NULL);
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL,
- APP_MENU_CALLBACK (on_message_settings),
- NULL);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
- APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
- NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
}
static void
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
priv->max_chars_banner = NULL;
}
+
+static gboolean
+has_pending_addresses (ModestRecptEditor *recpt_editor)
+{
+ const gchar *recipients = NULL;
+ GSList *start_indexes = NULL, *end_indexes = NULL;
+ GSList *current_start, *current_end;
+ GtkTextBuffer *buffer;
+ gint offset_delta = 0;
+ gint last_length;
+ gboolean has_recipients_to_add = FALSE;
+
+ recipients = modest_recpt_editor_get_recipients (recpt_editor);
+ last_length = g_utf8_strlen (recipients, -1);
+ modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes);
+
+ if (!start_indexes)
+ return FALSE;
+
+ current_start = start_indexes;
+ current_end = end_indexes;
+ buffer = modest_recpt_editor_get_buffer (recpt_editor);
+
+ while (current_start && !has_recipients_to_add) {
+ gchar *address;
+ gchar *start_ptr, *end_ptr;
+ gint start_pos, end_pos;
+
+ start_pos = (*((gint*) current_start->data)) + offset_delta;
+ end_pos = (*((gint*) current_end->data)) + offset_delta;
+
+ start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
+ end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
+
+ address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr));
+
+ if (modest_text_utils_validate_recipient (address, NULL)) {
+ if (!modest_address_book_has_address (address)) {
+ has_recipients_to_add = TRUE;
+ }
+ }
+ current_start = g_slist_next (current_start);
+ current_end = g_slist_next (current_end);
+ }
+ return has_recipients_to_add;
+}
+
+gboolean
+modest_msg_edit_window_has_pending_addresses (ModestMsgEditWindow *self)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+
+ g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(self), FALSE);
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+ if (!has_pending_addresses ((ModestRecptEditor *) priv->to_field) &&
+ !has_pending_addresses ((ModestRecptEditor *) priv->cc_field) &&
+ !has_pending_addresses ((ModestRecptEditor *) priv->bcc_field))
+ return FALSE;
+ else
+ return TRUE;
+}
+
+void
+modest_msg_edit_window_set_custom_header_pairs (ModestMsgEditWindow *self,
+ TnyList *header_pairs)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
+ g_return_if_fail (TNY_IS_LIST (header_pairs));
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+ g_object_unref (priv->custom_header_pairs);
+ priv->custom_header_pairs = tny_list_copy (header_pairs);
+}
projects / modest / blobdiff