#include <tny-simple-list.h>
#include <modest-wp-text-view.h>
#include <wptextbuffer.h>
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
+#include <modest-isearch-toolbar.h>
#include <hildon/hildon-touch-selector.h>
#include <hildon/hildon-picker-dialog.h>
#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
static void update_window_title (ModestMsgEditWindow *window);
/* Find toolbar */
-static void modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
- ModestMsgEditWindow *window);
-static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
- ModestMsgEditWindow *window);
+static void modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
+ ModestMsgEditWindow *window);
+static void modest_msg_edit_window_isearch_toolbar_close (GtkWidget *widget,
+ ModestMsgEditWindow *window);
static gboolean gtk_text_iter_forward_search_insensitive (const GtkTextIter *iter,
const gchar *str,
GtkTextIter *match_start,
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);
gint current_size_index;
GtkWidget *size_tool_button_label;
- GtkWidget *find_toolbar;
+ GtkWidget *isearch_toolbar;
gchar *last_search;
GtkWidget *font_dialog;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
guint correct_scroll_idle;
guint scroll_drag_timeout_id;
gdouble last_upper;
priv->priority_flags = 0;
- priv->find_toolbar = NULL;
+ priv->isearch_toolbar = NULL;
priv->last_search = NULL;
priv->draft_msg = NULL;
offset_min = priv->msg_body->allocation.y + rectangle.y;
offset_max = offset_min + rectangle.height;
- vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
+ vadj = modest_scrollable_get_vadjustment (MODEST_SCROLLABLE (priv->scrollable));
offset_min = MAX (offset_min - 48, 0);
offset_max = MIN (offset_max + 48, vadj->upper);
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);
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), "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);
+ g_signal_connect (G_OBJECT (priv->isearch_toolbar), "isearch-search",
+ G_CALLBACK (modest_msg_edit_window_isearch_toolbar_search), obj);
+ g_signal_connect (G_OBJECT (priv->isearch_toolbar), "isearch-close",
+ G_CALLBACK (modest_msg_edit_window_isearch_toolbar_close), obj);
priv->clipboard_change_handler_id =
g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
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_toolkit_utils_create_captioned (title_size_group, NULL,
+ _("mail_va_from"), FALSE,
+ priv->from_field);
+ gtk_widget_show (from_caption);
+ } else {
+ modest_toolkit_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);
priv->bcc_caption = _create_addressbook_box
(title_size_group, value_size_group,
_("mail_va_hotfix1"), priv->bcc_field);
- subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- _("mail_va_subject"), FALSE, priv->subject_box);
- priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (NULL, NULL,
- _("mail_va_attachment"),
- FALSE,
- priv->attachments_view,
- HILDON_SIZE_AUTO_WIDTH |
- HILDON_SIZE_AUTO_HEIGHT);
- attachments_label = modest_maemo_utils_captioned_get_label_widget (priv->attachments_caption);
+ subject_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+ _("mail_va_subject"), FALSE, priv->subject_box);
+ priv->attachments_caption = modest_toolkit_utils_create_captioned_with_size_type (NULL, NULL,
+ _("mail_va_attachment"),
+ FALSE,
+ priv->attachments_view,
+ HILDON_SIZE_AUTO_WIDTH |
+ HILDON_SIZE_AUTO_HEIGHT);
+ attachments_label = modest_toolkit_utils_captioned_get_label_widget (priv->attachments_caption);
hildon_gtk_widget_set_theme_size (attachments_label, HILDON_SIZE_AUTO_HEIGHT);
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);
#endif
wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
- priv->find_toolbar = hildon_find_toolbar_new (NULL);
- gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
+ priv->isearch_toolbar = modest_toolkit_factory_create_isearch_toolbar (modest_runtime_get_toolkit_factory (),
+ NULL);
+ gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE);
/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
- priv->pannable = hildon_pannable_area_new ();
+ priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
- g_object_set (G_OBJECT (priv->pannable), "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
+ g_object_set (G_OBJECT (priv->scrollable), "horizontal-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_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 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));
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align);
+ gtk_widget_show_all (GTK_WIDGET(priv->scrollable));
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);
+ gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0);
/* Set window icon */
window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
gtk_widget_hide (priv->cc_caption);
field_view_set = FALSE;
}
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button), field_view_set);
+ modest_togglable_set_active (priv->cc_button, field_view_set);
field_view_set = TRUE;
if (bcc) {
gtk_widget_hide (priv->bcc_caption);
field_view_set = FALSE;
}
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button), field_view_set);
+ modest_togglable_set_active (priv->bcc_button, field_view_set);
if (subject)
g_free (bcc);
}
-
static void
modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
{
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));
+ modest_window_add_toolbar (MODEST_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
/* Font color placeholder */
placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor");
/* 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);
/* 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));
- hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
+ modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->isearch_toolbar));
/* Init window */
connect_signals (MODEST_MSG_EDIT_WINDOW(obj));
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)));
}
-#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)
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 (tny_list_get_length (att_list) == 0) {
- hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove"));
+ modest_platform_system_banner (NULL, NULL, _("TODO: no attachments selected to remove"));
} else {
gboolean dialog_response;
gchar *message = NULL;
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
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)
if (subject == NULL || subject[0] == '\0')
subject = _("mail_va_new_email");
- gtk_window_set_title (GTK_WINDOW (window), subject);
+ modest_window_set_title (MODEST_WINDOW (window), subject);
}
}
if (result_len + old_length > 1000) {
- hildon_banner_show_information (GTK_WIDGET (window), NULL,
+ modest_platform_system_banner (GTK_WIDGET (window), NULL,
_CS("ckdg_ib_maximum_characters_reached"));
}
g_string_free (result, TRUE);
}
void
-modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
- gboolean show)
+modest_msg_edit_window_toggle_isearch_toolbar (ModestMsgEditWindow *window,
+ gboolean show)
{
ModestMsgEditWindowPrivate *priv = NULL;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- gtk_widget_set_no_show_all (priv->find_toolbar, FALSE);
+ gtk_widget_set_no_show_all (priv->isearch_toolbar, FALSE);
if (show) {
- gtk_widget_show_all (priv->find_toolbar);
- hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
+ gtk_widget_show_all (priv->isearch_toolbar);
+ modest_isearch_toolbar_highlight_entry (MODEST_ISEARCH_TOOLBAR (priv->isearch_toolbar), TRUE);
} else {
- gtk_widget_hide_all (priv->find_toolbar);
+ gtk_widget_hide_all (priv->isearch_toolbar);
gtk_widget_grab_focus (priv->msg_body);
}
}
static void
-modest_msg_edit_window_find_toolbar_search (GtkWidget *widget,
- ModestMsgEditWindow *window)
+modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
+ ModestMsgEditWindow *window)
{
- gchar *current_search = NULL;
+ const gchar *current_search = NULL;
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
gboolean result;
GtkTextIter selection_start, selection_end;
if (message_is_empty (window)) {
g_free (priv->last_search);
priv->last_search = NULL;
- hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
+ modest_platform_system_banner (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
return;
}
- g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL);
+ current_search = modest_isearch_toolbar_get_search (MODEST_ISEARCH_TOOLBAR (widget));
if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
- g_free (current_search);
g_free (priv->last_search);
priv->last_search = NULL;
/* Information banner about empty search */
- hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+ modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
return;
}
result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search,
&match_start, &match_end);
if (!result)
- hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+ modest_platform_system_banner (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, _HL("ckct_ib_find_no_matches"));
+ modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
}
/* Mark as selected the string found in search */
g_free (priv->last_search);
priv->last_search = NULL;
}
- g_free (current_search);
}
gboolean
}
static void
-modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
- ModestMsgEditWindow *window)
+modest_msg_edit_window_isearch_toolbar_close (GtkWidget *widget,
+ ModestMsgEditWindow *window)
{
- modest_msg_edit_window_toggle_find_toolbar (window, FALSE);
+ modest_msg_edit_window_toggle_isearch_toolbar (window, FALSE);
}
void
&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));
+ 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) {
- 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);
}
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__);
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"), FALSE, priority_hbox);
+ captioned = modest_toolkit_utils_create_captioned (title_sizegroup, value_sizegroup,
+ _("mcen_me_editor_message_priority"), FALSE, priority_hbox);
gtk_widget_show (captioned);
gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
}
static void
-on_cc_button_toggled (HildonCheckButton *button,
+on_cc_button_toggled (GtkWidget *button,
ModestMsgEditWindow *window)
{
g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window),
- hildon_check_button_get_active (button));
+ modest_togglable_get_active (button));
}
static void
-on_bcc_button_toggled (HildonCheckButton *button,
+on_bcc_button_toggled (GtkWidget *button,
ModestMsgEditWindow *window)
{
g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
- hildon_check_button_get_active (button));
+ modest_togglable_get_active (button));
}
static void
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));
+ 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 = 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_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->cc_button),
- NULL);
+ 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);
- gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5);
- gtk_button_set_alignment (GTK_BUTTON (priv->cc_button), 0.5, 0.5);
- priv->bcc_button = hildon_check_button_new (0);
- gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc"));
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button),
- FALSE);
- modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->bcc_button),
- NULL);
+ priv->bcc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
+ _("mcen_me_editor_showbcc"));
+ modest_togglable_set_active (priv->bcc_button,
+ FALSE);
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->bcc_button,
+ NULL);
g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
- 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));
- 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_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_add_attachment"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_msg_edit_window_add_attachment_clicked),
+ NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (on_message_settings),
+ NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
+ NULL);
}
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;
+}
projects / modest / blobdiff