#include <modest-wp-text-view.h>
#include <wptextbuffer.h>
#include <hildon/hildon-pannable-area.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"
ModestMsgEditWindow *window);
static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
gpointer userdata);
-static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
- gpointer userdata);
-static void modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
- gpointer userdata);
static void modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window);
static void modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window,
static void from_field_changed (HildonPickerButton *button,
ModestMsgEditWindow *self);
+static void font_size_clicked (GtkToolButton *button,
+ ModestMsgEditWindow *window);
+static void font_face_clicked (GtkToolButton *button,
+ ModestMsgEditWindow *window);
static void DEBUG_BUFFER (WPTextBuffer *buffer)
{
#ifdef DEBUG
GtkWidget *from_field;
gchar *last_from_account;
gchar *original_account_name;
+
+ gchar *references;
+ gchar *in_reply_to;
GtkWidget *to_field;
GtkWidget *cc_field;
GtkWidget *font_color_button;
GtkWidget *font_color_toolitem;
GSList *font_items_group;
+ GtkTreeModel *faces_model;
+ gint current_face_index;
GtkWidget *font_tool_button_label;
- GSList *size_items_group;
+ GtkTreeModel *sizes_model;
+ gint current_size_index;
GtkWidget *size_tool_button_label;
GtkWidget *find_toolbar;
restore_settings (ModestMsgEditWindow *self)
{
ModestConf *conf = NULL;
- GtkAction *action;
- ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
conf = modest_runtime_get_conf ();
/* Dim at start clipboard actions */
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
- gtk_action_set_sensitive (action, FALSE);
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
- gtk_action_set_sensitive (action, FALSE);
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
- gtk_action_set_sensitive (action, FALSE);
-
modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
}
priv->font_dialog = NULL;
priv->app_menu = NULL;
+ priv->references = NULL;
+ priv->in_reply_to = NULL;
+
if (!is_wp_text_buffer_started) {
is_wp_text_buffer_started = TRUE;
wp_text_buffer_library_init ();
ModestMsgEditWindow *win = (ModestMsgEditWindow *) userdata;
ModestMsgEditWindowPrivate *priv;
+ /* It could happen that the window was already closed */
+ if (!GTK_WIDGET_VISIBLE (win))
+ return FALSE;
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(win);
correct_scroll_without_drag_check (win, TRUE);
GtkTextMark *insert;
GtkAdjustment *vadj;
+ /* It could happen that the window was already closed */
+ if (!GTK_WIDGET_VISIBLE (w))
+ return FALSE;
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
insert = gtk_text_buffer_get_insert (priv->text_buffer);
return;
}
- priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle,
- (gpointer) w);
+ priv->correct_scroll_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ (GSourceFunc) correct_scroll_without_drag_check_idle,
+ g_object_ref (w),
+ g_object_unref);
}
static void
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
if (gtk_grab_get_current () == priv->msg_body) {
if (priv->scroll_drag_timeout_id == 0) {
- priv->scroll_drag_timeout_id = g_timeout_add (500, (GSourceFunc) scroll_drag_timeout,
- (gpointer) w);
+ priv->scroll_drag_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT,
+ 500,
+ (GSourceFunc) scroll_drag_timeout,
+ g_object_ref (w),
+ g_object_unref);
}
return;
}
gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), window_align);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox),
- hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable)));
gtk_widget_show_all (GTK_WIDGET(priv->pannable));
window_box = gtk_vbox_new (FALSE, 0);
g_free (priv->original_account_name);
g_free (priv->msg_uid);
g_free (priv->last_search);
- g_slist_free (priv->font_items_group);
- g_slist_free (priv->size_items_group);
+ g_free (priv->references);
+ g_free (priv->in_reply_to);
+ g_object_unref (priv->faces_model);
+ g_object_unref (priv->sizes_model);
g_object_unref (priv->attachments);
g_object_unref (priv->images);
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
+static void
+pixbuf_size_prepared (GdkPixbufLoader *loader,
+ gint width,
+ gint height,
+ ModestMsgEditWindow *self)
+{
+ gint new_height, new_width;
+ gboolean set_size;
+
+ new_height = height;
+ new_width = width;
+ set_size = FALSE;
+
+ if (width > IMAGE_MAX_WIDTH) {
+ new_height = height * IMAGE_MAX_WIDTH / width;
+ new_width = IMAGE_MAX_WIDTH;
+ }
+
+ gdk_pixbuf_loader_set_size (loader, new_width, new_height);
+}
+
static GdkPixbuf *
-pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size)
+pixbuf_from_stream (TnyStream *stream,
+ const gchar *mime_type,
+ guint64 *stream_size,
+ ModestMsgEditWindow *self)
{
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf;
guint64 size;
-
+ GError *error = NULL;
+
size = 0;
loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
*stream_size = 0;
return NULL;
}
+ g_signal_connect (G_OBJECT (loader), "size-prepared", G_CALLBACK (pixbuf_size_prepared), self);
+
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
tny_stream_reset (TNY_STREAM (stream));
while (!tny_stream_is_eos (TNY_STREAM (stream))) {
- GError *error = NULL;
unsigned char read_buffer[128];
gint readed;
readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
size += readed;
if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) {
- if (error)
- g_error_free (error);
break;
}
+ /* Allow some UI responsiveness */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
}
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE);
+ gdk_pixbuf_loader_close (loader, &error);
+
+ if (error)
+ g_error_free (error);
pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
if (pixbuf)
g_object_ref (pixbuf);
- gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (loader);
if (!pixbuf)
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+ g_object_ref (self);
for (iter = tny_list_create_iterator (attachments);
!tny_iterator_is_done (iter);
tny_iterator_next (iter)) {
if ((cid != NULL)&&(mime_type != NULL)) {
guint64 stream_size;
TnyStream *stream = tny_mime_part_get_decoded_stream (part);
- GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+ GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, self);
g_object_unref (stream);
g_object_unref (part);
}
g_object_unref (iter);
+ g_object_unref (self);
}
static void
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-
+
if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
parent = g_object_ref (msg);
} else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
cc = tny_header_dup_cc (header);
bcc = tny_header_dup_bcc (header);
subject = tny_header_dup_subject (header);
+
+ modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
priority_flags = tny_header_get_priority (header);
if (to)
g_free (bcc);
}
-static void
-menu_tool_button_clicked_popup (GtkMenuToolButton *item,
- gpointer data)
-{
- GList *item_children, *node;
- GtkWidget *bin_child;
-
- bin_child = gtk_bin_get_child (GTK_BIN(item));
-
- item_children = gtk_container_get_children (GTK_CONTAINER (bin_child));
-
- for (node = item_children; node != NULL; node = g_list_next (node)) {
- if (GTK_IS_TOGGLE_BUTTON (node->data)) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (node->data), TRUE);
- }
- }
- g_list_free (item_children);
-}
-
-static void
-menu_tool_button_dont_expand (GtkMenuToolButton *item)
-{
- GtkWidget *box;
- GList *item_children, *node;
-
- box = gtk_bin_get_child (GTK_BIN (item));
- gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
- item_children = gtk_container_get_children (GTK_CONTAINER (box));
-
- for (node = item_children; node != NULL; node = g_list_next (node)) {
- gtk_box_set_child_packing (GTK_BOX (box), GTK_WIDGET (node->data), TRUE, TRUE, 0, GTK_PACK_START);
- if (GTK_IS_TOGGLE_BUTTON (node->data))
- gtk_button_set_alignment (GTK_BUTTON (node->data), 0.0, 0.5);
- else if (GTK_IS_BUTTON (node->data))
- gtk_button_set_alignment (GTK_BUTTON (node->data), 1.0, 0.5);
- }
- g_list_free (item_children);
-}
-
static void
modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
gint font_index;
GtkWidget *sizes_menu;
GtkWidget *fonts_menu;
- GSList *radio_group = NULL;
- GSList *node = NULL;
gchar *markup;
+ GtkWidget *arrow;
+ GtkWidget *hbox;
/* Toolbar */
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
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));
/* font_size */
- tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
+ tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
priv->size_tool_button_label = gtk_label_new (NULL);
- hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_TEXT,
- GTK_STATE_INSENSITIVE, "SecondaryTextColor");
- hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_FG,
- GTK_STATE_INSENSITIVE, "SecondaryTextColor");
snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
- size_text,"</span>", NULL);
+ size_text, "</span>", NULL);
gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+ gtk_misc_set_alignment (GTK_MISC (priv->size_tool_button_label), 1.0, 0.5);
g_free (markup);
hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont");
- gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label);
+ hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->size_tool_button_label, TRUE, TRUE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+ gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+ gtk_widget_set_sensitive (arrow, FALSE);
+ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
sizes_menu = gtk_menu_new ();
- priv->size_items_group = NULL;
- radio_group = NULL;
+ priv->sizes_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
for (size_index = 0; size_index < WP_FONT_SIZE_COUNT; size_index++) {
- GtkWidget *size_menu_item;
+ GtkTreeIter iter;
snprintf(size_text, sizeof(size_text), "%d", wp_font_size[size_index]);
- size_menu_item = gtk_radio_menu_item_new_with_label (radio_group, size_text);
- radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (size_menu_item));
- gtk_menu_shell_append (GTK_MENU_SHELL (sizes_menu), size_menu_item);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (size_menu_item), (wp_font_size[size_index] == 12));
- gtk_widget_show (size_menu_item);
+ gtk_list_store_append (GTK_LIST_STORE (priv->sizes_model), &iter);
- priv->size_items_group = g_slist_prepend (priv->size_items_group, size_menu_item);
-
- }
+ gtk_list_store_set (GTK_LIST_STORE (priv->sizes_model), &iter,
+ 0, size_text,
+ -1);
- for (node = radio_group; node != NULL; node = g_slist_next (node)) {
- GtkWidget *item = (GtkWidget *) node->data;
- g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_size_change),
- window);
+ if (wp_font_size[size_index] == 12)
+ priv->current_size_index = size_index;
+
}
- priv->size_items_group = g_slist_reverse (priv->size_items_group);
- gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu);
- g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
+ g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_size_clicked), window);
gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
- menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
priv->font_size_toolitem = tool_item;
/* font face */
- tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
+ tool_item = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
priv->font_tool_button_label = gtk_label_new (NULL);
- hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_TEXT,
- GTK_STATE_INSENSITIVE, "SecondaryTextColor");
- hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_FG,
- GTK_STATE_INSENSITIVE, "SecondaryTextColor");
markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+ gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5);
g_free(markup);
hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont");
- gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label);
+ hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+ gtk_misc_set_alignment (GTK_MISC (arrow), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, TRUE, 0);
+ gtk_widget_set_sensitive (arrow, FALSE);
+ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), hbox);
fonts_menu = gtk_menu_new ();
- priv->font_items_group = NULL;
- radio_group = NULL;
+ priv->faces_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
for (font_index = 0; font_index < wp_get_font_count (); font_index++) {
- GtkWidget *font_menu_item;
- GtkWidget *child_label;
-
- font_menu_item = gtk_radio_menu_item_new_with_label (radio_group, "");
- child_label = gtk_bin_get_child (GTK_BIN (font_menu_item));
- markup = g_strconcat ("<span font_family='", wp_get_font_name (font_index),"'>",
- wp_get_font_name (font_index), "</span>", NULL);
- gtk_label_set_markup (GTK_LABEL (child_label), markup);
- g_free (markup);
-
- radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (font_menu_item));
- gtk_menu_shell_append (GTK_MENU_SHELL (fonts_menu), font_menu_item);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (font_menu_item), (font_index == DEFAULT_FONT));
- gtk_widget_show (font_menu_item);
+ GtkTreeIter iter;
- priv->font_items_group = g_slist_prepend (priv->font_items_group, font_menu_item);
-
- }
- for (node = radio_group; node != NULL; node = g_slist_next (node)) {
- GtkWidget *item = (GtkWidget *) node->data;
- g_signal_connect (G_OBJECT (item), "toggled", G_CALLBACK (modest_msg_edit_window_font_change),
- window);
+ gtk_list_store_append (GTK_LIST_STORE (priv->faces_model), &iter);
+
+ gtk_list_store_set (GTK_LIST_STORE (priv->faces_model), &iter,
+ 0, wp_get_font_name (font_index),
+ -1);
+
+ if (font_index == DEFAULT_FONT)
+ priv->current_face_index = font_index;
}
- priv->font_items_group = g_slist_reverse (priv->font_items_group);
- gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu);
- g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL);
+ g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (font_face_clicked), window);
gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE);
- menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item));
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
priv->font_face_toolitem = tool_item;
/* Set expand and homogeneous for remaining items */
data->cc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
data->bcc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
+ data->references = g_strdup (priv->references);
+ data->in_reply_to = g_strdup (priv->in_reply_to);
if (priv->draft_msg) {
data->draft_msg = g_object_ref (priv->draft_msg);
} else if (priv->outbox_msg) {
g_free (data->plain_body);
g_free (data->html_body);
g_free (data->account_name);
+ g_free (data->references);
+ g_free (data->in_reply_to);
if (data->draft_msg != NULL) {
g_object_unref (data->draft_msg);
{
ModestMsgEditFormatState *format_state = NULL;
ModestMsgEditWindowPrivate *priv;
- WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
+ WPTextBufferFormat *buffer_format;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self), NULL);
+
+ buffer_format = g_new0 (WPTextBufferFormat, 1);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, TRUE);
const ModestMsgEditFormatState *format_state)
{
ModestMsgEditWindowPrivate *priv;
- WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
- WPTextBufferFormat *current_format = g_new0 (WPTextBufferFormat, 1);
+ WPTextBufferFormat *buffer_format;
+ WPTextBufferFormat *current_format;
+
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
g_return_if_fail (format_state != NULL);
+ buffer_format = g_new0 (WPTextBufferFormat, 1);
+ current_format = g_new0 (WPTextBufferFormat, 1);
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
gtk_widget_grab_focus (priv->msg_body);
buffer_format->bold = (format_state->bold != FALSE);
GtkAction *action;
ModestWindowPrivate *parent_priv;
ModestMsgEditWindowPrivate *priv;
- GtkWidget *new_size_menuitem;
- GtkWidget *new_font_menuitem;
parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
G_CALLBACK (modest_msg_edit_window_color_button_change),
window);
- new_size_menuitem = GTK_WIDGET ((g_slist_nth (priv->size_items_group,
- buffer_format->font_size))->data);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_size_menuitem))) {
- GtkWidget *label;
- gchar *markup;
+ if (priv->current_size_index != buffer_format->font_size) {
+ GtkTreeIter iter;
+ GtkTreePath *path;
- label = gtk_bin_get_child (GTK_BIN (new_size_menuitem));
- markup = g_strconcat ("<span font_family='Sans'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
- gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
- g_free (markup);
- g_signal_handlers_block_by_func (G_OBJECT (new_size_menuitem),
- G_CALLBACK (modest_msg_edit_window_size_change),
- window);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_size_menuitem), TRUE);
- g_signal_handlers_unblock_by_func (G_OBJECT (new_size_menuitem),
- G_CALLBACK (modest_msg_edit_window_size_change),
- window);
- }
-
- new_font_menuitem = GTK_WIDGET ((g_slist_nth (priv->font_items_group,
- buffer_format->font))->data);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_font_menuitem))) {
- GtkWidget *label;
- gchar *markup;
+ path = gtk_tree_path_new_from_indices (buffer_format->font_size, -1);
+ if (gtk_tree_model_get_iter (priv->sizes_model, &iter, path)) {
+ gchar *size_text;
+ gchar *markup;
+
+ priv->current_size_index = buffer_format->font_size;
+
+ gtk_tree_model_get (priv->sizes_model, &iter, 0, &size_text, -1);
+ markup = g_strconcat ("<span font_family='Sans'>",
+ size_text, "</span>", NULL);
+
+ gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+ g_free (markup);
+ g_free (size_text);
+ }
+ gtk_tree_path_free (path);
+ }
+
+ if (priv->current_face_index != buffer_format->font) {
+ GtkTreeIter iter;
+ GtkTreePath *path;
+
+ path = gtk_tree_path_new_from_indices (buffer_format->font, -1);
+ if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) {
+ gchar *face_name;
+ gchar *markup;
+
+ priv->current_face_index = buffer_format->font;
+ gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1);
+ markup = g_strconcat ("<span font_family='", face_name, "'>Tt</span>", NULL);
+ gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+ g_free (face_name);
+ g_free (markup);
+ }
- label = gtk_bin_get_child (GTK_BIN (new_font_menuitem));
- markup = g_strconcat ("<span font_family='", gtk_label_get_text (GTK_LABEL (label)),"'>Tt</span>", NULL);
- gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
- g_free (markup);
- g_signal_handlers_block_by_func (G_OBJECT (new_font_menuitem),
- G_CALLBACK (modest_msg_edit_window_font_change),
- window);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_font_menuitem), TRUE);
- g_signal_handlers_unblock_by_func (G_OBJECT (new_font_menuitem),
- G_CALLBACK (modest_msg_edit_window_font_change),
- window);
}
g_free (buffer_format);
gint response = 0;
GSList *uris = NULL;
GSList *uri_node = 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"));
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
}
gtk_widget_destroy (dialog);
+ g_object_ref (window);
+ /* The operation could take some time so allow the dialog to be closed */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+
for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
const gchar *uri;
GnomeVFSHandle *handle = NULL;
modest_platform_information_banner (NULL, NULL,
_FM("sfil_ib_opening_not_allowed"));
-
+ g_free (filename);
g_object_unref (mime_part);
gnome_vfs_file_info_unref (info);
continue;
tny_mime_part_set_filename (mime_part, basename);
g_free (basename);
- pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size);
+ pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size, window);
if (pixbuf != NULL) {
priv->images_size += stream_size;
priv->images_count ++;
insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
- wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+ wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position,
+ tny_mime_part_get_content_id (mime_part), pixbuf);
g_object_unref (pixbuf);
- }
- tny_list_prepend (priv->images, (GObject *) mime_part);
- gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+ tny_list_prepend (priv->images, (GObject *) mime_part);
+ gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+ } else {
+ modest_platform_information_banner (NULL, NULL,
+ _("mail_ib_file_operation_failed"));
+ }
+
g_free (filename);
g_object_unref (mime_part);
gnome_vfs_file_info_unref (info);
}
}
-
-
+ g_object_unref (window);
}
static void
if (size > allowed_size) {
modest_platform_information_banner (NULL, NULL,
_FM("sfil_ib_opening_not_allowed"));
+ g_free (filename);
return 0;
}
} else
modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
g_object_unref (mime_part);
+ g_free (filename);
gnome_vfs_file_info_unref (info);
return 0;
}
if (att_list == NULL) {
att_list = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
- if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list)) {
+ if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list, TRUE)) {
g_object_unref (att_list);
return;
}
}
static void
-modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
- gpointer userdata)
+font_size_clicked (GtkToolButton *button,
+ ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
- gint new_size_index;
- ModestMsgEditWindow *window;
- GtkWidget *label;
+ GtkWidget *selector, *dialog;
- window = MODEST_MSG_EDIT_WINDOW (userdata);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
- if (gtk_check_menu_item_get_active (menu_item)) {
+ selector = hildon_touch_selector_new ();
+ hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector), priv->sizes_model, TRUE);
+ hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, priv->current_size_index);
+
+ dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
+ hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_size"));
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
+ gint new_index;
+ gchar *size_text;
gchar *markup;
WPTextBufferFormat format;
+ new_index = hildon_touch_selector_get_active (HILDON_TOUCH_SELECTOR (selector), 0);
+
memset (&format, 0, sizeof (format));
wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &format, FALSE);
- label = gtk_bin_get_child (GTK_BIN (menu_item));
-
- new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label)));
format.cs.font_size = TRUE;
format.cs.text_position = TRUE;
format.cs.font = TRUE;
- format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE);
+ format.font_size = new_index;
/* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format); */
if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
- GINT_TO_POINTER (wp_get_font_size_index (new_size_index, 12))))
+ GINT_TO_POINTER (new_index)))
wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
- markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
+ size_text = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector));
+ markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
+ size_text, "</span>", NULL);
+ g_free (size_text);
gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
g_free (markup);
+
}
+ gtk_widget_destroy (dialog);
+
+ gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
+
}
static void
-modest_msg_edit_window_font_change (GtkCheckMenuItem *menu_item,
- gpointer userdata)
+font_face_clicked (GtkToolButton *button,
+ ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
- gint new_font_index;
- ModestMsgEditWindow *window;
- GtkWidget *label;
+ GtkWidget *selector, *dialog;
+ GtkCellRenderer *renderer;
- window = MODEST_MSG_EDIT_WINDOW (userdata);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
- if (gtk_check_menu_item_get_active (menu_item)) {
- gchar *markup;
+ selector = hildon_touch_selector_new ();
+ renderer = gtk_cell_renderer_text_new ();
+ hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), priv->faces_model,
+ renderer, "family", 0, "text", 0, NULL);
+ hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, priv->current_face_index);
- label = gtk_bin_get_child (GTK_BIN (menu_item));
-
- new_font_index = wp_get_font_index (gtk_label_get_text (GTK_LABEL (label)), DEFAULT_FONT);
+ dialog = hildon_picker_dialog_new (GTK_WINDOW (window));
+ hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_font_face"));
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
+ gint new_font_index;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+
+ new_font_index = hildon_touch_selector_get_active (HILDON_TOUCH_SELECTOR (selector), 0);
+ path = gtk_tree_path_new_from_indices (new_font_index, -1);
+ if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) {
+ gchar *face_name;
+ gchar *markup;
+
+ gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1);
+
+ if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT,
+ GINT_TO_POINTER(new_font_index)))
+ wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
+
+ markup = g_strconcat ("<span font_family='", face_name, "'>Tt</span>", NULL);
+ gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+
+ text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
+ g_free (face_name);
+ g_free (markup);
+ }
+ gtk_tree_path_free (path);
- if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT,
- GINT_TO_POINTER(new_font_index)))
- wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
-
- text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
- markup = g_strconcat ("<span font_family='",gtk_label_get_text (GTK_LABEL (label)),"'>Tt</span>", NULL);
- gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
- g_free (markup);
}
+ gtk_widget_destroy (dialog);
+
+ gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
+
}
void
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
GtkClipboard *selection_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
gchar *text = NULL;
+
+ /* It could happen that the window was already closed */
if (!GTK_WIDGET_VISIBLE (window))
return;
}
priv->clipboard_text = text;
- if (GTK_WIDGET_VISIBLE (window)) {
- modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
- }
+ modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
+
g_object_unref (window);
}
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
if (priv->clipboard_owner_idle == 0) {
- priv->clipboard_owner_idle = g_idle_add (clipboard_owner_change_idle, window);
+ priv->clipboard_owner_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ clipboard_owner_change_idle,
+ g_object_ref (window),
+ g_object_unref);
}
}
gboolean a2,
gpointer window)
{
+ /* It could happen that the window was already closed */
if (!GTK_WIDGET_VISIBLE (window))
return;
if (!g_utf8_collate (range_subtext, str_casefold)) {
gchar *found_text = g_strndup (range_text + offset, str_chars_n);
result = TRUE;
- gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
- match_start, match_end, NULL);
+ if (!gtk_text_iter_forward_search (iter, found_text, GTK_TEXT_SEARCH_VISIBLE_ONLY|GTK_TEXT_SEARCH_TEXT_ONLY,
+ match_start, match_end, NULL)) {
+ g_warning ("Matched string with collate, but not matched in model");
+ }
g_free (found_text);
}
g_free (range_subtext);
g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
if (priv->draft_msg != NULL) {
g_object_unref (priv->draft_msg);
priv->msg_uid = NULL;
}
priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
- if (GTK_WIDGET_REALIZED (window)) {
- if (!modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL)) {
- gtk_widget_destroy (GTK_WIDGET (window));
- return;
- }
- }
}
priv->draft_msg = draft;
projects / modest / blobdiff