MsgInfo *msginfo,
const gchar *fmt,
const gchar *qmark,
- const gchar *body);
+ const gchar *body,
+ gboolean rewrap);
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
NULL, compose_check_backwards , 0, NULL},
{N_("/_Spelling/_Forward to next misspelled word"),
NULL, compose_check_forwards_go, 0, NULL},
- {N_("/_Spelling/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Spelling/_Spelling Configuration"),
- NULL, NULL, 0, "<Branch>"},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
{N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
ENC_ACTION(C_ISO_8859_1)},
{N_("/_Options/Character _encoding/Western European (ISO-8859-15)"),
ENC_ACTION(C_ISO_8859_15)},
+ {N_("/_Options/Character _encoding/Western European (Windows-1252)"),
+ ENC_ACTION(C_WINDOWS_1252)},
{N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Options/Character _encoding/Central European (ISO-8859-_2)"),
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
- qmark, body);
+ qmark, body, FALSE);
}
if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
compose_force_encryption(compose, account, FALSE);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
compose_create_tags(textview, compose);
-
+
+ undo_block(compose->undostruct);
if (as_attach) {
gchar *msgfile;
compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
- qmark, body);
+ qmark, body, FALSE);
compose_attach_parts(compose, msginfo);
procmsg_msginfo_free(full_msginfo);
g_free(folderidentifier);
}
+ undo_unblock(compose->undostruct);
+
+ compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
compose_create_tags(textview, compose);
-
+
+ undo_block(compose->undostruct);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
if (!is_file_exist(msgfile))
gtk_text_buffer_place_cursor(textbuf, &iter);
gtk_widget_grab_focus(compose->header_last->entry);
-
+ undo_unblock(compose->undostruct);
+ compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
gtk_editable_insert_text(GTK_EDITABLE(compose->savemsg_entry), &queueheader_buf[4], strlen(&queueheader_buf[4]), &startpos);
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "RRCPT:")) {
+ gint active = atoi(&queueheader_buf[strlen("RRCPT:")]);
+ if (active) {
+ GtkItemFactory *ifactory;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
+ }
+ }
}
if (compose_parse_header(compose, msginfo) < 0) return;
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose->modified = FALSE;
compose_set_title(compose);
}
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
- compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
+ compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE);
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
compose_colorize_signature(compose);
gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+ compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
const gchar *fmt, const gchar *qmark,
- const gchar *body)
+ const gchar *body, gboolean rewrap)
{
static MsgInfo dummyinfo;
gchar *quote_str = NULL;
gchar *buf;
- gchar *p, *lastp;
- gint len;
gboolean prev_autowrap;
const gchar *trimmed_body = body;
- gint cursor_pos = 0;
+ gint cursor_pos = -1;
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextIter iter;
+ GtkTextMark *mark;
if (!msginfo)
msginfo = &dummyinfo;
if (qmark != NULL) {
- quote_fmt_init(msginfo, NULL, NULL);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
quote_fmt_scan_string(qmark);
quote_fmt_parse();
&& trimmed_body[0]=='\n')
*trimmed_body++;
- quote_fmt_init(msginfo, quote_str, trimmed_body);
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE);
quote_fmt_scan_string(fmt);
quote_fmt_parse();
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
compose);
- for (p = buf; *p != '\0'; ) {
- GtkTextMark *mark;
-
- mark = gtk_text_buffer_get_insert(buffer);
- gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-
- lastp = strchr(p, '\n');
- len = lastp ? lastp - p + 1 : -1;
- if (g_utf8_validate(p, -1, NULL)) {
- gtk_text_buffer_insert(buffer, &iter, p, len);
- } else {
- gchar *tmpin = g_strdup(p);
- gchar *tmpout = NULL;
- tmpin[len] = '\0';
- tmpout = conv_codeset_strdup
- (tmpin, conv_get_locale_charset_str(),
- CS_INTERNAL);
- gtk_text_buffer_insert(buffer, &iter, tmpout, -1);
- g_free(tmpin);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ if (g_utf8_validate(buf, -1, NULL)) {
+ gtk_text_buffer_insert(buffer, &iter, buf, -1);
+ } else {
+ gchar *tmpout = NULL;
+ tmpout = conv_codeset_strdup
+ (buf, conv_get_locale_charset_str(),
+ CS_INTERNAL);
+ if (!tmpout || !g_utf8_validate(tmpout, -1, NULL)) {
g_free(tmpout);
+ tmpout = g_malloc(strlen(buf)*2+1);
+ conv_localetodisp(tmpout, strlen(buf)*2+1, buf);
}
-
- if (lastp)
- p = lastp + 1;
- else
- break;
+ gtk_text_buffer_insert(buffer, &iter, tmpout, -1);
+ g_free(tmpout);
}
cursor_pos = quote_fmt_get_cursor_pos();
+ compose->set_cursor_pos = cursor_pos;
+ if (cursor_pos == -1) {
+ cursor_pos = 0;
+ }
gtk_text_buffer_get_start_iter(buffer, &iter);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
gtk_text_buffer_place_cursor(buffer, &iter);
-
compose->autowrap = prev_autowrap;
- if (compose->autowrap)
+ if (compose->autowrap && rewrap)
compose_wrap_all(compose);
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
if (cur_pos > gtk_text_buffer_get_char_count (buffer))
cur_pos = gtk_text_buffer_get_char_count (buffer);
- gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ /* put the cursor where it should be
+ * either where the quote_fmt says, either before the signature */
+ if (compose->set_cursor_pos < 0)
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ else
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter,
+ compose->set_cursor_pos);
+
gtk_text_buffer_place_cursor(buffer, &iter);
-
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(compose_changed_cb),
compose);
compose->autowrap = FALSE;
buffer = gtk_text_view_get_buffer(text);
-
- undo_block(compose->undostruct);
-
+ undo_wrapping(compose->undostruct, TRUE);
if (par_iter) {
iter = *par_iter;
} else {
gboolean (*parse) (const gchar *start,
const gchar *scanpos,
const gchar **bp_,
- const gchar **ep_);
+ const gchar **ep_,
+ gboolean hdr);
/* part to URI function */
gchar *(*build_uri) (const gchar *bp,
const gchar *ep);
bp = ep = 0;
if (scanpos) {
/* check if URI can be parsed */
- if (parser[last_index].parse(walk, scanpos, (const gchar **)&bp,(const gchar **)&ep)
+ if (parser[last_index].parse(walk, scanpos, (const gchar **)&bp,
+ (const gchar **)&ep, FALSE)
&& (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
walk = ep;
} else
if (par_iter)
*par_iter = iter;
-
- undo_unblock(compose->undostruct);
+ undo_wrapping(compose->undostruct, FALSE);
compose->autowrap = prev_autowrap;
}
buffer = gtk_text_view_get_buffer(text);
- undo_block(compose->undostruct);
-
gtk_text_buffer_get_start_iter(buffer, &iter);
while (!gtk_text_iter_is_end(&iter))
compose_beautify_paragraph(compose, &iter, force);
- undo_unblock(compose->undostruct);
}
static void compose_set_title(Compose *compose)
if (subject && strlen(subject))
str = g_strdup_printf(_("%s - Compose message%s"),
subject, edited);
- else if (compose->account && compose->account->address)
- str = g_strdup_printf(_("%s - Compose message%s"),
- compose->account->address, edited);
else
- str = g_strdup_printf(_("Compose message%s"), edited);
+ str = g_strdup_printf(_("[no subject] - Compose message%s"), edited);
gtk_window_set_title(GTK_WINDOW(compose->window), str);
g_free(str);
g_free(subject);
fprintf(fp, "SCF:%s\n", savefolderid);
g_free(savefolderid);
}
+ /* Save copy folder */
+ if (compose->return_receipt) {
+ fprintf(fp, "RRCPT:1\n");
+ }
/* Message-ID of message replying to */
if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
gchar *folderid;
g_free(folderidentifier);
}
- savemsg_select = gtk_button_new_with_label (_("Select ..."));
+ savemsg_select = gtkut_get_browse_file_btn(_("_Browse"));
gtk_widget_show(savemsg_select);
gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
g_signal_connect(G_OBJECT(savemsg_select), "clicked",
{
gint prev_autowrap;
GtkTextBuffer *buffer;
+#if USE_ASPELL
+ if (event->button == 3) {
+ GtkTextIter iter;
+ gint x, y;
+ /* move the cursor to allow GtkAspell to check the word
+ * under the mouse */
+ gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
+ GTK_TEXT_WINDOW_TEXT, event->x, event->y,
+ &x, &y);
+ gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
+ &iter, x, y);
+ gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
+ return FALSE; /* pass the event so that the right-click goes through */
+ }
+#endif
if (event->button == 2) {
BLOCK_WRAP();
entry_paste_clipboard(compose, compose->focused_editable,
compose->account = account;
compose->mutex = g_mutex_new();
-
+ compose->set_cursor_pos = -1;
+
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
vbox2 = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), 0);
/* Notebook */
notebook = gtk_notebook_new();
gtk_widget_show(subject_hbox);
subject_frame = gtk_frame_new(NULL);
- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_OUT);
- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, BORDER_WIDTH+1);
+ gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE);
+ gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
gtk_widget_show(subject_frame);
subject = gtk_hbox_new(FALSE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(subject), BORDER_WIDTH);
+ gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
gtk_widget_show(subject);
label = gtk_label_new(_("Subject:"));
- gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 0);
gtk_widget_show(label);
subject_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
+ gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 0);
g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(subject_entry);
gtkaspell_checkers_strerror());
gtkaspell_checkers_reset_error();
} else {
-
- GtkWidget *menuitem;
-
if (!gtkaspell_set_sug_mode(gtkaspell,
prefs_common.aspell_sugmode)) {
debug_print("Aspell: could not set "
gtkaspell_checkers_reset_error();
}
- menuitem = gtk_item_factory_get_item(ifactory,
- "/Spelling/Spelling Configuration");
- gtkaspell_populate_submenu(gtkaspell, menuitem);
menu_set_sensitive(ifactory, "/Spelling", TRUE);
}
}
if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
- NULL, NULL);
+ NULL, NULL, FALSE);
} else {
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
if (compose->replyinfo != NULL)
parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL);
+ tmpl->value, qmark, NULL, FALSE);
else if (compose->fwdinfo != NULL)
parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
- tmpl->value, qmark, NULL);
+ tmpl->value, qmark, NULL, FALSE);
else
parsed_str = NULL;
}
if (parsed_str) {
cursor_pos = quote_fmt_get_cursor_pos();
+ compose->set_cursor_pos = cursor_pos;
+ if (cursor_pos == -1)
+ cursor_pos = 0;
gtk_text_buffer_get_start_iter(buffer, &iter);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
gtk_text_buffer_place_cursor(buffer, &iter);
fprintf(fp, "SCF:%s\n", savefolderid);
g_free(savefolderid);
}
+ if (compose->return_receipt) {
+ fprintf(fp, "RRCPT:1\n");
+ }
if (compose->privacy_system) {
fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next) {
- compose_insert_file(compose, (const gchar *)tmp->data);
+ compose_insert_file(compose, (const gchar *)tmp->data);
}
list_free_strings(list);
g_list_free(list);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
return;
} else {
+#if GTK_CHECK_VERSION(2, 8, 0)
+ /* do nothing, handled by GTK */
+#else
gchar *tmpfile = get_tmp_file();
str_write_to_file((const gchar *)data->data, tmpfile);
compose_insert_file(compose, tmpfile);
g_unlink(tmpfile);
g_free(tmpfile);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
+#endif
return;
}
gtk_drag_finish(drag_context, TRUE, FALSE, time);
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
gtk_text_buffer_place_cursor(buffer, iter);
- compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
+ compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE);
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
+ gtk_text_buffer_place_cursor(buffer, iter);
} else
gtk_text_buffer_insert(buffer, iter, text, len);
projects / claws.git / blobdiff