compose_send_later_cb, 0, NULL},
{N_("/_Message/Save to _draft folder"),
"<alt>D", compose_draft_cb, 0, NULL},
-/*
+#if 0 /* NEW COMPOSE GUI */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Attach"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
-*/
+#endif
#if USE_GPGME
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
gtk_widget_grab_focus(compose->header_last->entry);
}
}
- if(item && item->prefs->request_return_receipt) {
+ if (item && item->ret_rcpt) {
GtkItemFactory *ifactory;
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose = compose_create(account, COMPOSE_REPLY);
compose->replyinfo = msginfo;
-/* *** NEW_HEADER_ENTRIES ***
+#if 0 /* NEW COMPOSE GUI */
if (followup_and_reply_to) {
gtk_widget_show(compose->to_hbox);
gtk_widget_show(compose->to_entry);
gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 4);
compose->use_to = TRUE;
}
-*/
- if(msginfo->folder && msginfo->folder->prefs->request_return_receipt) {
+#endif
+ if (msginfo->folder && msginfo->folder->ret_rcpt) {
GtkItemFactory *ifactory;
ifactory = gtk_item_factory_from_widget(compose->menubar);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
gtk_stext_thaw(text);
-/* *** NEW_HEADER_ENTRIES ***
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
else
gtk_widget_grab_focus(compose->newsgroups_entry);
-*/
+#endif
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
gtk_stext_thaw(text);
-/* *** NEW_HEADER_ENTRIES ***
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
else
gtk_widget_grab_focus(compose->newsgroups_entry);
-*/
+#endif
return compose;
}
if (!address || *address == '\0') return;
-/* *** NEW_HEADER_ENTRIES ***
+#if 0 /* NEW COMPOSE GUI */
switch (type) {
case COMPOSE_CC:
entry = GTK_ENTRY(compose->cc_entry);
if (*text != '\0')
gtk_entry_append_text(entry, ", ");
gtk_entry_append_text(entry, address);
-*/
+#endif
switch (type) {
case COMPOSE_CC:
- header = _("Cc:");
+ header = N_("Cc:");
break;
case COMPOSE_BCC:
- header = _("Bcc:");
+ header = N_("Bcc:");
break;
case COMPOSE_REPLYTO:
- header = _("Reply-To:");
+ header = N_("Reply-To:");
break;
case COMPOSE_NEWSGROUPS:
- header = _("Newsgroups:");
+ header = N_("Newsgroups:");
break;
case COMPOSE_FOLLOWUPTO:
- header = _("Followup-To:");
+ header = N_( "Followup-To:");
break;
case COMPOSE_TO:
default:
- header = _("To:");
+ header = N_("To:");
break;
}
+ header = prefs_common.trans_hdr ? gettext(header) : header;
compose_add_header_entry(compose, header, (gchar *)address);
}
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->bcc) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
-*/
+#endif
}
#undef SET_ENTRY
alertpanel_notice(_("File %s is empty\n"), file);
return;
}
-/*
+#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
-*/
+#endif
ainfo = g_new0(AttachInfo, 1);
ainfo->file = g_strdup(file);
alertpanel_notice(_("File %s is empty\n"), file);
return;
}
-/*
+#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
-*/
+#endif
ainfo = g_new0(AttachInfo, 1);
ainfo->file = g_strdup(file);
#undef GET_STEXT
}
+/* return str length if text at start_pos matches str else return zero */
+static gint is_gtkstext_string(GtkSText *text, guint start_pos,
+ guint text_len, gchar *str) {
+ gint is_str, i, str_len;
+ gchar str_ch;
+
+ is_str = 0;
+ if (str) {
+ str_len = strlen(str);
+ is_str = 1;
+ for (i = 0; (i < str_len) && (start_pos + i < text_len); i++) {
+ str_ch = GTK_STEXT_INDEX(text, start_pos + i);
+ if (*(str + i) != str_ch) {
+ break;
+ }
+ }
+ if (i == 0 || i < str_len)
+ is_str = 0;
+ }
+
+ return is_str ? str_len : 0;
+}
+
static void compose_wrap_line_all(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
guint line_pos = 0, cur_pos = 0;
gint line_len = 0, cur_len = 0;
gint ch_len;
+ gint is_new_line = 1;
+ guint quote_len = 0;
+ guint linewrap_quote = prefs_common.linewrap_quote;
+ gchar *quote_fmt = prefs_common.quotemark;
gchar cbuf[MB_CUR_MAX];
gtk_stext_freeze(text);
+ /* make text buffer contiguous */
+ gtk_stext_compact_buffer(text);
+
text_len = gtk_stext_get_length(text);
for (; cur_pos < text_len; cur_pos++) {
+ if (linewrap_quote && is_new_line) {
+ quote_len = is_gtkstext_string(text, cur_pos,
+ text_len, quote_fmt);
+ is_new_line = 0;
+ }
if (text->use_wchar)
ch_len = wctomb
(cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
if (ch_len == 1 && *cbuf == '\n') {
line_pos = cur_pos + 1;
line_len = cur_len = 0;
+ quote_len = 0;
+ is_new_line = 1;
continue;
}
line_pos++;
cur_len = cur_len - line_len + ch_len;
line_len = 0;
+ if (linewrap_quote && quote_len) {
+ /* only if line is not already quoted */
+ if (!is_gtkstext_string(text, line_pos,
+ text_len, quote_fmt)) {
+ gtk_stext_insert(text, NULL, NULL, NULL,
+ quote_fmt, quote_len);
+ gtk_stext_compact_buffer(text);
+ text_len += quote_len;
+ cur_pos += quote_len;
+ cur_len += quote_len;
+ line_len = quote_len;
+ }
+ }
continue;
}
if (compose->to_list) {
PrefsAccount *ac;
- /*
+#if 0 /* NEW COMPOSE GUI */
if (compose->account->protocol != A_NNTP)
ac = compose->account;
else if (compose->orig_account->protocol != A_NNTP)
return -1;
}
}
- */
+#endif
ac = compose->account;
ok = send_message(tmp, ac, compose->to_list);
if (!strcasecmp(out_codeset, "US-ASCII"))
out_codeset = "ISO-8859-1";
encoding = procmime_get_encoding_for_charset(out_codeset);
- debug_print("charset = %s, encoding = %s\n",
- out_codeset, procmime_get_encoding_str(encoding));
-
src_codeset = conv_get_current_charset_str();
+ if (!strcasecmp(src_codeset, "US-ASCII"))
+ src_codeset = "ISO-8859-1";
+ debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
+ src_codeset, out_codeset, procmime_get_encoding_str(encoding));
+
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!buf) {
g_free(chars);
/* To */
compose_write_headers_from_headerlist(compose, fp, "To", address_list_append, &compose->to_list);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
if (*str != '\0') {
}
}
}
-*/
+#endif
slist_free_strings(compose->newsgroup_list);
g_slist_free(compose->newsgroup_list);
compose->newsgroup_list = NULL;
/* Newsgroups */
compose_write_headers_from_headerlist(compose, fp, "Newsgroups", newsgroup_list_append, &compose->newsgroup_list);
-/*
+#if 0 /* NEW COMPOSE GUI */
str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
if (*str != '\0') {
Xstrdup_a(str, str, return -1);
}
}
}
-*/
+#endif
/* Cc */
compose_write_headers_from_headerlist(compose, fp, "Cc", address_list_append, &compose->to_list);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
if (*str != '\0') {
}
}
}
-*/
+#endif
/* Bcc */
compose_write_headers_from_headerlist(compose, fp, "Bcc", address_list_append, &compose->to_list);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
if (*str != '\0') {
}
}
}
-*/
+#endif
if (!is_draft && !compose->to_list && !compose->newsgroup_list)
return -1;
/* Followup-To */
compose_write_headers_from_headerlist(compose, fp, "Followup-To", NULL, NULL);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
if (*str != '\0') {
}
}
}
-*/
+#endif
/* Reply-To */
compose_write_headers_from_headerlist(compose, fp, "Reply-To", NULL, NULL);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
if (*str != '\0') {
}
}
}
-*/
+#endif
/* Organization */
if (compose->account->organization &&
!IS_IN_CUSTOM_HEADER("Organization")) {
*entry = gtk_entry_new();
gtk_table_attach
(GTK_TABLE(table), *entry, 1, 2, *count, (*count) + 1, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-/* if (GTK_TABLE(table)->nrows > (*count) + 1)
- gtk_table_set_row_spacing(GTK_TABLE(table), *count, 4); */
+#if 0 /* NEW COMPOSE GUI */
+ if (GTK_TABLE(table)->nrows > (*count) + 1)
+ gtk_table_set_row_spacing(GTK_TABLE(table), *count, 4);
+#endif
if (is_addr_entry)
address_completion_register_entry(GTK_ENTRY(*entry));
GtkWidget *table_vbox;
GtkWidget *label;
GtkWidget *from_optmenu_hbox;
-/*
+#if 0 /* NEW COMPOSE GUI */
GtkWidget *to_entry;
GtkWidget *to_hbox;
GtkWidget *newsgroups_entry;
GtkWidget *newsgroups_hbox;
-*/
+#endif
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
GtkWidget *subject_entry;
-/*
+#if 0 /* NEW COMPOSE GUI */
GtkWidget *cc_entry;
GtkWidget *cc_hbox;
GtkWidget *bcc_entry;
GtkWidget *reply_hbox;
GtkWidget *followup_entry;
GtkWidget *followup_hbox;
-*/
+#endif
GtkWidget *paned;
GtkWidget *attach_scrwin;
gtk_widget_set_usize(notebook, -1, 180);
gtk_widget_show(notebook);
-/* table = gtk_table_new(8, 2, FALSE);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, gtk_label_new(_("Header")));
- gtk_box_pack_start(GTK_BOX(table_vbox), table, FALSE, TRUE, 0); */
-
/* 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")));
-/* gtk_table_attach_defaults(GTK_TABLE(table), header_scrolledwin,
- 1, 2, count, count + 1); */
header_table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(header_table);
from_optmenu_hbox = compose_account_option_menu_create(compose);
gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-/* gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4); */
+#if 0 /* NEW COMPOSE GUI */
+ gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
+#endif
count++;
/* Subject */
compose_create_header_entry(compose);
-/*
+#if 0 /* NEW COMPOSE GUI */
compose_add_entry_field(table, &to_hbox, &to_entry, &count,
"To:", TRUE);
gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
gtk_signal_connect(GTK_OBJECT(followup_entry), "grab_focus",
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
-*/
+#endif
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
edit_vbox = gtk_vbox_new(FALSE, 0);
-/* gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0); */
+#if 0 /* NEW COMPOSE GUI */
+ gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
+#endif
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
(GTK_SCROLLED_WINDOW(scrolledwin)));
GTK_STEXT(text)->default_tab_width = 8;
gtk_stext_set_editable(GTK_STEXT(text), TRUE);
+
+ if (prefs_common.block_cursor) {
+ GTK_STEXT(text)->cursor_type = STEXT_CURSOR_BLOCK;
+ }
+
if (prefs_common.smart_wrapping) {
gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
gtkpspell = gtkpspell_new_with_config(gtkpspellconfig,
prefs_common.pspell_path,
prefs_common.dictionary,
- PSPELL_FASTMODE,NULL);
+ PSPELL_FASTMODE,
+ conv_get_current_charset_str());
if (gtkpspell == NULL)
prefs_common.enable_pspell = FALSE;
else
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
- /*
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol == A_NNTP) {
gtk_widget_hide(to_hbox);
gtk_widget_hide(to_entry);
menu_set_sensitive(ifactory, "/Message/Followup to", FALSE);
}
- */
+#endif
switch (prefs_common.toolbar_style) {
case TOOLBAR_NONE:
compose->table_vbox = table_vbox;
compose->table = table;
-/*
+#if 0 /* NEW COMPOSE GUI */
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->reply_entry = reply_entry;
compose->followup_hbox = followup_hbox;
compose->followup_entry = followup_entry;
-*/
+#endif
compose->paned = paned;
compose->attach_scrwin = attach_scrwin;
compose_set_title(compose);
-/*
+#if 0 /* NEW COMPOSE GUI */
compose->use_bcc = FALSE;
compose->use_replyto = FALSE;
compose->use_followupto = FALSE;
-*/
+#endif
#if USE_PSPELL
compose->gtkpspell = gtkpspell;
#endif
- /*
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP) {
menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
}
- */
-/* *** NEW_HEADER_ENTRIES ***
- READD LATER
+#endif
if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT) {
+ compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
+#if 0 /* NEW COMPOSE GUI */
compose->use_cc = TRUE;
gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+#endif
}
-*/
-
-/* *** NEW_HEADER_ENTRIES ***
- READD LATER
if (account->set_autobcc) {
+ compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
+#if 0 /* NEW COMPOSE GUI */
compose->use_bcc = TRUE;
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
gtk_check_menu_item_set_active
if (account->auto_bcc && mode != COMPOSE_REEDIT)
gtk_entry_set_text(GTK_ENTRY(bcc_entry),
account->auto_bcc);
+#endif
}
- if (account->set_autoreplyto) {
+ if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT) {
+ compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
+#if 0 /* NEW COMPOSE GUI */
compose->use_replyto = TRUE;
menuitem = gtk_item_factory_get_item(ifactory,
"/Message/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- if (account->auto_replyto && mode != COMPOSE_REEDIT)
- gtk_entry_set_text(GTK_ENTRY(reply_entry),
- account->auto_replyto);
+ gtk_entry_set_text(GTK_ENTRY(reply_entry),
+ account->auto_replyto);
+#endif
}
-*/
menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_ruler);
compose_list = g_list_append(compose_list, compose);
- /*
+#if 0 /* NEW COMPOSE GUI */
compose->use_to = FALSE;
compose->use_cc = FALSE;
compose->use_attach = TRUE;
- */
+#endif
- /* READD LATER
+#if 0 /* NEW COMPOSE GUI */
if (!compose->use_bcc) {
gtk_widget_hide(bcc_hbox);
gtk_widget_hide(bcc_entry);
gtk_widget_hide(followup_entry);
gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
}
- */
+#endif
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
compose->account = ac;
compose_set_title(compose);
-/*
+#if 0 /* NEW COMPOSE GUI */
if (ac->protocol == A_NNTP) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
3, 4);
}
gtk_widget_queue_resize(compose->table_vbox);
-*/
+#endif
}
static void account_activated(GtkMenuItem *menuitem, gpointer data)
}
#endif
-/*
+#if 0 /* NEW COMPOSE GUI */
static void compose_toggle_to_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose->use_attach = FALSE;
}
}
-*/
+#endif
+
#if USE_GPGME
static void compose_toggle_sign_cb(gpointer data, guint action,
GtkWidget *widget)
g_list_free(list);
}
-/*
+#if 0 /* NEW COMPOSE GUI */
static void to_activated(GtkWidget *widget, Compose *compose)
{
if (GTK_WIDGET_VISIBLE(compose->newsgroups_entry))
{
gtk_widget_grab_focus(compose->text);
}
-*/
+#endif
+
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget)
{
gtk_signal_disconnect_by_func(GTK_OBJECT(entry), GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
}
}
-
projects / claws.git / blobdiff