#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>
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+#include <calendar-ui-widgets.h>
+#endif
#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
-#define DEFAULT_MAIN_VBOX_SPACING 6
+#define DEFAULT_MAIN_VBOX_SPACING 0
#define SUBJECT_MAX_LENGTH 1000
#define IMAGE_MAX_WIDTH 560
#define DEFAULT_FONT_SCALE 1.5
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);
modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
priority_flags = tny_header_get_priority (header);
- if (to)
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to);
+ if (to) {
+ gchar *quoted_names = modest_text_utils_quote_names (to);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), quoted_names);
+ g_free (quoted_names);
+ }
field_view_set = TRUE;
if (cc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), cc);
+ gchar *quoted_names = modest_text_utils_quote_names (cc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), quoted_names);
+ g_free (quoted_names);
gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
gtk_widget_show (priv->cc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
field_view_set = TRUE;
if (bcc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+ gchar *quoted_names = modest_text_utils_quote_names (bcc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), quoted_names);
+ g_free (quoted_names);
gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
gtk_widget_show (priv->bcc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
g_free (bcc);
}
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+static void
+color_button_clicked (GtkButton *button)
+{
+ static PipCalendarColor color = PipCalendarColorInvalid;
+
+ /* Show ColorPicker dialog */
+ color = pip_color_picker_select_color(color, PipColorPickerText);
+
+ /* Check if some color is selected rather than dialog is dismissed */
+ if (color != PipCalendarColorInvalid) {
+ GdkColor *gdk_color = (GdkColor *) pip_calendar_color_get_gdkcolor (color);
+ if (gdk_color)
+ hildon_color_button_set_color ((HildonColorButton *) button, gdk_color);
+ }
+}
+#endif
static void
modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
G_CALLBACK (modest_msg_edit_window_color_button_change),
window);
+ /* Yes I know this is a horrible hack, but it works for the
+ moment while we don't create a ModestColorButton */
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+ GtkButtonClass *button_class = GTK_BUTTON_CLASS (HILDON_COLOR_BUTTON_GET_CLASS (priv->font_color_button));
+ button_class->clicked = color_button_clicked;
+#endif
+
/* Font size and face placeholder */
placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontAttributes");
insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
}
-#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
modest_msg_edit_window_undo (ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+ gboolean was_rich_text, is_rich_text;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+ was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
+ 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);
+ }
+
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
/* Check names */
g_object_ref (window);
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), &address_list)) {
+ if (!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 (!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 (!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",
+
+ 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);
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_viewer_addtocontacts"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
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 = 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;
+}