#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
ModestMsgEditWindow *window);
static void setup_menu (ModestMsgEditWindow *self);
-static void from_field_changed (HildonPickerButton *button,
+static void from_field_changed (GtkWidget *button,
ModestMsgEditWindow *self);
static void font_size_clicked (GtkToolButton *button,
ModestMsgEditWindow *window);
g_signal_connect (G_OBJECT (priv->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);
+ if (GTK_IS_COMBO_BOX (priv->from_field)) {
+ g_signal_connect (G_OBJECT (priv->from_field), "changed",
+ G_CALLBACK (from_field_changed), obj);
+ } else {
+ 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);
GtkWidget *send_icon;
GtkWidget *attachments_label;
GtkWidget *branding_box;
+ GtkWidget *from_caption;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
/* Note: This ModestPairList* must exist for as long as the picker
* that uses it, because the ModestSelectorPicker uses the ID opaquely,
* so it can't know how to manage its memory. */
- priv->from_field = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
- NULL, g_str_equal);
- modest_selector_picker_set_value_max_chars (MODEST_SELECTOR_PICKER (priv->from_field), MAX_FROM_VALUE);
- modest_maemo_utils_set_hbutton_layout (title_size_group, NULL,
- _("mail_va_from"), priv->from_field);
- hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 1.0);
- hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5);
- hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 1.0, 0.5);
+ priv->from_field = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
+ NULL, g_str_equal);
+ modest_selector_set_value_max_chars (priv->from_field, MAX_FROM_VALUE);
+ if (GTK_IS_COMBO_BOX (priv->from_field)) {
+ from_caption = modest_maemo_utils_create_captioned (title_size_group, NULL,
+ _("mail_va_from"), FALSE,
+ priv->from_field);
+ gtk_widget_show (from_caption);
+ } else {
+ modest_maemo_utils_set_hbutton_layout (title_size_group, NULL,
+ _("mail_va_from"), priv->from_field);
+ hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 1.0);
+ hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5);
+ hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 1.0, 0.5);
+ from_caption = priv->from_field;
+ }
priv->to_field = modest_recpt_editor_new ();
priv->cc_field = modest_recpt_editor_new ();
priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE);
priv->priority_icon = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0);
- priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ priv->subject_field = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
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"));
+ modest_entry_set_hint (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_widget_set_no_show_all (priv->brand_label, TRUE);
from_send_hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->from_field, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (from_send_hbox), from_caption, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (from_send_hbox), priv->send_button, FALSE, FALSE, 0);
branding_box = gtk_hbox_new (FALSE, MODEST_MARGIN_DEFAULT);
g_free (bcc);
}
+#ifdef MODEST_USE_CALENDAR_WIDGETS
+static void
+color_button_clicked (GtkButton *button)
+{
+ PipCalendarColor color;
+
+ /* Show ColorPicker dialog */
+ color = pip_color_picker_select_color(PipCalendarColorInvalid, 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));
/* Menubar. Update the state of some toggles */
priv->from_field_protos = get_transports ();
priv->original_mailbox = NULL;
- 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));
+ modest_selector_set_pair_list (priv->from_field, priv->from_field_protos);
+ modest_selector_set_active_id (priv->from_field, (gpointer) account_name);
+ priv->last_from_account = modest_selector_get_active_id (priv->from_field);
if (mailbox && modest_pair_list_find_by_first_as_string (priv->from_field_protos, mailbox)) {
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) mailbox);
+ modest_selector_set_active_id (priv->from_field, (gpointer) mailbox);
priv->original_mailbox = g_strdup (mailbox);
} else if (modest_account_mgr_account_is_multimailbox (modest_runtime_get_account_mgr (), account_name, NULL)) {
/* We set the first mailbox as the active mailbox */
priv->original_mailbox = multimailbox_get_default_mailbox (account_name);
if (priv->original_mailbox != NULL)
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field),
- (gpointer) priv->original_mailbox);
+ modest_selector_set_active_id (priv->from_field,
+ (gpointer) priv->original_mailbox);
else
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field),
- (gpointer) account_name);
+ modest_selector_set_active_id (priv->from_field,
+ (gpointer) account_name);
} else {
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->from_field), (gpointer) account_name);
+ modest_selector_set_active_id (priv->from_field, (gpointer) account_name);
}
- priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ priv->last_from_account = modest_selector_get_active_id (priv->from_field);
update_branding (MODEST_MSG_EDIT_WINDOW (obj), priv->last_from_account);
- hildon_button_set_title (HILDON_BUTTON (priv->from_field),
- _("mail_va_from"));
- hildon_button_set_value (HILDON_BUTTON (priv->from_field),
- hildon_touch_selector_get_current_text
- (HILDON_TOUCH_SELECTOR (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->from_field)))));
+ if (!GTK_IS_COMBO_BOX (priv->from_field)) {
+#ifdef HILDON_TOOLKIT_HILDON2
+ hildon_button_set_title (HILDON_BUTTON (priv->from_field),
+ _("mail_va_from"));
+ hildon_button_set_value (HILDON_BUTTON (priv->from_field),
+ hildon_touch_selector_get_current_text
+ (HILDON_TOUCH_SELECTOR (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->from_field)))));
+#endif
+ }
modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->isearch_toolbar));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (edit_window);
- picker_active_id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ picker_active_id = modest_selector_get_active_id (priv->from_field);
g_return_val_if_fail (picker_active_id, NULL);
account_name = modest_utils_get_account_name_from_recipient (picker_active_id, NULL);
/* don't free these (except from) */
data = g_slice_new0 (MsgData);
- data->from = g_strdup ((gchar *) modest_selector_picker_get_active_display_name (MODEST_SELECTOR_PICKER (priv->from_field)));
+ data->from = g_strdup ((gchar *) modest_selector_get_active_display_name (priv->from_field));
data->account_name = g_strdup (account_name);
data->to = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field)));
data->cc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
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;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
+ dialog = modest_toolkit_factory_create_file_chooser_dialog (modest_runtime_get_toolkit_factory (),
+ _("mcen_ia_select_inline_image_title"),
+ (GtkWindow *) window,
+ GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
modest_maemo_utils_setup_images_filechooser (GTK_FILE_CHOOSER (dialog));
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"));
+ dialog = modest_toolkit_factory_create_file_chooser_dialog (modest_runtime_get_toolkit_factory (),
+ _("mcen_ia_select_attachment_title"),
+ (GtkWindow *) window,
+ GTK_FILE_CHOOSER_ACTION_OPEN);
conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
if (conf_folder && conf_folder[0] != '\0') {
if (gtk_text_buffer_get_modified (priv->text_buffer))
return TRUE;
- account_name = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ account_name = modest_selector_get_active_id (priv->from_field);
if (priv->original_mailbox) {
if (!account_name || strcmp (account_name, priv->original_mailbox))
return TRUE;
/* 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)
g_free (signature);
}
- priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ priv->last_from_account = modest_selector_get_active_id (priv->from_field);
signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature);
if (has_new_signature) {
}
static void
-from_field_changed (HildonPickerButton *button,
+from_field_changed (GtkWidget *button,
ModestMsgEditWindow *self)
{
ModestMsgEditWindowPrivate *priv;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
old_account = priv->last_from_account;
- new_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
+ new_account = modest_selector_get_active_id (priv->from_field);
if (!new_account) {
g_warning ("%s, could not get the new account", __FUNCTION__);
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names),
NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
- priv->cc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
- _("mcen_me_editor_showcc"));
- modest_togglable_set_active (priv->cc_button,
- FALSE);
- modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->cc_button,
- NULL);
+ priv->cc_button = hildon_check_button_new (0);
+ gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
+ hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
+ FALSE);
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->cc_button, NULL);
g_signal_connect (G_OBJECT (priv->cc_button), "toggled",
G_CALLBACK (on_cc_button_toggled), (gpointer) self);
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;
+}
projects / modest / blobdiff