/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
- static GtkStyle *bold_style = NULL;
- static GdkColor bold_color;
+ static GdkColor yellow;
+ static GdkColor black;
+ static gboolean yellow_initialised = FALSE;
GSList *h_list;
GtkEntry *entry;
+ if (!yellow_initialised) {
+ gdk_color_parse("#f5f6be", &yellow);
+ gdk_color_parse("#000000", &black);
+ yellow_initialised = gdk_colormap_alloc_color(
+ gdk_colormap_get_system(), &yellow, FALSE, TRUE);
+ yellow_initialised &= gdk_colormap_alloc_color(
+ gdk_colormap_get_system(), &black, FALSE, TRUE);
+ }
+
for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
if (gtk_entry_get_text(entry) &&
!g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
- gtk_widget_ensure_style(GTK_WIDGET(entry));
- if (!bold_style) {
- gtkut_convert_int_to_gdk_color
- (prefs_common.color_new, &bold_color);
- bold_style = gtk_style_copy(gtk_widget_get_style
- (GTK_WIDGET(entry)));
- pango_font_description_set_weight
- (bold_style->font_desc, PANGO_WEIGHT_BOLD);
- bold_style->fg[GTK_STATE_NORMAL] = bold_color;
+ if (yellow_initialised) {
+ gtk_widget_modify_base(
+ GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+ GTK_STATE_NORMAL, &yellow);
+ gtk_widget_modify_text(
+ GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+ GTK_STATE_NORMAL, &black);
}
- gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
}
}
}
prev = cur = iter_;
gtk_text_iter_backward_char(&cur);
if (gtk_text_iter_has_tag(&cur, compose->no_join_tag)) {
+ gtk_text_iter_forward_char(&cur);
+ *iter = cur;
return FALSE;
}
gtk_text_iter_forward_char(&cur);
goto colorize;
uri_start = uri_stop = -1;
+ quote_len = 0;
quote_str = compose_get_quote_str(buffer, &iter, "e_len);
if (quote_str) {
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default CC address. Send anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
}
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default BCC address. Send anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
}
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
}
- if (!test_conv_global_out && compose->orig_charset) {
+ if (!test_conv_global_out && compose->orig_charset
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
out_codeset = compose->orig_charset;
debug_print("failure; trying to convert to %s\n", out_codeset);
test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!test_conv_global_out && !test_conv_reply) {
/* we're lost */
out_codeset = CS_INTERNAL;
- debug_print("finally using %s\n", out_codeset);
+ debug_print("failure; finally using %s\n", out_codeset);
}
g_free(test_conv_global_out);
g_free(test_conv_reply);
msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
"to the specified %s charset.\n"
"Send it as %s?"), out_codeset, src_codeset);
- aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
- NULL, ALERT_ERROR, G_ALERTALTERNATE);
+ aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("+_Send"), NULL, FALSE,
+ NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free(msg);
- if (aval != G_ALERTDEFAULT) {
+ if (aval != G_ALERTALTERNATE) {
g_free(chars);
return -3;
} else {
"The contents of the message might be broken on the way to the delivery.\n"
"\n"
"Send it anyway?"), line + 1);
- aval = alertpanel(_("Warning"), msg, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
g_free(msg);
- if (aval != G_ALERTDEFAULT) {
+ if (aval != G_ALERTALTERNATE) {
return -1;
}
}
#if USE_ASPELL
if (event->button == 3) {
GtkTextIter iter;
+ GtkTextIter sel_start, sel_end;
+ gboolean stuff_selected;
gint x, y;
/* move the cursor to allow GtkAspell to check the word
* under the mouse */
&x, &y);
gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
&iter, x, y);
+ /* get selection */
+ stuff_selected = gtk_text_buffer_get_selection_bounds(
+ GTK_TEXT_VIEW(text)->buffer,
+ &sel_start, &sel_end);
+
gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
+ /* reselect stuff */
+ if (stuff_selected
+ && gtk_text_iter_in_range(&iter, &sel_start, &sel_end)) {
+ gtk_text_buffer_select_range(GTK_TEXT_VIEW(text)->buffer,
+ &sel_start, &sel_end);
+ }
return FALSE; /* pass the event so that the right-click goes through */
}
#endif
GtkTextMark *mark;
GtkTextIter iter;
gchar *qmark;
- gchar *parsed_str;
+ gchar *parsed_str = NULL;
gint cursor_pos = 0;
- if (!tmpl || !tmpl->value) return;
+ if (!tmpl) return;
text = GTK_TEXT_VIEW(compose->text);
buffer = gtk_text_view_get_buffer(text);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
- if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
- parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
- NULL, NULL, FALSE);
- } else {
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- if (compose->replyinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL, FALSE);
- else if (compose->fwdinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
- tmpl->value, qmark, NULL, FALSE);
- else
- parsed_str = NULL;
+ if (tmpl->value) {
+ if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
+ parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
+ NULL, NULL, FALSE);
+ } else {
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
+
+ if (compose->replyinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark, NULL, FALSE);
+ else if (compose->fwdinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+ tmpl->value, qmark, NULL, FALSE);
+ else
+ parsed_str = NULL;
+ }
}
-
if (replace && parsed_str && compose->account->auto_sig)
compose_insert_sig(compose, FALSE);
gtk_text_buffer_place_cursor(buffer, &iter);
}
- if (parsed_str)
- compose_changed_cb(NULL, compose);
+ compose_changed_cb(NULL, compose);
}
static void compose_destroy(Compose *compose)
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
- NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+ val = alertpanel_full(_("Notice"), msg, GTK_STOCK_NO, GTK_STOCK_YES,
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(msg);
- if (val == G_ALERTDEFAULT) {
+ if (val == G_ALERTALTERNATE) {
g_source_remove(compose->exteditor_tag);
g_io_channel_shutdown(compose->exteditor_ch,
FALSE, NULL);
target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
flag.perm_flags = target_locked?MSG_LOCKED:0;
}
+ flag.tmp_flags = MSG_DRAFT;
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
if (compose->autowrap)
compose_wrap_all_full(compose, TRUE);
+ compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
}
static void compose_toggle_sign_cb(gpointer data, guint action,
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
gtk_text_buffer_place_cursor(buffer, iter);
} else {
- if (strcmp(text, "\n") || automatic_break)
+ if (strcmp(text, "\n") || automatic_break
+ || gtk_text_iter_starts_line(iter))
gtk_text_buffer_insert(buffer, iter, text, len);
else {
debug_print("insert nowrap \\n\n");