/*
* 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 <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
/* #include <sys/utsname.h> */
# include <wctype.h>
#endif
-
-#include "gtkstext.h"
-
#include "intl.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
+#include "gtkstext.h"
#include "addressbook.h"
#include "folderview.h"
#include "procmsg.h"
#include "menu.h"
+#include "stock_pixmap.h"
#include "send.h"
#include "imap.h"
#include "news.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 GList *compose_list = NULL;
-static void compose_set_undo (UndoMain *undostruct,
- gint undo_state,
- gint redo_state,
- GtkWidget *changewidget);
Compose *compose_generic_new (PrefsAccount *account,
const gchar *to,
FolderItem *item);
static void compose_set_ext_editor_sensitive (Compose *compose,
gboolean sensitive);
+static void compose_undo_state_changed (UndoMain *undostruct,
+ gint undo_state,
+ gint redo_state,
+ gpointer data);
+
static gint calc_cursor_xpos (GtkSText *text,
gint extra,
gint char_width);
static void compose_destroy_cb (GtkWidget *widget,
Compose *compose);
-static void compose_undo_cb (Compose *compose);
-static void compose_redo_cb (Compose *compose);
+static void compose_undo_cb (Compose *compose);
+static void compose_redo_cb (Compose *compose);
static void compose_cut_cb (Compose *compose);
static void compose_copy_cb (Compose *compose);
static void compose_paste_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
+static void compose_gtk_stext_action_cb (Compose *compose,
+ ComposeCallGtkSTextAction action);
+
static void compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
+static void compose_show_first_last_header (Compose *compose, gboolean show_first);
+
+
+#if USE_PSPELL
+static void compose_check_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_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
{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"), "<alt>W", compose_close_cb, 0, NULL},
-
- {N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Edit/_Undo"), "<control>Z", compose_undo_cb, 0, NULL},
- {N_("/_Edit/_Redo"), "<control>Y", compose_redo_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/Cu_t"), "<control>X", compose_cut_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/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Wrap current paragraph"), "<alt>L", compose_wrap_line, 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/_Redo"), "<control>Y", compose_redo_cb, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/Cu_t"), "<control>X", compose_cut_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"),
+ 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"),
+ "<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 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>"},
+ {N_("/_Edit/_Wrap current paragraph"),
+ "<control>L", compose_wrap_line, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
-
"<shift><alt>L", compose_wrap_line_all, 0, NULL},
+
"<control><alt>L", compose_wrap_line_all, 0, NULL},
{N_("/_Edit/Edit with e_xternal editor"),
- "<alt>X", compose_ext_editor_cb, 0, NULL},
-
+ "<control>X", compose_ext_editor_cb, 0, NULL},
+#if USE_PSPELL
+ {N_("/_Spelling"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Spelling/Check all or selection"),NULL, compose_check_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_("/_View/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
+ {N_("/_View/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
+ {N_("/_View/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/R_uler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Attachment"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
+#endif
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
compose_send_later_cb, 0, NULL},
{N_("/_Message/Save to _draft folder"),
"<alt>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/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
{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"), "<alt>A", compose_address_cb , 0, NULL},
+ {N_("/_Tool/_Address book"), "<control><alt>A", compose_address_cb , 0, NULL},
{N_("/_Tool/_Template"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
}
}
- gtk_widget_grab_focus(compose->subject_entry);
+ compose_show_first_last_header(compose, TRUE);
+
+ /* Set save folder */
+ if(item && item->prefs && item->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+ folderidentifier = folder_item_get_identifier(item);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
+ gtk_widget_grab_focus(compose->header_last->entry);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
/* select the account for the whole folder (IMAP / NNTP) */
if (!account)
+ /* FIXME: this is not right, because folder may be nested. we should
+ * ascend the tree until we find a parent with proper account
+ * information */
account = msginfo->folder->folder->account;
/* select account by to: and cc: header if enabled */
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
}
+ /* Set save folder */
+ if(msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+ folderidentifier = folder_item_get_identifier(msginfo->folder);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
followup_and_reply_to);
+ compose_show_first_last_header(compose, TRUE);
text = GTK_STEXT(compose->text);
gtk_stext_freeze(text);
#if USE_GPGME
for (;;) {
if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- mimeinfo = procmime_scan_mime_header(fp);
+ mimeinfo = procmime_scan_mime_header(fp, MIME_TEXT);
if (!mimeinfo) break;
if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
}
#else /* !USE_GPGME */
if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- mimeinfo = procmime_scan_mime_header(fp);
+ mimeinfo = procmime_scan_mime_header(fp, MIME_TEXT);
#endif /* USE_GPGME */
fclose(fp);
prev_fpos = fpos;
- partinfo = procmime_scan_mime_header(fp);
+ partinfo = procmime_scan_mime_header(fp, MIME_TEXT);
if (!partinfo) break;
if (npart != 0)
void compose_reedit(MsgInfo *msginfo)
{
Compose *compose;
- PrefsAccount *account;
+ PrefsAccount *account = NULL;
GtkSText *text;
FILE *fp;
gchar buf[BUFFSIZE];
g_return_if_fail(msginfo->folder != NULL);
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);
+ gchar queueheader_buf[BUFFSIZE];
+ gint id;
+
+ /* Select Account from queue headers */
+ if (!get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "NAID:")) {
+ id = atoi(&queueheader_buf[5]);
+ account = account_find_from_id(id);
+ }
+ if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "MAID:")) {
+ id = atoi(&queueheader_buf[5]);
+ account = account_find_from_id(id);
+ }
+ if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "S:")) {
+ account = account_find_from_address(queueheader_buf);
}
} else
account = msginfo->folder->folder->account;
compose = compose_create(account, COMPOSE_REEDIT);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
+ if (msginfo->folder->stype == F_QUEUE) {
+ gchar queueheader_buf[BUFFSIZE];
+
+ /* Set message save folder */
+ if (!get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "SCF:")) {
+ gint startpos = 0;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+ 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 (compose_parse_header(compose, msginfo) < 0) return;
compose_reedit_set_entry(compose, msginfo);
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');
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
+ compose_show_first_last_header(compose, TRUE);
+
#if 0 /* NEW COMPOSE GUI */
if (compose->bcc) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Reply to");
+ (ifactory, "/View/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
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);
}
gtk_stext_freeze(text);
while (fgets(buf, sizeof(buf), fp) != NULL) {
- /* Strip <CR> if DOS/Windoze file, replace <CR> with <LF> if MAC file */
+ /* strip <CR> if DOS/Windows file,
+ replace <CR> with <LF> if Macintosh file. */
+ strcrchomp(buf);
len = strlen(buf);
- if (len > 1 && buf[len - 2] == '\r' && buf[len - 1] == '\n') {
- buf[len - 2] = '\n';
- buf[len - 1] = '\0';
- } else {
- while (--len > 0)
- if (buf[len] == '\r')
- buf[len] = '\n';
+ if (len > 0 && buf[len - 1] != '\n') {
+ while (--len >= 0)
+ if (buf[len] == '\r') buf[len] = '\n';
}
-
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
}
gtk_stext_thaw(text);
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item(ifactory,
- "/Message/Attach");
+ "/View/Attachment");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
#define GET_CHAR(pos, buf, len) \
{ \
if (text->use_wchar) \
- len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
+ len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
else { \
buf[0] = GTK_STEXT_INDEX(text, (pos)); \
len = 1; \
gint line_pos, cur_pos;
gint line_len, cur_len;
-
gtk_stext_freeze(text);
text_len = gtk_stext_get_length(text);
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];
/* mark position of new line - needed for quotation wrap */
if (is_new_line) {
if (linewrap_quote) {
- qlen = gtkut_text_str_compare
+ qlen = gtkut_stext_str_compare
(text, cur_pos, tlen, qfmt);
if (qlen)
i_len = get_indent_length
/* if it's just quotation + newline skip it */
if (i_len && (cur_pos + 1 < tlen)) {
/* check if text at new line matches indent */
- ilen = gtkut_text_str_compare_n
+ ilen = gtkut_stext_str_compare_n
(text, cur_pos + 1, p_pos, i_len, tlen);
if (cur_pos + ilen < tlen) {
GET_CHAR(cur_pos + ilen + 1, cb, clen);
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);
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
- ilen = gtkut_text_str_compare_n
+ ilen = gtkut_stext_str_compare_n
(text, cur_pos, p_pos, i_len,
tlen);
if (ilen) {
- gtk_stext_forward_delete(text,
- ilen);
+ gtk_stext_forward_delete
+ (text, ilen);
tlen -= ilen;
}
} else if (qlen) {
- if (gtkut_text_str_compare
+ if (gtkut_stext_str_compare
(text, cur_pos, tlen, qfmt)) {
gtk_stext_forward_delete
(text, qlen);
((clen > 1) || isalnum(cb[0]))) {
gtk_stext_insert(text, NULL, NULL,
NULL, " ", 1);
- /* gtk_text_compact_buffer(text); */
+ /* gtk_stext_compact_buffer(text); */
tlen++;
}
dump_text(text, line_pos, tlen, 1);
#endif
/* force wrapping if it is one long word but not URL */
- if (p_pos + i_len == line_pos)
- if (!gtkut_text_is_uri_string
+ if (line_pos - p_pos <= i_len)
+ if (!gtkut_stext_is_uri_string
(text, line_pos, tlen))
line_pos = cur_pos - 1;
#ifdef WRAP_DEBUG
/* if next character is space delete it */
if (clen == 1 && isspace(*cbuf)) {
if (p_pos + i_len != line_pos ||
- !gtkut_text_is_uri_string
+ !gtkut_stext_is_uri_string
(text, line_pos, tlen)) {
gtk_stext_set_point(text, line_pos);
gtk_stext_backward_delete(text, 1);
/* if it is URL at beginning of line don't wrap */
if (p_pos + i_len == line_pos &&
- gtkut_text_is_uri_string(text, line_pos, tlen)) {
+ gtkut_stext_is_uri_string(text, line_pos, tlen)) {
#ifdef WRAP_DEBUG
printf("found URL at ");
dump_text(text, line_pos, tlen, 1);
/* should we insert quotation ? */
if (linewrap_quote && qlen) {
/* only if line is not already quoted */
- if (!gtkut_text_str_compare
+ if (!gtkut_stext_str_compare
(text, line_pos, tlen, qfmt)) {
guint ins_len;
gtk_stext_thaw(text);
}
+
#undef GET_CHAR
static void compose_set_title(Compose *compose)
return -1;
}
+
+#ifdef USE_GPGME
+/*
+ * interfaces to rfc2015 to keep out the prefs stuff there.
+ * returns 0 on success and -1 on error. */
+static int compose_create_signers_list (Compose *compose, GSList **pkey_list)
+{
+ const char *keyid = NULL;
+ GSList *key_list;
+
+ switch (compose->account->sign_key) {
+ case SIGN_KEY_DEFAULT:
+ *pkey_list = NULL;
+ return 0; /* nothing to do */
+
+ case SIGN_KEY_BY_FROM:
+ keyid = compose->account->address;
+ break;
+
+ case SIGN_KEY_CUSTOM:
+ keyid = compose->account->sign_key_id;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ key_list = rfc2015_create_signers_list(keyid);
+
+ if (!key_list) {
+ alertpanel_error("Could not find any key associated with currently "
+ "selected keyid `%s'!", keyid);
+ return -1;
+ }
+
+ *pkey_list = key_list;
+ return 0;
+}
+#endif /* USE_GPGME */
+
static gint compose_write_to_file(Compose *compose, const gchar *file,
gboolean is_draft)
{
#if USE_GPGME
if (compose->use_signing) {
- if (rfc2015_sign(file, compose->account) < 0) {
+ GSList *key_list;
+
+ if (compose_create_signers_list(compose, &key_list) == -1 ||
+ rfc2015_sign(file, key_list) < 0) {
+
unlink(file);
return -1;
}
}
if (compose->use_encryption) {
- if (rfc2015_encrypt(file, compose->to_list) < 0) {
+ if (rfc2015_encrypt(file, compose->to_list, compose->account->ascii_armored) < 0) {
unlink(file);
return -1;
}
g_free(addr);
}
-
static void compose_add_entry_field(GtkWidget *table, GtkWidget **hbox,
GtkWidget **entry, gint *count,
const gchar *label_str,
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(text_activated), compose);
address_completion_register_entry(GTK_ENTRY(entry));
static GtkWidget *compose_create_header(Compose *compose)
{
GtkWidget *label;
+ GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
#if 0 /* NEW COMPOSE GUI */
GtkWidget *to_entry;
#endif
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
- GtkWidget *subject_entry;
#if 0 /* NEW COMPOSE GUI */
GtkWidget *cc_entry;
GtkWidget *cc_hbox;
GtkWidget *followup_entry;
GtkWidget *followup_hbox;
#endif
- GtkWidget *hbox;
gint count = 0;
gtk_widget_show(header_table);
gtk_container_set_border_width(GTK_CONTAINER(header_table), 2);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
count = 0;
/* option menu for selecting accounts */
#endif
count++;
- /* Subject */
- compose_add_entry_field(header_table, &hbox, &subject_entry, &count,
- "Subject:", FALSE);
-
compose->header_table = header_table;
compose->header_list = NULL;
compose->header_nextrow = count;
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;
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);
+ if(folder_get_default_outbox()) {
+ 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);
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);
+ if(folder_get_default_outbox()) {
+ 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);
GtkWidget *vbox2;
- GtkWidget *table_vbox;
-
+ GtkWidget *label;
+ GtkWidget *subject_hbox;
+ GtkWidget *subject_frame;
+ GtkWidget *subject_entry;
+ GtkWidget *subject;
GtkWidget *paned;
GtkWidget *edit_vbox;
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_set_usize(notebook, -1, 130);
gtk_widget_show(notebook);
/* header labels and entries */
/* Others Tab */
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
+ /* Subject */
+ subject_hbox = gtk_hbox_new(FALSE, 0);
+ 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_widget_show(subject_frame);
+
+ subject = gtk_hbox_new(FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(subject), BORDER_WIDTH);
+ gtk_widget_show(subject);
+
+ label = gtk_label_new(_("Subject:"));
+ gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 4);
+ gtk_widget_show(label);
+
+ 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(text_activated), compose);
+ gtk_widget_show(subject_entry);
+ compose->subject_entry = subject_entry;
+ gtk_container_add(GTK_CONTAINER(subject_frame), subject);
+
edit_vbox = gtk_vbox_new(FALSE, 0);
#if 0 /* NEW COMPOSE GUI */
gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
#endif
+ gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
+
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
gtk_stext_set_editable(GTK_STEXT(text), TRUE);
if (prefs_common.block_cursor) {
- GTK_STEXT(text)->cursor_type = STEXT_CURSOR_BLOCK;
+ GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
}
if (prefs_common.smart_wrapping) {
GTK_SIGNAL_FUNC(compose_changed_cb), compose);
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(text_activated), compose);
gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
GTK_SIGNAL_FUNC(compose_button_press_cb),
- compose);
+ edit_vbox);
#if 0
gtk_signal_connect_after(GTK_OBJECT(text), "key_press_event",
GTK_SIGNAL_FUNC(compose_key_press_cb),
gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
compose);
-#if USE_PSPELL
- if (prefs_common.enable_pspell) {
- gtkpspell = gtkpspell_new_with_config(gtkpspellconfig,
- prefs_common.pspell_path,
- prefs_common.dictionary,
- PSPELL_FASTMODE,
- conv_get_current_charset_str());
- if (gtkpspell == NULL)
- prefs_common.enable_pspell = FALSE;
- else
- gtkpspell_attach(gtkpspell, GTK_STEXT(text));
- }
-#endif
gtk_widget_show_all(vbox);
/* pane between attach clist and text */
paned = gtk_vpaned_new();
+ gtk_paned_set_gutter_size(GTK_PANED(paned), 12);
+ gtk_paned_set_handle_size(GTK_PANED(paned), 12);
gtk_container_add(GTK_CONTAINER(vbox2), paned);
gtk_paned_add1(GTK_PANED(paned), notebook);
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
style = gtk_widget_get_style(text);
- /* workaround for the slow down of GtkText when using Pixmap theme */
+ /* workaround for the slow down of GtkSText when using Pixmap theme */
if (style->engine) {
GtkThemeEngine *engine;
tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tool/Template");
#if 0 /* NEW COMPOSE GUI */
+ gtk_widget_hide(bcc_hbox);
+ gtk_widget_hide(bcc_entry);
+ gtk_widget_hide(reply_hbox);
+ gtk_widget_hide(reply_entry);
+ gtk_widget_hide(followup_hbox);
+ gtk_widget_hide(followup_entry);
+ gtk_widget_hide(ruler_hbox);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
+
if (account->protocol == A_NNTP) {
gtk_widget_hide(to_hbox);
gtk_widget_hide(to_entry);
gtk_widget_hide(newsgroups_hbox);
gtk_widget_hide(newsgroups_entry);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
-
- menu_set_sensitive(ifactory, "/Message/Followup to", FALSE);
+ menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
#endif
break;
}
+ undostruct = undo_init(text);
+ undo_set_change_state_func(undostruct, &compose_undo_state_changed,
+ menubar);
+
gtk_widget_show(window);
address_completion_start(window);
compose->vbox2 = vbox2;
- compose->table_vbox = table_vbox;
-
compose->paned = paned;
compose->edit_vbox = edit_vbox;
compose->exteditor_tag = -1;
compose->bounce_filename = NULL;
+ compose->undostruct = undostruct;
+#if USE_PSPELL
+
+ 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.check_while_typing,
+ GTK_STEXT(text));
+ if (!gtkpspell) {
+ alertpanel_error(_("Spell checker could not be started.\n%s"), gtkpspellcheckers->error_message);
+ gtkpspell_checkers_reset();
+ } else {
+
+ GtkWidget *menuitem;
+
+ gtkpspell_set_sug_mode(gtkpspell, prefs_common.pspell_sugmode);
+ menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
+ gtkpspell_populate_submenu(gtkpspell, menuitem);
+ menu_set_sensitive(ifactory, "/Spelling", TRUE);
+ }
+ }
+#endif
compose_set_title(compose);
compose->gtkpspell = gtkpspell;
#endif
- undostruct = undo_init(text);
-
- compose->undostruct = undostruct;
- undo_set_undo_change_funct(undostruct, &compose_set_undo, GTK_WIDGET(compose->menubar));
-
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP) {
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
#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");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
#endif
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");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
if (account->auto_bcc && mode != COMPOSE_REEDIT)
#if 0 /* NEW COMPOSE GUI */
compose->use_replyto = TRUE;
menuitem = gtk_item_factory_get_item(ifactory,
- "/Message/Reply to");
+ "/View/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_entry_set_text(GTK_ENTRY(reply_entry),
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 0 /* NEW COMPOSE GUI */
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_ruler);
+#endif
#if USE_GPGME
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.default_sign);
+ account->default_sign);
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.default_encrypt);
+ account->default_encrypt);
#endif /* USE_GPGME */
addressbook_set_target_compose(compose);
return compose;
}
-#include "pixmaps/stock_mail_send.xpm"
-#include "pixmaps/stock_mail_send_queue.xpm"
-#include "pixmaps/stock_mail.xpm"
-#include "pixmaps/stock_paste.xpm"
-#include "pixmaps/stock_mail_attach.xpm"
-#include "pixmaps/stock_mail_compose.xpm"
-#include "pixmaps/linewrap.xpm"
-#include "pixmaps/tb_address_book.xpm"
-
-#define CREATE_TOOLBAR_ICON(xpm_d) \
-{ \
- icon = gdk_pixmap_create_from_xpm_d(container->window, &mask, \
- &container->style->white, \
- xpm_d); \
- icon_wid = gtk_pixmap_new(icon, mask); \
-}
-
static void compose_toolbar_create(Compose *compose, GtkWidget *container)
{
GtkWidget *toolbar;
- GdkPixmap *icon;
- GdkBitmap *mask;
GtkWidget *icon_wid;
GtkWidget *send_btn;
GtkWidget *sendl_btn;
gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_SPACE_LINE);
- CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send"),
_("Send message"),
"Send",
icon_wid, toolbar_send_cb, compose);
- CREATE_TOOLBAR_ICON(stock_mail_send_queue_xpm);
- /* CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm); */
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE);
sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send later"),
_("Put into queue folder and send later"),
icon_wid, toolbar_send_later_cb,
compose);
- CREATE_TOOLBAR_ICON(stock_mail_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Draft"),
_("Save to draft folder"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_paste_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PASTE);
insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Insert"),
_("Insert file"),
icon_wid, toolbar_insert_cb,
compose);
- CREATE_TOOLBAR_ICON(stock_mail_attach_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Attach"),
_("Attach file"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Signature"),
_("Insert signature"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Editor"),
_("Edit with external editor"),
toolbar_ext_editor_cb,
compose);
- CREATE_TOOLBAR_ICON(linewrap_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_LINEWRAP);
linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Linewrap"),
- _("Wrap current paragraph"),
+ _("Wrap all long lines"),
"Linewrap",
icon_wid,
toolbar_linewrap_cb,
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(tb_address_book_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Address"),
_("Address book"),
gtk_widget_show_all(toolbar);
}
-#undef CREATE_TOOLBAR_ICON
-
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
if (!tmpl || !tmpl->value) return;
gtk_stext_freeze(GTK_STEXT(compose->text));
-
- if (tmpl->subject)
+
+ if (tmpl->subject && *tmpl->subject != '\0')
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
tmpl->subject);
- if (tmpl->to)
+ 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;
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
+#if USE_PSPELL
+ if (compose->gtkpspell) {
+ gtkpspell_delete(compose->gtkpspell);
+ }
+#endif
+
prefs_common.compose_width = compose->scrolledwin->allocation.width;
prefs_common.compose_height = compose->window->allocation.height;
GtkWidget *menuitem;
cancelled = FALSE;
- gtk_main();
+ gtk_main();
if (cancelled == TRUE) {
gtk_widget_hide(attach_prop.window);
gtk_widget_set_sensitive(compose->linewrap_btn, sensitive);
}
+/**
+ * compose_undo_state_changed:
+ *
+ * Change the sensivity of the menuentries undo and redo
+ **/
+static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
+ gint redo_state, gpointer data)
+{
+ GtkWidget *widget = GTK_WIDGET(data);
+ GtkItemFactory *ifactory;
+
+ g_return_if_fail(widget != NULL);
+
+ debug_print("Set_undo. UNDO:%i REDO:%i\n", undo_state, redo_state);
+
+ ifactory = gtk_item_factory_from_widget(widget);
+
+ switch (undo_state) {
+ case UNDO_STATE_TRUE:
+ if (!undostruct->undo_state) {
+ debug_print ("Set_undo - Testpoint\n");
+ undostruct->undo_state = TRUE;
+ menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
+ }
+ break;
+ case UNDO_STATE_FALSE:
+ if (undostruct->undo_state) {
+ undostruct->undo_state = FALSE;
+ menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
+ }
+ break;
+ case UNDO_STATE_UNCHANGED:
+ break;
+ case UNDO_STATE_REFRESH:
+ menu_set_sensitive(ifactory, "/Edit/Undo",
+ undostruct->undo_state);
+ break;
+ default:
+ g_warning("Undo state not recognized");
+ break;
+ }
+
+ switch (redo_state) {
+ case UNDO_STATE_TRUE:
+ if (!undostruct->redo_state) {
+ undostruct->redo_state = TRUE;
+ menu_set_sensitive(ifactory, "/Edit/Redo", TRUE);
+ }
+ break;
+ case UNDO_STATE_FALSE:
+ if (undostruct->redo_state) {
+ undostruct->redo_state = FALSE;
+ menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
+ }
+ break;
+ case UNDO_STATE_UNCHANGED:
+ break;
+ case UNDO_STATE_REFRESH:
+ menu_set_sensitive(ifactory, "/Edit/Redo",
+ undostruct->redo_state);
+ break;
+ default:
+ g_warning("Redo state not recognized");
+ break;
+ }
+}
+
static gint calc_cursor_xpos(GtkSText *text, gint extra, gint char_width)
{
gint cursor_pos;
gint val;
val = compose_send(compose);
+
if (val == 0) gtk_widget_destroy(compose->window);
}
Compose *compose = (Compose *)data;
FolderItem *draft;
gchar *tmp;
+ gint msgnum;
+ static gboolean lock = FALSE;
+
+ if (lock) return;
draft = folder_get_default_draft();
+ g_return_if_fail(draft != NULL);
- tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
+ lock = TRUE;
+
+ tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
G_DIR_SEPARATOR, (gint)compose);
if (compose_write_to_file(compose, tmp, TRUE) < 0) {
g_free(tmp);
+ lock = FALSE;
return;
}
folder_item_scan(draft);
- if (folder_item_add_msg(draft, tmp, TRUE) < 0) {
+ if ((msgnum = folder_item_add_msg(draft, tmp, TRUE)) <= 0) {
unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return;
}
g_free(tmp);
+ draft->mtime = 0; /* force updating */
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
folder_item_scan(draft);
folderview_update_item(draft, TRUE);
- gtk_widget_destroy(compose->window);
+ lock = FALSE;
+
+ /* 0: quit editing 1: keep editing */
+ if (action == 0)
+ gtk_widget_destroy(compose->window);
+ else {
+ struct stat s;
+ gchar *path;
+
+ path = folder_item_fetch_msg(draft, msgnum);
+ g_return_if_fail(path != NULL);
+ if (stat(path, &s) < 0) {
+ FILE_OP_ERROR(path, "stat");
+ g_free(path);
+ lock = FALSE;
+ return;
+ }
+ g_free(path);
+
+ procmsg_msginfo_free(compose->targetinfo);
+ compose->targetinfo = g_new0(MsgInfo, 1);
+ compose->targetinfo->msgnum = msgnum;
+ compose->targetinfo->size = s.st_size;
+ compose->targetinfo->mtime = s.st_mtime;
+ compose->targetinfo->folder = draft;
+ compose->mode = COMPOSE_REEDIT;
+ }
}
static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
return;
}
}
-#if USE_PSPELL
- if (compose->gtkpspell) {
- gtkpspell_detach(compose->gtkpspell);
- compose->gtkpspell = gtkpspell_delete(compose->gtkpspell);
- }
-#endif
gtk_widget_destroy(compose->window);
}
compose_destroy(compose);
}
-static void compose_undo_cb(Compose *compose)
+static void compose_undo_cb(Compose *compose)
{
undo_undo(compose->undostruct);
}
-static void compose_redo_cb(Compose *compose)
+static void compose_redo_cb(Compose *compose)
{
undo_redo(compose->undostruct);
}
(GTK_EDITABLE(compose->focused_editable), 0, -1);
}
+static void compose_move_beginning_of_line_cb(Compose *compose)
+{
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
+}
+
+static void compose_gtk_stext_action_cb(Compose *compose, ComposeCallGtkSTextAction action)
+{
+ if (!(compose->focused_editable && GTK_WIDGET_HAS_FOCUS(compose->focused_editable))) return;
+
+ switch (action) {
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE:
+ gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER:
+ gtk_stext_move_forward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER:
+ gtk_stext_move_backward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD:
+ gtk_stext_move_forward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD:
+ gtk_stext_move_backward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE:
+ gtk_stext_move_end_of_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE:
+ gtk_stext_move_next_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE:
+ gtk_stext_move_previous_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER:
+ gtk_stext_delete_forward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER:
+ gtk_stext_delete_backward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD:
+ gtk_stext_delete_forward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD:
+ gtk_stext_delete_backward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_LINE:
+ gtk_stext_delete_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N:
+ gtk_stext_delete_line(GTK_STEXT(compose->focused_editable));
+ gtk_stext_delete_forward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END:
+ gtk_stext_delete_to_line_end(GTK_STEXT(compose->focused_editable));
+ break;
+ default:
+ break;
+ }
+}
+
static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
{
if (GTK_IS_EDITABLE(widget))
g_slist_remove(headerentry->compose->header_list,
headerentry);
g_free(headerentry);
+ } else if (event->keyval == GDK_Tab) {
+ if (headerentry->compose->header_last == headerentry) {
+ /* Override default next focus, and give it to subject_entry
+ * instead of notebook tabs
+ */
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event");
+ gtk_widget_grab_focus(headerentry->compose->subject_entry);
+ }
}
+
}
void compose_headerentry_changed_cb(GtkWidget *entry,
(GTK_OBJECT(entry),
GTK_SIGNAL_FUNC(compose_headerentry_changed_cb),
headerentry);
+ /* Automatically scroll down */
+ compose_show_first_last_header(headerentry->compose, FALSE);
+
}
}
-/**
- * undo_set_undo:
- *
- * Change the sensivity of the menuentries undo and redo
- **/
-static void compose_set_undo(UndoMain *undostruct, gint undo_state,
- gint redo_state, GtkWidget *changewidget)
+static void compose_show_first_last_header(Compose *compose, gboolean show_first)
+{
+ GtkAdjustment *vadj;
+
+ g_return_if_fail(compose);
+ g_return_if_fail(GTK_IS_WIDGET(compose->header_table));
+ g_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
+
+ vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
+ gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
+}
+
+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;
- debug_print ("Set_undo. UNDO:%i REDO:%i\n",
- undo_state,
- redo_state);
+ GtkAccelEntry *accel;
+ GtkWidget *send_menu;
+ GSList *list;
- g_return_if_fail (changewidget != NULL);
+ ev = gtk_get_current_event();
+ if (ev->type != GDK_KEY_PRESS) return FALSE;
- ifactory = gtk_item_factory_from_widget(changewidget);
+ kev = (GdkEventKey *)ev;
+ if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
+ return FALSE;
- /* Set undo */
- switch (undo_state) {
- case UNDO_STATE_TRUE:
- if (!undostruct->undo_state) {
- debug_print ("Set_undo - Testpoint\n");
- undostruct->undo_state = TRUE;
- menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
- }
- break;
- case UNDO_STATE_FALSE:
- if (undostruct->undo_state) {
- undostruct->undo_state = FALSE;
- menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
- }
- break;
- case UNDO_STATE_UNCHANGED:
- break;
- case UNDO_STATE_REFRESH:
- menu_set_sensitive(ifactory, "/Edit/Undo", undostruct->undo_state);
- break;
- default:
- g_warning ("Undo state not recognized");
- break;
- }
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ 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;
+ }
- /* Set redo*/
- switch (redo_state) {
- case UNDO_STATE_TRUE:
- if (!undostruct->redo_state) {
- undostruct->redo_state = TRUE;
- menu_set_sensitive(ifactory, "/Edit/Redo", TRUE);
- }
- break;
- case UNDO_STATE_FALSE:
- if (undostruct->redo_state) {
- undostruct->redo_state = FALSE;
- menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
- }
- break;
- case UNDO_STATE_UNCHANGED:
- break;
- case UNDO_STATE_REFRESH:
- menu_set_sensitive(ifactory, "/Edit/Redo", undostruct->redo_state);
- break;
- default:
- g_warning ("Redo state not recognized");
- break;
- }
+ return FALSE;
}
+
+#if USE_PSPELL
+static void compose_check_all(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_all(compose->gtkpspell);
+}
+
+static void compose_check_backwards(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_backwards(compose->gtkpspell);
+ else {
+ GtkItemFactory *ifactory;
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ }
+}
+
+static void compose_check_forwards_go(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_forwards_go(compose->gtkpspell);
+ else {
+ GtkItemFactory *ifactory;
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ }
+}
+#endif
projects / claws.git / blobdiff