/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* 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
#include "template.h"
#include "undo.h"
#include "foldersel.h"
+#include "prefs_actions.h"
#if USE_GPGME
# include "rfc2015.h"
#define N_ATTACH_COLS 3
+typedef enum
+{
+ COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
+ COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
+ COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
+} ComposeCallGtkSTextAction;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static gchar *compose_quote_fmt (Compose *compose,
MsgInfo *msginfo,
const gchar *fmt,
- const gchar *qmark);
+ const gchar *qmark,
+ const gchar *body);
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
static void compose_paste_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
-typedef enum {
- COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
- COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
-} ComposeCallGtkStextAction;
-
-static void compose_gtk_stext_action_cb (Compose *compose, ComposeCallGtkStextAction action);
+static void compose_gtk_stext_action_cb (Compose *compose,
+ ComposeCallGtkSTextAction action);
static void compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
gboolean ignore_replyto,
- gboolean followup_and_reply_to);
+ gboolean followup_and_reply_to,
+ const gchar *body);
void compose_headerentry_changed_cb (GtkWidget *entry,
ComposeHeaderEntry *headerentry);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
-static void compose_ctl_enter_send_shortcut_cb(GtkWidget *w, Compose *compose);
-
-static void compose_check_backwards(Compose *compose);
-
-static void compose_check_forwards_go(Compose *compose);
-
+#if USE_PSPELL
+static void compose_check_all (Compose *compose);
+static void compose_highlight_all (Compose *compose);
+static void compose_check_backwards (Compose *compose);
+static void compose_check_forwards_go (Compose *compose);
+#endif
+static gboolean compose_send_control_enter (Compose *compose);
+static void text_activated (GtkWidget *widget,
+ Compose *compose);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_File/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
{N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), "<control>Q", compose_close_cb, 0, NULL},
+ {N_("/_File/_Close"), "<control>W", compose_close_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Undo"), "<control>Z", compose_undo_cb, 0, NULL},
{N_("/_Edit/_Copy"), "<control>C", compose_copy_cb, 0, NULL},
{N_("/_Edit/_Paste"), "<control>V", compose_paste_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
- {N_("/_Edit/A_dvanced"), NULL, NULL, 0,
- "<Branch>"},
- {N_("/_Edit/A_dvanced/Move a character backward"), "<control>B", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER, NULL},
- {N_("/_Edit/A_dvanced/Move a character forward"), "<control>F", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER, NULL},
- {N_("/_Edit/A_dvanced/Move a word backward"), "<alt>B", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD, NULL},
- {N_("/_Edit/A_dvanced/Move a word forward"), "<alt>F", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD, NULL},
- {N_("/_Edit/A_dvanced/Move to beginning of line"), NULL, compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE, NULL},
- {N_("/_Edit/A_dvanced/Move to end of line"), "<control>E", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE, NULL},
- {N_("/_Edit/A_dvanced/Move to next line"), "<control>N", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE, NULL},
- {N_("/_Edit/A_dvanced/Move to previous line"), "<control>P", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE, NULL},
- {N_("/_Edit/A_dvanced/Delete a character backward"), "<control>H", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER, NULL},
- {N_("/_Edit/A_dvanced/Delete a character forward"), "<control>D", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER, NULL},
- {N_("/_Edit/A_dvanced/Delete a word backward"), "<control>w", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD, NULL},
- {N_("/_Edit/A_dvanced/Delete a word forward"), "<alt>D", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD, NULL},
- {N_("/_Edit/A_dvanced/Delete line"), "<control>U", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_LINE, NULL},
- {N_("/_Edit/A_dvanced/Delete line+"), NULL, compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N, NULL},
- {N_("/_Edit/A_dvanced/Delete to end of line"), "<control>K", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END, NULL},
+ {N_("/_Edit/A_dvanced"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Edit/A_dvanced/Move a character backward"),
+ "<control>B",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move a character forward"),
+ "<control>F",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move a word backward"),
+ NULL, /* "<alt>B" */
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move a word forward"),
+ NULL, /* "<alt>F" */
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move to beginning of line"),
+ NULL, /* "<control>A" */
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move to end of line"),
+ "<control>E",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move to previous line"),
+ "<control>P",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
+ NULL},
+ {N_("/_Edit/A_dvanced/Move to next line"),
+ "<control>N",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete a character backward"),
+ "<control>H",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete a character forward"),
+ "<control>D",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete a word backward"),
+ NULL, /* "<control>W" */
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete a word forward"),
+ NULL, /* "<alt>D", */
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete line"),
+ "<control>U",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete entire line"),
+ NULL,
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
+ NULL},
+ {N_("/_Edit/A_dvanced/Delete to end of line"),
+ "<control>K",
+ compose_gtk_stext_action_cb,
+ COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END,
+ NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
-#if USE_PSPELL
- {N_("/_Edit/Check backwards misspelled word"), "<control>;", compose_check_backwards , 0, NULL},
- {N_("/_Edit/Forward to next misspelled word"), "<control>!", compose_check_forwards_go, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
-#endif
{N_("/_Edit/_Wrap current paragraph"),
"<control>L", compose_wrap_line, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
"<control><alt>L", compose_wrap_line_all, 0, NULL},
{N_("/_Edit/Edit with e_xternal editor"),
- "<control>X", compose_ext_editor_cb, 0, NULL},
+ "<shift><control>X", compose_ext_editor_cb, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/Actio_ns"), NULL, NULL, 0, "<Branch>"},
+#if USE_PSPELL
+ {N_("/_Spelling"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Spelling/_Check all or check selection"),
+ NULL, compose_check_all, 0, NULL},
+ {N_("/_Spelling/_Highlight all misspelled words"),
+ NULL, compose_highlight_all, 0, NULL},
+ {N_("/_Spelling/Check _backwards misspelled word"),
+ 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
#if 0 /* NEW COMPOSE GUI */
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
- {N_("/_Message/Send _later"), "<shift><alt>S",
+ {N_("/_Message/Send _later"), "<shift><control>S",
compose_send_later_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Save to _draft folder"),
- "<alt>D", compose_draft_cb, 0, NULL},
+ "<shift><control>D", compose_draft_cb, 0, NULL},
{N_("/_Message/Save and _keep editing"),
"<control>S", compose_draft_cb, 1, NULL},
#if 0 /* NEW COMPOSE GUI */
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
{N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
- {N_("/_Tool/_Address book"), "<control><alt>A", compose_address_cb , 0, NULL},
+ {N_("/_Tool/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
{N_("/_Tool/_Template"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(c->subject_entry), FALSE);
- compose_quote_fmt(c, msginfo, "%M", NULL);
+ compose_quote_fmt(c, msginfo, "%M", NULL, NULL);
gtk_editable_set_editable(GTK_EDITABLE(c->text), FALSE);
ifactory = gtk_item_factory_from_widget(c->popupmenu);
*/
void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
- gboolean ignore_replyto)
+ gboolean ignore_replyto, const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, ignore_replyto, FALSE);
+ compose_generic_reply(msginfo, quote, to_all, ignore_replyto, FALSE,
+ body);
}
void compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
- gboolean ignore_replyto)
+ gboolean ignore_replyto,
+ const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, ignore_replyto, TRUE);
+ compose_generic_reply(msginfo, quote, to_all, ignore_replyto, TRUE,
+ body);
}
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
gboolean ignore_replyto,
- gboolean followup_and_reply_to)
+ gboolean followup_and_reply_to,
+ const gchar *body)
{
Compose *compose;
PrefsAccount *account;
quote_str = compose_quote_fmt(compose, msginfo,
prefs_common.quotefmt,
- qmark);
+ qmark, body);
}
if (prefs_common.auto_sig)
gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
- if (prefs_common.auto_exteditor)
+ if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
}
+static void set_toolbar_style(Compose *compose);
static gchar *procmime_get_file_name(MimeInfo *mimeinfo)
{
}
Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
- gboolean as_attach)
+ gboolean as_attach, const gchar *body)
{
Compose *compose;
/* PrefsAccount *account; */
qmark = "> ";
quote_str = compose_quote_fmt(compose, msginfo,
- prefs_common.fw_quotefmt, qmark);
+ prefs_common.fw_quotefmt, qmark,
+ body);
compose_attach_parts(compose, msginfo);
}
}
static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
- const gchar *fmt, const gchar *qmark)
+ const gchar *fmt, const gchar *qmark,
+ const gchar *body)
{
GtkSText *text = GTK_STEXT(compose->text);
gchar *quote_str = NULL;
gint len;
if (qmark != NULL) {
- quote_fmt_init(msginfo, NULL);
+ quote_fmt_init(msginfo, NULL, NULL);
quote_fmt_scan_string(qmark);
quote_fmt_parse();
}
if (fmt && *fmt != '\0') {
- quote_fmt_init(msginfo, quote_str);
+ quote_fmt_init(msginfo, quote_str, body);
quote_fmt_scan_string(fmt);
quote_fmt_parse();
buf = "";
gtk_stext_freeze(text);
- gtk_stext_set_point(text, 0);
- gtk_stext_forward_delete(text, gtk_stext_get_length(text));
for (p = buf; *p != '\0'; ) {
lastp = strchr(p, '\n');
gboolean to_all, gboolean ignore_replyto,
gboolean followup_and_reply_to)
{
- GSList *cc_list;
+ GSList *cc_list = NULL;
GSList *cur;
- gchar *from;
+ gchar *from = NULL;
+ gchar *replyto = NULL;
GHashTable *to_table;
g_return_if_fail(compose->account != NULL);
? compose->mailinglist
: msginfo->from ? msginfo->from : ""),
COMPOSE_TO);
+
if (compose->account->protocol == A_NNTP) {
if (ignore_replyto)
compose_entry_append
if (!to_all || compose->account->protocol == A_NNTP) return;
- from = g_strdup(compose->replyto ? compose->replyto :
- msginfo->from ? msginfo->from : "");
- extract_address(from);
+ if (compose->replyto) {
+ Xstrdup_a(replyto, compose->replyto, return);
+ extract_address(replyto);
+ }
+ if (msginfo->from) {
+ Xstrdup_a(from, msginfo->from, return);
+ extract_address(from);
+ }
+
+ if (compose->mailinglist && from) {
+ cc_list = address_list_append(cc_list, from);
+ }
+
+ if (replyto && from)
+ cc_list = address_list_append(cc_list, from);
+
+ if (!compose->mailinglist)
+ cc_list = address_list_append(cc_list, msginfo->to);
- cc_list = address_list_append(NULL, msginfo->to);
cc_list = address_list_append(cc_list, compose->cc);
to_table = g_hash_table_new(g_str_hash, g_str_equal);
- g_hash_table_insert(to_table, from, GINT_TO_POINTER(1));
+ if (replyto)
+ g_hash_table_insert(to_table, replyto, GINT_TO_POINTER(1));
if (compose->account)
g_hash_table_insert(to_table, compose->account->address,
GINT_TO_POINTER(1));
cur = next;
}
g_hash_table_destroy(to_table);
- g_free(from);
if (cc_list) {
for (cur = cc_list; cur != NULL; cur = cur->next)
if (compose->account && compose->account->sig_path)
sigfile = g_strdup(compose->account->sig_path);
- else {
+ else
sigfile = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
DEFAULT_SIGNATURE, NULL);
- }
- if (!is_file_or_fifo_exist(sigfile) & (sigfile[0] != '|')) {
+ if (!is_file_or_fifo_exist(sigfile) && sigfile[0] != '|') {
g_free(sigfile);
return;
}
}
if (sigfile[0] == '|')
- {
compose_exec_sig(compose, sigfile);
- }
else
- {
compose_insert_file(compose, sigfile);
- }
g_free(sigfile);
}
gint ch_len;
gboolean is_new_line = TRUE, do_delete = FALSE;
guint qlen = 0, i_len = 0;
- guint linewrap_quote = prefs_common.linewrap_quote;
+ gboolean linewrap_quote = TRUE;
guint linewrap_len = prefs_common.linewrap_len;
gchar *qfmt = prefs_common.quotemark;
gchar cbuf[MB_LEN_MAX];
do_delete = FALSE;
}
+ /* skip delete if it is continuous URL */
+ if (do_delete && (line_pos - p_pos <= i_len) &&
+ gtkut_stext_is_uri_string(text, line_pos, tlen))
+ do_delete = FALSE;
+
#ifdef WRAP_DEBUG
printf("qlen=%d l_len=%d wrap_len=%d do_del=%d\n",
qlen, line_len, linewrap_len, do_delete);
}
val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
- if(!val) {
- folder_item_remove_msg(folder, msgnum);
- folderview_update_item(folder, TRUE);
- }
+
+ folder_item_remove_msg(folder, msgnum);
+ folderview_update_item(folder, TRUE);
return val;
}
gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
- gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
address_completion_register_entry(GTK_ENTRY(entry));
GtkWidget *compose_create_attach(Compose *compose)
{
- gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
+ gchar *titles[N_ATTACH_COLS];
gint i;
GtkWidget *attach_scrwin;
GtkWidget *attach_clist;
+ titles[COL_MIMETYPE] = _("MIME type");
+ titles[COL_SIZE] = _("Size");
+ titles[COL_NAME] = _("Name");
+
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
FolderItem *dest;
gchar * path;
- dest = foldersel_folder_sel(NULL, NULL);
+ dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
if (!dest) return;
path = folder_item_get_identifier(dest);
UndoMain *undostruct;
+ gchar *titles[N_ATTACH_COLS];
guint n_menu_entries;
GtkStyle *style, *new_style;
GdkColormap *cmap;
debug_print(_("Creating compose window...\n"));
compose = g_new0(Compose, 1);
+ titles[COL_MIMETYPE] = _("MIME type");
+ titles[COL_SIZE] = _("Size");
+ titles[COL_NAME] = _("Name");
+
compose->account = account;
compose->orig_account = account;
subject_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
- gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
gtk_widget_show(subject_entry);
compose->subject_entry = subject_entry;
gtk_container_add(GTK_CONTAINER(subject_frame), subject);
gtk_signal_connect(GTK_OBJECT(text), "grab_focus",
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
gtk_signal_connect(GTK_OBJECT(text), "activate",
- GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
+ GTK_SIGNAL_FUNC(text_activated), compose);
gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
GTK_SIGNAL_FUNC(compose_button_press_cb),
edit_vbox);
}
#endif
- switch (prefs_common.toolbar_style) {
- case TOOLBAR_NONE:
- gtk_widget_hide(handlebox);
- break;
- case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
- GTK_TOOLBAR_ICONS);
- break;
- case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
- GTK_TOOLBAR_TEXT);
- break;
- case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
- GTK_TOOLBAR_BOTH);
- break;
- }
+ update_compose_actions_menu(ifactory, "/Edit/Actions", compose);
+
undostruct = undo_init(text);
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
compose->bounce_filename = NULL;
compose->undostruct = undostruct;
#if USE_PSPELL
- menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+
+ menu_set_sensitive(ifactory, "/Spelling", FALSE);
if (prefs_common.enable_pspell) {
gtkpspell = gtkpspell_new((const gchar*)prefs_common.dictionary,
conv_get_current_charset_str(),
+ prefs_common.misspelled_col,
+ prefs_common.check_while_typing,
+ prefs_common.use_alternate,
GTK_STEXT(text));
if (!gtkpspell) {
alertpanel_error(_("Spell checker could not be started.\n%s"), gtkpspellcheckers->error_message);
- gtkpspell_checkers_reset();
+ gtkpspell_checkers_reset_error();
} else {
- gtkpspell_set_sug_mode(gtkpspell, prefs_common.pspell_sugmode);
- menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", TRUE);
- menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", TRUE);
+ GtkWidget *menuitem;
+
+ if (!gtkpspell_set_sug_mode(gtkpspell, prefs_common.pspell_sugmode)) {
+ debug_print(_("Pspell: could not set suggestion mode %s"),
+ gtkpspellcheckers->error_message);
+ gtkpspell_checkers_reset_error();
+ }
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
+ gtkpspell_populate_submenu(gtkpspell, menuitem);
+ menu_set_sensitive(ifactory, "/Spelling", TRUE);
}
}
#endif
gtk_widget_hide(ruler_hbox);
select_account(compose, account);
+ set_toolbar_style(compose);
return compose;
}
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PASTE);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_INSERT_FILE);
insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Insert"),
_("Insert file"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SIGN);
sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Signature"),
_("Insert signature"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EDIT_EXTERN);
exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Editor"),
_("Edit with external editor"),
}
}
+void compose_reflect_prefs_pixmap_theme(void)
+{
+ GList *cur;
+ Compose *compose;
+
+ for (cur = compose_list; cur != NULL; cur = cur->next) {
+ compose = (Compose *)cur->data;
+ gtk_container_remove(GTK_CONTAINER(compose->handlebox), GTK_WIDGET(compose->toolbar));
+ compose->toolbar = NULL;
+ compose_toolbar_create(compose, compose->handlebox);
+ set_toolbar_style(compose);
+ }
+}
+
+
static void compose_template_apply(Compose *compose, Template *tmpl)
{
gchar *qmark;
if (tmpl->to && *tmpl->to != '\0')
compose_entry_append(compose, tmpl->to, COMPOSE_TO);
+ gtk_stext_clear(GTK_STEXT(compose->text));
+
if (compose->replyinfo == NULL) {
MsgInfo dummyinfo;
memset(&dummyinfo, 0, sizeof(MsgInfo));
parsed_str = compose_quote_fmt(compose, &dummyinfo,
- tmpl->value, NULL);
+ tmpl->value, NULL, NULL);
} else {
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
qmark = "> ";
parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark);
+ tmpl->value, qmark, NULL);
}
if (parsed_str && prefs_common.auto_sig)
g_snprintf(buf, sizeof(buf), def_cmd, file);
}
- cmdline = g_strsplit(buf, " ", 1024);
+ cmdline = strsplit_with_quote(buf, " ", 1024);
execvp(cmdline[0], cmdline);
perror("execvp");
gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
}
-static void compose_gtk_stext_action_cb (Compose *compose, ComposeCallGtkStextAction action)
+static void compose_gtk_stext_action_cb(Compose *compose, ComposeCallGtkSTextAction action)
{
if (!(compose->focused_editable && GTK_WIDGET_HAS_FOCUS(compose->focused_editable))) return;
gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
}
-static void compose_ctl_enter_send_shortcut_cb(GtkWidget *w, Compose *compose)
+static void text_activated(GtkWidget *widget, Compose *compose)
+{
+ compose_send_control_enter(compose);
+}
+
+static gboolean compose_send_control_enter(Compose *compose)
{
+ GdkEvent *ev;
+ GdkEventKey *kev;
GtkItemFactory *ifactory;
- GtkAccelEntry *accel;
- GtkWidget *send_button;
+ GtkAccelEntry *accel;
+ GtkWidget *send_menu;
GSList *list;
- GdkEventKey *e= (GdkEventKey *) gtk_get_current_event();
-
- if (e->type != GDK_KEY_PRESS ||
- !( e->keyval == GDK_Return && e->state & GDK_CONTROL_MASK) )
- return;
+
+ ev = gtk_get_current_event();
+ if (ev->type != GDK_KEY_PRESS) return FALSE;
+
+ kev = (GdkEventKey *)ev;
+ if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
+ return FALSE;
ifactory = gtk_item_factory_from_widget(compose->menubar);
- send_button = gtk_item_factory_get_widget(ifactory, "/Message/Send");
- list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_button));
- accel = (GtkAccelEntry *) list->data;
- if (accel->accelerator_key == GDK_Return &&
- accel->accelerator_mods == GDK_CONTROL_MASK)
+ send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
+ list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
+ accel = (GtkAccelEntry *)list->data;
+ if (accel->accelerator_key == kev->keyval &&
+ accel->accelerator_mods == kev->state) {
compose_send_cb(compose, 0, NULL);
+ return TRUE;
+ }
+
+ return FALSE;
}
#if USE_PSPELL
+static void compose_check_all(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_all(compose->gtkpspell);
+}
+
+static void compose_highlight_all(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_highlight_all(compose->gtkpspell);
+}
+
static void compose_check_backwards(Compose *compose)
{
if (compose->gtkpspell)
}
}
#endif
+
+static void set_toolbar_style(Compose *compose)
+{
+ switch (prefs_common.toolbar_style) {
+ case TOOLBAR_NONE:
+ gtk_widget_hide(compose->handlebox);
+ break;
+ case TOOLBAR_ICON:
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ GTK_TOOLBAR_ICONS);
+ break;
+ case TOOLBAR_TEXT:
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ GTK_TOOLBAR_TEXT);
+ break;
+ case TOOLBAR_BOTH:
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ GTK_TOOLBAR_BOTH);
+ break;
+ }
+
+ if (prefs_common.toolbar_style != TOOLBAR_NONE) {
+ gtk_widget_show(compose->handlebox);
+ gtk_widget_queue_resize(compose->handlebox);
+ }
+}
projects / claws.git / blobdiff