gpointer userdata);
static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id);
static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window);
+static void subject_field_insert_text (GtkEditable *editable,
+ gchar *new_text,
+ gint new_text_length,
+ gint *position,
+ 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,
static void update_window_title (ModestMsgEditWindow *window);
static void update_dimmed (ModestMsgEditWindow *window);
static void update_paste_dimming (ModestMsgEditWindow *window);
+static void update_copy_cut_dimming (ModestMsgEditWindow *window);
static void update_select_all_dimming (ModestMsgEditWindow *window);
static void update_zoom_dimming (ModestMsgEditWindow *window);
"changed", G_CALLBACK (recpt_field_changed), obj);
recpt_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (obj));
g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), 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), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj);
data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
if (priv->draft_msg) {
data->draft_msg = g_object_ref (priv->draft_msg);
- }
- if (priv->outbox_msg) {
+ } else if (priv->outbox_msg) {
data->draft_msg = g_object_ref (priv->outbox_msg);
} else {
data->draft_msg = NULL;
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook))
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) {
+ modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
return FALSE;
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook))
+ }
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook)) {
+ modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
return FALSE;
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook))
+ }
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
+ modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
return FALSE;
+ }
- modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+ if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
+ !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
+ modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
return TRUE;
ModestWindowPrivate *parent_priv;
ModestMsgEditWindowPrivate *priv;
GtkAction *action;
- gboolean has_selection;
- GtkWidget *focused;
GList *selected_attachments = NULL;
gint n_att_selected = 0;
if (!GTK_WIDGET_VISIBLE (window))
return;
- has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
- focused = gtk_window_get_focus (GTK_WINDOW (window));
-
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
- gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
- gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
n_att_selected = g_list_length (selected_attachments);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
gtk_action_set_sensitive (action, n_att_selected == 1);
+ update_copy_cut_dimming (window);
update_paste_dimming (window);
}
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
}
+static void
+subject_field_insert_text (GtkEditable *editable,
+ gchar *new_text,
+ gint new_text_length,
+ gint *position,
+ ModestMsgEditWindow *window)
+{
+ GString *result = g_string_new ("");
+ gchar *current;
+ gint result_len = 0;
+
+ for (current = new_text; current != NULL && *current != '\0'; current = g_utf8_next_char (current)) {
+ gunichar c = g_utf8_get_char_validated (current, 8);
+ /* Invalid unichar, stop */
+ if (c == -1)
+ break;
+ /* a bullet */
+ if (c == 0x2022)
+ continue;
+ result = g_string_append_unichar (result, c);
+ result_len++;
+ }
+
+ if (MIN (result_len, 1000) != g_utf8_strlen (new_text, 1000)) {
+ g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text");
+ if (result_len > 0)
+ g_signal_emit_by_name (editable, "insert-text",
+ (gpointer) result->str, (gpointer) strlen (result->str),
+ (gpointer) position, (gpointer) window);
+ }
+
+ g_string_free (result, TRUE);
+}
+
gboolean
message_is_empty (ModestMsgEditWindow *window)
{
static void
+update_copy_cut_dimming (ModestMsgEditWindow *window)
+{
+ ModestWindowPrivate *parent_priv = NULL;
+ ModestMsgEditWindowPrivate *priv = NULL;
+ GtkClipboard *clipboard = NULL;
+ GtkAction *action = NULL;
+ gboolean has_selection = FALSE;
+ GtkWidget *focused = NULL;
+ gchar *selection = NULL;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ focused = gtk_window_get_focus (GTK_WINDOW (window));
+
+ has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
+
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");
+ gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+ gtk_action_set_sensitive (action, (has_selection) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
+
+ if (selection != NULL)
+ g_free(selection);
+}
+
+static void
update_paste_dimming (ModestMsgEditWindow *window)
{
ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
update_select_all_dimming (window);
+ update_copy_cut_dimming (window);
update_paste_dimming (window);
}
static void
projects / modest / blobdiff