#include "procmsg.h"
#include "menu.h"
#include "send.h"
+#include "imap.h"
#include "news.h"
#include "customheader.h"
#include "prefs_common.h"
#include "quote_fmt.h"
#include "template.h"
#include "undo.h"
+#include "foldersel.h"
#if USE_GPGME
# include "rfc2015.h"
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
-
+ if (MSG_IS_IMAP(msginfo->flags))
+ imap_msg_set_perm_flags(msginfo, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_REPLY);
if (prefs_common.auto_sig)
compose_insert_sig(compose);
- gtk_editable_set_position(GTK_EDITABLE(text), 0);
- gtk_stext_set_point(text, 0);
if (quote && prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
+ gtk_editable_set_position(GTK_EDITABLE(text), 0);
+ gtk_stext_set_point(text, 0);
+
gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+ if (!account && msginfo->to && prefs_common.forward_account_autosel) {
gchar *to;
Xstrdup_a(to, msginfo->to, return NULL);
extract_address(to);
account = account_find_from_address(to);
}
- if(!account && prefs_common.forward_account_autosel) {
- gchar cc[BUFFSIZE];
+ if(!account && prefs_common.forward_account_autosel) {
+ gchar cc[BUFFSIZE];
if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
}
- if (account == NULL) {
+ if (account == NULL) {
account = cur_account;
/*
account = msginfo->folder->folder->account;
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
+ if (MSG_IS_IMAP(msginfo->flags))
+ imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_FORWARD);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = msginfo->folder->folder->account;
+ if (msginfo->folder->stype == F_QUEUE) {
+ gchar account_address[BUFFSIZE];
+ if (!get_header_from_msginfo(msginfo, account_address, sizeof(account_address), "S:")) {
+ account = account_find_from_address(account_address);
+ }
+ } else
+ account = msginfo->folder->folder->account;
- if(!account&& prefs_common.reedit_account_autosel) {
+ if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
+ if (!get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
extract_address(from);
account = account_find_from_address(from);
}
Xstrdup_a(quote_str, buf, return NULL)
}
- quote_fmt_init(msginfo, quote_str);
- quote_fmt_scan_string(fmt);
- quote_fmt_parse();
+ if (fmt && *fmt != '\0') {
+ quote_fmt_init(msginfo, quote_str);
+ quote_fmt_scan_string(fmt);
+ quote_fmt_parse();
- buf = quote_fmt_get_buffer();
- if (buf == NULL) {
- alertpanel_error(_("Message reply/forward format error."));
- return NULL;
- }
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message reply/forward format error."));
+ return NULL;
+ }
+ } else
+ buf = "";
gtk_stext_freeze(text);
gtk_stext_set_point(text, 0);
if ((compose->account->protocol != A_NNTP) || followup_and_reply_to)
compose_entry_append(compose,
- ((compose->mailinglist && !ignore_replyto)
- ? compose->mailinglist
- : (compose->replyto && !ignore_replyto)
+ ((compose->replyto && !ignore_replyto)
? compose->replyto
+ : (compose->mailinglist && !ignore_replyto)
+ ? compose->mailinglist
: msginfo->from ? msginfo->from : ""),
COMPOSE_TO);
if (compose->account->protocol == A_NNTP) {
compose_attach_info(compose, ainfo, cnttype);
}
+#define GET_CHAR(pos, buf, len) \
+{ \
+ if (text->use_wchar) \
+ len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
+ else { \
+ buf[0] = GTK_STEXT_INDEX(text, (pos)); \
+ len = 1; \
+ } \
+}
+
static void compose_wrap_line(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
gint line_pos, cur_pos;
gint line_len, cur_len;
-#define GET_STEXT(pos) \
- if (text->use_wchar) \
- ch_len = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
- else { \
- cbuf[0] = GTK_STEXT_INDEX(text, (pos)); \
- ch_len = 1; \
- }
gtk_stext_freeze(text);
/* check to see if the point is on the paragraph mark (empty line). */
cur_pos = gtk_stext_get_point(text);
- GET_STEXT(cur_pos);
+ GET_CHAR(cur_pos, cbuf, ch_len);
if ((ch_len == 1 && *cbuf == '\n') || cur_pos == text_len) {
if (cur_pos == 0)
goto compose_end; /* on the paragraph mark */
- GET_STEXT(cur_pos - 1);
+ GET_CHAR(cur_pos - 1, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n')
goto compose_end; /* on the paragraph mark */
}
/* find paragraph start. */
line_end = quoted = 0;
for (p_start = cur_pos; p_start >= 0; --p_start) {
- GET_STEXT(p_start);
+ GET_CHAR(p_start, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (quoted)
goto compose_end; /* quoted part */
/* find paragraph end. */
line_end = 0;
for (p_end = cur_pos; p_end < text_len; p_end++) {
- GET_STEXT(p_end);
+ GET_CHAR(p_end, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (line_end) {
p_end -= 1;
for (cur_pos = p_start; cur_pos < p_end; cur_pos++) {
guint space = 0;
- GET_STEXT(cur_pos);
+ GET_CHAR(cur_pos, cbuf, ch_len);
if (ch_len < 0) {
cbuf[0] = '\0';
guint replace = 0;
if (last_ch_len == 1 && !isspace(last_ch)) {
if (cur_pos + 1 < p_end) {
- GET_STEXT(cur_pos + 1);
+ GET_CHAR(cur_pos + 1, cbuf, ch_len);
if (ch_len == 1 && !isspace(*cbuf))
replace = 1;
}
line_len > 0) {
gint tlen = ch_len;
- GET_STEXT(line_pos - 1);
+ GET_CHAR(line_pos - 1, cbuf, ch_len);
if (ch_len == 1 && isspace(*cbuf)) {
gtk_stext_set_point(text, line_pos);
gtk_stext_backward_delete(text, 1);
compose_end:
gtk_stext_thaw(text);
-
-#undef GET_STEXT
}
/* return indent length */
gchar cbuf[MB_LEN_MAX];
for (i = start_pos; i < text_len; i++) {
- if (text->use_wchar)
- ch_len = wctomb
- (cbuf, (wchar_t)GTK_STEXT_INDEX(text, i));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, i);
- ch_len = 1;
- }
+ GET_CHAR(i, cbuf, ch_len);
if (ch_len > 1)
break;
/* allow space, tab, > or | */
gtk_stext_insert(text, NULL, NULL, NULL, &ch, 1);
}
ins_len = indent_len;
- }
- else {
+ } else {
gtk_stext_insert(text, NULL, NULL, NULL, quote_fmt, quote_len);
ins_len = quote_len;
}
/* Darko: used when I debug wrapping */
void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
{
- int i;
- char ch;
+ gint i;
+ gchar ch;
printf("%d [", pos);
for (i = pos; i < tlen; i++) {
guint line_pos = 0, cur_pos = 0, p_pos = 0;
gint line_len = 0, cur_len = 0;
gint ch_len;
- gint is_new_line = 1, do_delete = 0;
+ gboolean is_new_line = TRUE, do_delete = FALSE;
guint qlen = 0, i_len = 0;
guint linewrap_quote = prefs_common.linewrap_quote;
guint linewrap_len = prefs_common.linewrap_len;
for (; cur_pos < tlen; cur_pos++) {
/* mark position of new line - needed for quotation wrap */
- if (linewrap_quote && is_new_line) {
- qlen = gtkut_text_str_compare
- (text, cur_pos, tlen, qfmt);
- is_new_line = 0;
- if (qlen)
- i_len = get_indent_length(text, cur_pos, tlen);
- else
- i_len = 0;
+ if (is_new_line) {
+ if (linewrap_quote) {
+ qlen = gtkut_text_str_compare
+ (text, cur_pos, tlen, qfmt);
+ if (qlen)
+ i_len = get_indent_length
+ (text, cur_pos, tlen);
+ else
+ i_len = 0;
+ }
+ is_new_line = FALSE;
p_pos = cur_pos;
#ifdef WRAP_DEBUG
printf("new line i_len=%d qlen=%d p_pos=", i_len, qlen);
#endif
}
- /* get character(s) at current position */
- if (text->use_wchar)
- ch_len = wctomb
- (cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, cur_pos);
- ch_len = 1;
- }
+ GET_CHAR(cur_pos, cbuf, ch_len);
/* fix line length for tabs */
if (ch_len == 1 && *cbuf == '\t') {
ilen = gtkut_text_str_compare_n
(text, cur_pos + 1, p_pos, i_len, tlen);
if (cur_pos + ilen < tlen) {
- if (text->use_wchar)
- clen = wctomb(cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos + ilen + 1));
- else {
- cb[0] = GTK_STEXT_INDEX(text,
- cur_pos + ilen + 1);
- clen = 1;
- }
+ GET_CHAR(cur_pos + ilen + 1, cb, clen);
/* no need to join the lines */
- if ((clen == 1) && (cb[0] == '\n'))
- do_delete = 0;
+ if (clen == 1 && cb[0] == '\n')
+ do_delete = FALSE;
}
- }
/* if it's just newline skip it */
- else if (do_delete && (cur_pos + 1 < tlen)) {
- if (text->use_wchar)
- clen = wctomb(cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos + 1));
- else {
- cb[0] = GTK_STEXT_INDEX(text,
- cur_pos + 1);
- clen = 1;
- }
+ } else if (do_delete && (cur_pos + 1 < tlen)) {
+ GET_CHAR(cur_pos + 1, cb, clen);
/* no need to join the lines */
- if ((clen == 1) && (cb[0] == '\n'))
- do_delete = 0;
+ if (clen == 1 && cb[0] == '\n')
+ do_delete = FALSE;
}
#ifdef WRAP_DEBUG
}
}
- if (text->use_wchar)
- clen = wctomb
- (cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
- else {
- cb[0] = GTK_STEXT_INDEX(text, cur_pos);
- clen = 1;
- }
+ GET_CHAR(cur_pos, cb, clen);
/* insert space if it's alphanumeric */
if ((cur_pos != line_pos) &&
line_pos = cur_pos;
line_len = cur_len = 0;
qlen = 0;
- do_delete = 0;
- is_new_line = 1;
+ do_delete = FALSE;
+ is_new_line = TRUE;
#ifdef WRAP_DEBUG
printf("after delete l_pos=");
dump_text(text, line_pos, tlen, 1);
line_pos = cur_pos + 1;
line_len = cur_len = 0;
qlen = 0;
- do_delete = 0;
- is_new_line = 1;
+ do_delete = FALSE;
+ is_new_line = TRUE;
continue;
}
printf("new line_pos=%d\n", line_pos);
#endif
+ GET_CHAR(line_pos - 1, cbuf, clen);
+
/* if next character is space delete it */
- if (text->use_wchar)
- clen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
- clen = 1;
- }
if (clen == 1 && isspace(*cbuf)) {
if (p_pos + i_len != line_pos ||
!gtkut_text_is_uri_string
/* for loop will increase it */
cur_pos = line_pos - 1;
/* start over with current line */
- is_new_line = 1;
+ is_new_line = TRUE;
line_len = 0;
cur_len = 0;
- do_delete = 1;
+ do_delete = TRUE;
#ifdef WRAP_DEBUG
printf("after CR insert ");
dump_text(text, line_pos, tlen, 1);
gtk_stext_thaw(text);
}
-
-#if 0
-static void compose_wrap_line_all(Compose *compose)
-{
- GtkText *text = GTK_STEXT(compose->text);
- guint text_len;
- guint line_pos = 0, cur_pos = 0;
- gint line_len = 0, cur_len = 0;
- gint ch_len;
- gchar cbuf[MB_LEN_MAX];
-
- gtk_stext_freeze(text);
-
- text_len = gtk_stext_get_length(text);
-
- for (; cur_pos < text_len; cur_pos++) {
- if (text->use_wchar)
- ch_len = wctomb
- (cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, cur_pos);
- ch_len = 1;
- }
-
- if (ch_len == 1 && *cbuf == '\n') {
- line_pos = cur_pos + 1;
- line_len = cur_len = 0;
- continue;
- }
-
- if (ch_len < 0) {
- cbuf[0] = '\0';
- ch_len = 1;
- }
-
- if (ch_len == 1 && isspace(*cbuf)) {
- line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
- }
-
- if (cur_len + ch_len > prefs_common.linewrap_len &&
- line_len > 0) {
- gint tlen;
-
- if (text->use_wchar)
- tlen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
- tlen = 1;
- }
- if (tlen == 1 && isspace(*cbuf)) {
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
- text_len--;
- cur_pos--;
- line_pos--;
- cur_len--;
- line_len--;
- }
-
- gtk_stext_set_point(text, line_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- text_len++;
- cur_pos++;
- line_pos++;
- cur_len = cur_len - line_len + ch_len;
- line_len = 0;
- continue;
- }
-
- if (ch_len > 1) {
- line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
- }
- cur_len += ch_len;
- }
-
- gtk_stext_thaw(text);
-}
-#endif
+#undef GET_CHAR
static void compose_set_title(Compose *compose)
{
|| (g_strncasecmp(buf, "Delivered-To:",
strlen("Delivered-To:")) == 0))
continue;
+
if (fputs(buf, fdest) == -1)
goto error;
+
+ if (g_strncasecmp(buf, "From:", strlen("From:")) == 0) {
+ fputs(" (by way of ", fdest);
+ if (compose->account->name
+ && *compose->account->name) {
+ compose_convert_header
+ (buf, sizeof(buf),
+ compose->account->name,
+ strlen("From: "));
+ fprintf(fdest, "%s <%s>",
+ buf, compose->account->address);
+ } else
+ fprintf(fdest, "%s",
+ compose->account->address);
+ fputs(")", fdest);
+ }
+
if (fputs("\n", fdest) == -1)
goto error;
}
if(newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
+ /* Save copy folder */
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *str;
+
+ str = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", str);
+ g_free(str);
+ }
fprintf(fp, "\n");
while (fgets(buf, sizeof(buf), src_fp) != NULL) {
(*count)++;
}
-static void compose_create_header_entry(Compose *compose) {
+static void compose_create_header_entry(Compose *compose)
+{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GtkWidget *combo;
} else {
switch(compose->account->protocol) {
case A_NNTP:
- header = _("Newsgroups:");
+ header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
break;
default:
- header = _("To:");
+ header = prefs_common.trans_hdr ? _("To:") : "To:";
break;
}
}
compose->header_last = headerentry;
}
-static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text) {
+static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text)
+{
ComposeHeaderEntry *last_header;
last_header = compose->header_last;
gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
}
-static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+static GtkWidget *compose_create_header(Compose *compose)
{
- Compose *compose;
- GtkWidget *window;
- GtkWidget *vbox;
- GtkWidget *menubar;
- GtkWidget *handlebox;
-
- GtkWidget *notebook;
-
- GtkWidget *vbox2;
-
- GtkWidget *table_vbox;
GtkWidget *label;
GtkWidget *from_optmenu_hbox;
#if 0 /* NEW COMPOSE GUI */
GtkWidget *followup_entry;
GtkWidget *followup_hbox;
#endif
- GtkWidget *paned;
-
- GtkWidget *attach_scrwin;
- GtkWidget *attach_clist;
-
- GtkWidget *edit_vbox;
- GtkWidget *ruler_hbox;
- GtkWidget *ruler;
- GtkWidget *scrolledwin;
- GtkWidget *text;
-
- GtkWidget *table;
GtkWidget *hbox;
- UndoMain *undostruct;
-
- gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
- guint n_menu_entries;
- GtkStyle *style, *new_style;
- GdkColormap *cmap;
- GdkColor color[1];
- gboolean success[1];
- GdkFont *font;
- GtkWidget *popupmenu;
- GtkWidget *menuitem;
- GtkItemFactory *popupfactory;
- GtkItemFactory *ifactory;
- GtkWidget *tmpl_menu;
- gint n_entries;
gint count = 0;
- gint i;
-
-#if USE_PSPELL
- GtkPspell * gtkpspell = NULL;
-#endif
-
- g_return_val_if_fail(account != NULL, NULL);
-
- debug_print(_("Creating compose window...\n"));
- compose = g_new0(Compose, 1);
-
- compose->account = account;
- compose->orig_account = account;
-
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
- gtk_widget_set_usize(window, -1, prefs_common.compose_height);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(compose_delete_cb), compose);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(compose_destroy_cb), compose);
- gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
- gtk_widget_realize(window);
-
- gtkut_widget_set_composer_icon(window);
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(window), vbox);
-
- n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
- menubar = menubar_create(window, compose_entries,
- n_menu_entries, "<Compose>", compose);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
-
- handlebox = gtk_handle_box_new();
- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-
- compose_toolbar_create(compose, handlebox);
-
- 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);
-
- table_vbox = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox2), table_vbox, FALSE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(table_vbox),
- BORDER_WIDTH * 2);
-
- /* Notebook */
- notebook = gtk_notebook_new();
- gtk_widget_set_usize(notebook, -1, 180);
- gtk_widget_show(notebook);
/* header labels and entries */
header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(header_scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), header_scrolledwin, gtk_label_new(_("Header")));
header_table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(header_table);
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
#endif
+ compose->table = NULL;
+#if 0 /* NEW COMPOSE GUI */
+ compose->table = table;
+ compose->to_hbox = to_hbox;
+ compose->to_entry = to_entry;
+ compose->newsgroups_hbox = newsgroups_hbox;
+ compose->newsgroups_entry = newsgroups_entry;
+#endif
+ compose->subject_entry = subject_entry;
+#if 0 /* NEW COMPOSE GUI */
+ compose->cc_hbox = cc_hbox;
+ compose->cc_entry = cc_entry;
+ compose->bcc_hbox = bcc_hbox;
+ compose->bcc_entry = bcc_entry;
+ compose->reply_hbox = reply_hbox;
+ compose->reply_entry = reply_entry;
+ compose->followup_hbox = followup_hbox;
+ compose->followup_entry = followup_entry;
+#endif
+
+ return header_scrolledwin ;
+}
+
+GtkWidget *compose_create_attach(Compose *compose)
+{
+ gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
+ gint i;
+
+ GtkWidget *attach_scrwin;
+ GtkWidget *attach_clist;
+
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), attach_scrwin, gtk_label_new(_("Attachments")));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
compose);
+ compose->attach_scrwin = attach_scrwin;
+ compose->attach_clist = attach_clist;
+
+ return attach_scrwin;
+}
+
+static void compose_savemsg_checkbtn_cb(GtkWidget *widget, Compose *compose);
+static void compose_savemsg_select_cb(GtkWidget *widget, Compose *compose);
+
+static GtkWidget *compose_create_others(Compose *compose)
+{
+ GtkWidget *table;
+ GtkWidget *savemsg_checkbtn;
+ GtkWidget *savemsg_entry;
+ GtkWidget *savemsg_select;
+
+ guint rowcount = 0;
+ gchar *folderidentifier;
+
+ /* Table for settings */
+ table = gtk_table_new(3, 1, FALSE);
+ gtk_widget_show(table);
+ gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
+ rowcount = 0;
+
+ /* Save Message to folder */
+ savemsg_checkbtn = gtk_check_button_new_with_label(_("Save Message to "));
+ gtk_widget_show(savemsg_checkbtn);
+ gtk_table_attach(GTK_TABLE(table), savemsg_checkbtn, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
+ gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
+ GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+
+ savemsg_entry = gtk_entry_new();
+ gtk_widget_show(savemsg_entry);
+ gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
+ gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
+ folderidentifier = folder_item_get_identifier(folder_get_default_outbox());
+ gtk_entry_set_text(GTK_ENTRY(savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+
+ savemsg_select = gtk_button_new_with_label (_("Select ..."));
+ 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);
+ gtk_signal_connect (GTK_OBJECT (savemsg_select), "clicked",
+ GTK_SIGNAL_FUNC (compose_savemsg_select_cb),
+ compose);
+
+ rowcount++;
+
+ compose->savemsg_checkbtn = savemsg_checkbtn;
+ compose->savemsg_entry = savemsg_entry;
+
+ return table;
+}
+
+static void compose_savemsg_checkbtn_cb(GtkWidget *widget, Compose *compose)
+{
+ gtk_editable_set_editable(GTK_EDITABLE(compose->savemsg_entry),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn)));
+}
+
+static void compose_savemsg_select_cb(GtkWidget *widget, Compose *compose)
+{
+ FolderItem *dest;
+ gchar * path;
+
+ dest = foldersel_folder_sel(NULL, NULL);
+ if (!dest) return;
+
+ path = folder_item_get_identifier(dest);
+
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), path);
+ g_free(path);
+}
+
+static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+{
+ Compose *compose;
+ GtkWidget *window;
+ GtkWidget *vbox;
+ GtkWidget *menubar;
+ GtkWidget *handlebox;
+
+ GtkWidget *notebook;
+
+ GtkWidget *vbox2;
+
+ GtkWidget *table_vbox;
+
+ GtkWidget *paned;
+
+ GtkWidget *edit_vbox;
+ GtkWidget *ruler_hbox;
+ GtkWidget *ruler;
+ GtkWidget *scrolledwin;
+ GtkWidget *text;
+
+ GtkWidget *table;
+
+ UndoMain *undostruct;
+
+ guint n_menu_entries;
+ GtkStyle *style, *new_style;
+ GdkColormap *cmap;
+ GdkColor color[1];
+ gboolean success[1];
+ GdkFont *font;
+ GtkWidget *popupmenu;
+ GtkWidget *menuitem;
+ GtkItemFactory *popupfactory;
+ GtkItemFactory *ifactory;
+ GtkWidget *tmpl_menu;
+ gint n_entries;
+
+#if USE_PSPELL
+ GtkPspell * gtkpspell = NULL;
+#endif
+
+ g_return_val_if_fail(account != NULL, NULL);
+
+ debug_print(_("Creating compose window...\n"));
+ compose = g_new0(Compose, 1);
+
+ compose->account = account;
+ compose->orig_account = account;
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+ gtk_widget_set_usize(window, -1, prefs_common.compose_height);
+ gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
+ gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+ GTK_SIGNAL_FUNC(compose_delete_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(window), "destroy",
+ GTK_SIGNAL_FUNC(compose_destroy_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ gtk_widget_realize(window);
+
+ gtkut_widget_set_composer_icon(window);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+
+ n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
+ menubar = menubar_create(window, compose_entries,
+ n_menu_entries, "<Compose>", compose);
+ gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+
+ handlebox = gtk_handle_box_new();
+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+
+ compose_toolbar_create(compose, handlebox);
+
+ 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);
+
+ table_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), table_vbox, FALSE, TRUE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(table_vbox),
+ BORDER_WIDTH * 2);
+
+ /* Notebook */
+ notebook = gtk_notebook_new();
+ gtk_widget_set_usize(notebook, -1, 180);
+ gtk_widget_show(notebook);
+
+ /* header labels and entries */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header")));
+ /* attachment list */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments")));
+ /* Others Tab */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
edit_vbox = gtk_vbox_new(FALSE, 0);
#if 0 /* NEW COMPOSE GUI */
compose->vbox2 = vbox2;
compose->table_vbox = table_vbox;
- compose->table = NULL;
-#if 0 /* NEW COMPOSE GUI */
- compose->table = table;
- compose->to_hbox = to_hbox;
- compose->to_entry = to_entry;
- compose->newsgroups_hbox = newsgroups_hbox;
- compose->newsgroups_entry = newsgroups_entry;
-#endif
- compose->subject_entry = subject_entry;
-#if 0 /* NEW COMPOSE GUI */
- compose->cc_hbox = cc_hbox;
- compose->cc_entry = cc_entry;
- compose->bcc_hbox = bcc_hbox;
- compose->bcc_entry = bcc_entry;
- compose->reply_hbox = reply_hbox;
- compose->reply_entry = reply_entry;
- compose->followup_hbox = followup_hbox;
- compose->followup_entry = followup_entry;
-#endif
- compose->paned = paned;
- compose->attach_scrwin = attach_scrwin;
- compose->attach_clist = attach_clist;
+ compose->paned = paned;
compose->edit_vbox = edit_vbox;
compose->ruler_hbox = ruler_hbox;
account->auto_replyto);
#endif
}
+
if (account->protocol != A_NNTP) {
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("To:"));
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
} else {
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("Newsgroups:"));
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
}
menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
if (tmpl->subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
tmpl->subject);
+ if (tmpl->to)
+ compose_entry_append(compose, tmpl->to, COMPOSE_TO);
if (compose->replyinfo == NULL) {
MsgInfo dummyinfo;
if (GTK_CHECK_MENU_ITEM(widget)->active) {
gtk_widget_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->edit_vbox);
+ gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
+ compose->edit_vbox);
gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
gtk_box_pack_start(GTK_BOX(compose->vbox2), compose->paned,
TRUE, TRUE, 0);
gtk_widget_ref(compose->paned);
gtk_widget_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->paned);
- gtk_container_remove(GTK_CONTAINER(compose->paned),
- compose->edit_vbox);
+ gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
+ compose->paned);
+ gtkut_container_remove(GTK_CONTAINER(compose->paned),
+ compose->edit_vbox);
gtk_box_pack_start(GTK_BOX(compose->vbox2),
compose->edit_vbox, TRUE, TRUE, 0);
projects / claws.git / blobdiff