#include "folder.h"
#include "addr_compl.h"
#include "quote_fmt.h"
-#include "template.h"
#include "undo.h"
#include "foldersel.h"
#include "toolbar.h"
#include "inc.h"
+#include "message_search.h"
+
enum
{
COL_MIMETYPE = 0,
void compose_remove_draft (Compose *compose);
static gint compose_queue (Compose *compose,
gint *msgnum,
- FolderItem **item);
+ FolderItem **item,
+ gchar **msgpath);
static gint compose_queue_sub (Compose *compose,
gint *msgnum,
FolderItem **item,
+ gchar **msgpath,
gboolean check_subject);
static void compose_add_attachments (Compose *compose,
MimeInfo *parent);
static void compose_wrap_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_find_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void compose_toggle_autowrap_cb (gpointer data,
guint action,
GtkWidget *widget);
{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",
+ "<shift><control>B",
compose_advanced_action_cb,
COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Move a character forward"),
- "<control>F",
+ "<shift><control>F",
compose_advanced_action_cb,
COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
NULL},
COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/_Find"),
+ "<control>F", compose_find_cb, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Wrap current paragraph"),
"<control>L", compose_wrap_cb, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+ if (compose->toolbar->sig_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+ if (compose->toolbar->exteditor_btn)
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+ if (compose->toolbar->linewrap_current_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+ if (compose->toolbar->linewrap_all_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
compose->modified = FALSE;
compose_set_title(compose);
gchar *size_text;
GtkListStore *store;
gchar *name;
+ gboolean has_binary = FALSE;
if (!is_file_exist(file)) {
g_warning("File %s doesn't exist\n", filename);
MsgInfo *msginfo;
MsgFlags flags = {0, 0};
- if (procmime_get_encoding_for_text_file(file) == ENC_7BIT)
+ if (procmime_get_encoding_for_text_file(file, &has_binary) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
else
ainfo->encoding = ENC_8BIT;
procmsg_msginfo_free(msginfo);
} else {
if (!g_ascii_strncasecmp(content_type, "text", 4))
- ainfo->encoding = procmime_get_encoding_for_text_file(file);
+ ainfo->encoding = procmime_get_encoding_for_text_file(file, &has_binary);
else
ainfo->encoding = ENC_BASE64;
name = g_path_get_basename(filename ? filename : file);
ainfo->encoding = ENC_BASE64;
} else if (!g_ascii_strncasecmp(ainfo->content_type, "text", 4))
ainfo->encoding =
- procmime_get_encoding_for_text_file(file);
+ procmime_get_encoding_for_text_file(file, &has_binary);
else
ainfo->encoding = ENC_BASE64;
name = g_path_get_basename(filename ? filename : file);
g_free(name);
}
- if (!strcmp(ainfo->content_type, "unknown")) {
+ if (!strcmp(ainfo->content_type, "unknown") || has_binary) {
g_free(ainfo->content_type);
ainfo->content_type = g_strdup("application/octet-stream");
}
gint startq_offset = -1, noq_offset = -1;
gint uri_start = -1, uri_stop = -1;
gint nouri_start = -1, nouri_stop = -1;
+ gint num_blocks = 0;
compose->autowrap = FALSE;
gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
gint walk_pos;
- if (!prev_autowrap)
+ if (!prev_autowrap && num_blocks == 0) {
+ num_blocks++;
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
compose);
-
+ }
if (gtk_text_iter_has_tag(&iter, compose->no_wrap_tag) && !force)
goto colorize;
}
colorize:
- if (!prev_autowrap)
+ if (!prev_autowrap && num_blocks > 0) {
+ num_blocks--;
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
compose);
+ }
end_of_line = iter;
while (!gtk_text_iter_ends_line(&end_of_line)) {
gtk_text_iter_forward_char(&end_of_line);
gint msgnum;
FolderItem *folder;
gint val = -1;
- gchar *msgpath;
+ gchar *msgpath = NULL;
compose_allow_user_actions (compose, FALSE);
compose->sending = TRUE;
if (compose_check_entries(compose, TRUE) == FALSE)
goto bail;
- val = compose_queue(compose, &msgnum, &folder);
+ val = compose_queue(compose, &msgnum, &folder, &msgpath);
if (val) {
if (val == -4) {
return 0;
}
- msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath);
- g_free(msgpath);
-
+ if (msgpath == NULL) {
+ msgpath = folder_item_fetch_msg(folder, msgnum);
+ val = procmsg_send_message_queue(msgpath);
+ g_free(msgpath);
+ } else {
+ val = procmsg_send_message_queue(msgpath);
+ g_unlink(msgpath);
+ g_free(msgpath);
+ }
if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
compose->sending = FALSE;
compose_allow_user_actions (compose, TRUE);
}
-static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath)
{
- return compose_queue_sub (compose, msgnum, item, FALSE);
+ return compose_queue_sub (compose, msgnum, item, msgpath, FALSE);
}
-static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath, gboolean check_subject)
{
FolderItem *queue;
gchar *tmp;
return -1;
}
folder_item_scan(queue);
- if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
+ if ((num = folder_item_add_msg(queue, tmp, NULL, FALSE)) < 0) {
g_warning("can't queue the message\n");
g_unlink(tmp);
g_free(tmp);
return -1;
}
- g_unlink(tmp);
- g_free(tmp);
+
+ if (msgpath == NULL) {
+ g_unlink(tmp);
+ g_free(tmp);
+ } else
+ *msgpath = tmp;
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose, FALSE);
gtk_widget_show(notebook);
/* header labels and entries */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_header(compose),
+ gtk_label_new_with_mnemonic(_("Hea_der")));
/* attachment list */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_attach(compose),
+ gtk_label_new_with_mnemonic(_("_Attachments")));
/* Others Tab */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_others(compose),
+ gtk_label_new_with_mnemonic(_("Othe_rs")));
/* Subject */
subject_hbox = gtk_hbox_new(FALSE, 0);
conv_get_locale_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
+ prefs_common.recheck_when_changing_dict,
prefs_common.use_alternate,
GTK_TEXT_VIEW(text),
GTK_WINDOW(compose->window));
gint cursor_pos = 0;
if (!tmpl) return;
+ /* process the body */
+
text = GTK_TEXT_VIEW(compose->text);
buffer = gtk_text_view_get_buffer(text);
- if (tmpl->subject && *tmpl->subject != '\0')
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
- tmpl->subject);
- if (tmpl->to && *tmpl->to != '\0')
- compose_entry_append(compose, tmpl->to, COMPOSE_TO);
- if (tmpl->cc && *tmpl->cc != '\0')
- compose_entry_append(compose, tmpl->cc, COMPOSE_CC);
-
- if (tmpl->bcc && *tmpl->bcc != '\0')
- compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
-
if (replace)
gtk_text_buffer_set_text(buffer, "", -1);
gtk_text_buffer_place_cursor(buffer, &iter);
}
+ /* process the other fields */
+ compose_template_apply_fields(compose, tmpl);
+
compose_changed_cb(NULL, compose);
}
+void compose_template_apply_fields(Compose *compose, Template *tmpl)
+{
+ static MsgInfo dummyinfo;
+ MsgInfo *msginfo = NULL;
+ gchar *buf = NULL;
+
+ if (compose->replyinfo != NULL)
+ msginfo = compose->replyinfo;
+ else if (compose->fwdinfo != NULL)
+ msginfo = compose->fwdinfo;
+ else
+ msginfo = &dummyinfo;
+
+ if (tmpl->to && *tmpl->to != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->to);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message To format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_TO);
+ }
+ }
+
+ if (tmpl->cc && *tmpl->cc != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->cc);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message Cc format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_CC);
+ }
+ }
+
+ if (tmpl->bcc && *tmpl->bcc != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->bcc);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message Bcc format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_BCC);
+ }
+ }
+
+ /* process the subject */
+ if (tmpl->subject && *tmpl->subject != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->subject);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message subject format error."));
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
+ }
+ }
+}
+
static void compose_destroy(Compose *compose)
{
compose_list = g_list_remove(compose_list, compose);
gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->draft_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->insert_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
+ if (compose->toolbar->sig_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, ensitive);
+ if (compose->toolbar->exteditor_btn)
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+ if (compose->toolbar->linewrap_current_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+ if (compose->toolbar->linewrap_all_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
#endif /* G_OS_UNIX */
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue_sub(compose, NULL, NULL, TRUE);
+ val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
if (!val)
compose_close(compose);
else if (val == -2) {
compose_beautify_paragraph(compose, NULL, TRUE);
}
+static void compose_find_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+
+ message_search_compose(compose);
+}
+
static void compose_toggle_autowrap_cb(gpointer data, guint action,
GtkWidget *widget)
{
if (gdk_atom_name(data->type) &&
!strcmp(gdk_atom_name(data->type), "text/uri-list")
- && gtk_drag_get_source_widget(context) == NULL) {
+ && gtk_drag_get_source_widget(context) !=
+ mainwindow_get_mainwindow()->summaryview->ctree) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next)
compose_attach_append
g_free(body);
}
+void compose_set_position(Compose *compose, gint pos)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ gtkut_text_view_set_position(text, pos);
+}
+
+gboolean compose_search_string(Compose *compose,
+ const gchar *str, gboolean case_sens)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ return gtkut_text_view_search_string(text, str, case_sens);
+}
+
+gboolean compose_search_string_backward(Compose *compose,
+ const gchar *str, gboolean case_sens)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ return gtkut_text_view_search_string_backward(text, str, case_sens);
+}
+
/*
* End of Source.
*/
projects / claws.git / blobdiff