static void modest_msg_edit_window_finalize (GObject *obj);
static gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer userdata);
+static void body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
static void recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
static void send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
static void style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
static void update_window_title (ModestMsgEditWindow *window);
static void update_dimmed (ModestMsgEditWindow *window);
static void update_paste_dimming (ModestMsgEditWindow *window);
+static void update_remove_attachment_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);
return transports;
}
+static gboolean attachment_view_focus_lost (
+ GtkWidget *widget,
+ GdkEventFocus *event,
+ ModestMsgEditWindow *window)
+{
+ g_return_val_if_fail(MODEST_IS_MSG_EDIT_WINDOW(window), FALSE);
+
+ update_remove_attachment_dimming(window);
+
+ return FALSE;
+}
+
void vadj_changed (GtkAdjustment *adj,
ModestMsgEditWindow *window)
{
gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon);
gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
priv->attachments_view = modest_attachments_view_new (NULL);
+ g_signal_connect (G_OBJECT (priv->attachments_view), "focus-out-event",
+ G_CALLBACK (attachment_view_focus_lost), obj);
priv->header_box = gtk_vbox_new (FALSE, 0);
G_CALLBACK (text_buffer_can_undo), obj);
g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo",
G_CALLBACK (text_buffer_can_redo), obj);
+ g_signal_connect (G_OBJECT (priv->text_buffer), "changed",
+ G_CALLBACK (body_changed), obj);
g_signal_connect (G_OBJECT (obj), "window-state-event",
G_CALLBACK (modest_msg_edit_window_window_state_event),
NULL);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
- modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet);
+/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); */
+/* modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet); */
g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button),
G_CALLBACK (modest_msg_edit_window_color_button_change),
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu");
gtk_action_set_sensitive (action, rich_text && editor_focused);
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
- gtk_action_set_sensitive (action, rich_text && editor_focused);
+/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu"); */
+/* gtk_action_set_sensitive (action, rich_text && editor_focused); */
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu");
gtk_action_set_sensitive (action, rich_text && editor_focused);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu");
}
}
+gboolean
+message_is_empty (ModestMsgEditWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+
+ g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ /** TODO: Add wpeditor API to tell us if there is any _visible_ text,
+ * so we can ignore markup.
+ */
+ GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+ gint count = 0;
+ if (buf)
+ count = gtk_text_buffer_get_char_count (buf);
+
+ return count == 0;
+}
+
static gboolean
msg_body_focus (GtkWidget *focus,
GdkEventFocus *event,
update_send_dimming (editor);
}
+static void
+body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
+{
+ update_send_dimming (editor);
+}
+
static void
send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
const gchar *subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field));
- if (subject == NULL || subject[0] == '\0') {
+ if (message_is_empty(editor) || (subject == NULL || subject[0] == '\0')) {
hildon_banner_show_information (NULL, NULL, _("mcen_ib_subject_or_body_not_modified"));
} else {
hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first"));
return FALSE;
}
+
+
+
gboolean
modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
{
GdkEvent *event,
ModestMsgEditWindow *window)
{
- ModestWindowPrivate *parent_priv;
- ModestMsgEditWindowPrivate *priv;
- GtkAction *action;
- GList *selected_attachments = NULL;
- gint n_att_selected = 0;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-
if (!GTK_WIDGET_VISIBLE (window))
return;
- selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
- n_att_selected = g_list_length (selected_attachments);
- g_list_free (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_remove_attachment_dimming (window);
update_copy_cut_dimming (window);
update_paste_dimming (window);
}
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)
+ {
+ /* Prevent endless recursion */
+ g_signal_handlers_block_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window);
g_signal_emit_by_name (editable, "insert-text",
- (gpointer) result->str, (gpointer) strlen (result->str),
+ (gpointer) result->str, (gpointer) result->len,
(gpointer) position, (gpointer) window);
+ g_signal_handlers_unblock_by_func(G_OBJECT(editable), G_CALLBACK(subject_field_insert_text), window);
+ }
}
g_string_free (result, TRUE);
}
-gboolean
-message_is_empty (ModestMsgEditWindow *window)
-{
- ModestMsgEditWindowPrivate *priv = NULL;
-
- g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- /** TODO: Add wpeditor API to tell us if there is any _visible_ text,
- * so we can ignore markup.
- */
- GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
- gint count = 0;
- if (buf)
- count = gtk_text_buffer_get_char_count (buf);
-
- return count == 0;
-}
-
void
modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
gboolean show)
gtk_toggle_action_set_active (toggle, FALSE);
}
+static void
+update_remove_attachment_dimming (ModestMsgEditWindow *window)
+{
+ ModestWindowPrivate *parent_priv;
+ ModestMsgEditWindowPrivate *priv;
+ GtkAction *action;
+ GList *selected_attachments = NULL;
+ gint n_att_selected = 0;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+ selected_attachments = modest_attachments_view_get_selection (
+ MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+ n_att_selected = g_list_length (selected_attachments);
+ g_list_free (selected_attachments);
+
+ action = gtk_ui_manager_get_action (
+ parent_priv->ui_manager,
+ "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
+ gtk_action_set_sensitive (action, n_att_selected == 1);
+}
static void
update_copy_cut_dimming (ModestMsgEditWindow *window)
dim = ((gtk_text_buffer_get_char_count (to_buffer) +
gtk_text_buffer_get_char_count (cc_buffer) +
- gtk_text_buffer_get_char_count (bcc_buffer)) == 0);
-
- dim = dim || (subject == NULL || subject[0] == '\0');
+ gtk_text_buffer_get_char_count (bcc_buffer)) == 0)
+ || (subject == NULL || subject[0] == '\0')
+ || message_is_empty(window);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
gtk_action_set_sensitive (action, !dim);
projects / modest / blobdiff