#include "template.h"
#include "undo.h"
#include "foldersel.h"
+#include "toolbar.h"
#if USE_GPGME
# include "rfc2015.h"
ComposeMode mode);
static void compose_toolbar_create (Compose *compose,
GtkWidget *container);
+static void compose_toolbar_update (Compose *compose);
+
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
static void compose_set_template_menu (Compose *compose);
gpointer data);
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_compose_buttons_cb (GtkWidget *widget,
+ ToolbarItem *t_item);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
if (mailto && *mailto != '\0') {
compose_entries_set(compose, mailto);
- } else if(item && item->prefs->enable_default_to) {
+ } else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
compose_entry_select(compose, item->prefs->default_to);
grab_focus_on_last = FALSE;
compose_show_first_last_header(compose, TRUE);
/* Set save folder */
- if(item && item->prefs && item->prefs->save_copy_to_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);
}
/* Grab focus on last header only if no default_to was set */
- if(grab_focus_on_last)
+ if (grab_focus_on_last)
gtk_widget_grab_focus(compose->header_last->entry);
if (prefs_common.auto_exteditor)
}
if (!account) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
}
/* Set save folder */
- if(msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_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);
account = account_find_from_address(to);
}
- if(!account && prefs_common.forward_account_autosel) {
+ if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
g_return_val_if_fail(msginfo != NULL, NULL);
- if(!account)
+ if (!account)
account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
- gtk_widget_set_sensitive(compose->insert_btn, FALSE);
- gtk_widget_set_sensitive(compose->attach_btn, FALSE);
- gtk_widget_set_sensitive(compose->sig_btn, FALSE);
- gtk_widget_set_sensitive(compose->exteditor_btn, FALSE);
- gtk_widget_set_sensitive(compose->linewrap_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_btn, FALSE);
return compose;
}
procmime_mimeinfo_free_all(mimeinfo);
return;
}
+
if (IS_FIRST_PART_TEXT(child))
child = child->next;
child = procmime_mimeinfo_next(child);
continue;
}
-
+ if(child->parent && child->parent->parent
+ && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
+ && child->mime_type == MIME_TEXT) {
+ /* this is the main text part of a signed message */
+ child = procmime_mimeinfo_next(child);
+ continue;
+ }
outfile = procmime_get_tmp_file_name(child);
if (procmime_get_part(outfile, infile, child) < 0)
g_warning(_("Can't get the part of multipart message."));
- else
+ else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
compose_attach_append
(compose, outfile,
child->filename ? child->filename : child->name,
compose->newsgroup_list = NULL;
/* search header entries for to and newsgroup entries */
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
g_strstrip(entry);
- if(entry[0] != '\0') {
- for(strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
- if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (entry[0] != '\0') {
+ for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
compose->to_list = address_list_append(compose->to_list, entry);
recipient_found = TRUE;
}
}
- for(strptr = recipient_headers_news; *strptr != NULL; strptr++) {
- if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
gint msgnum;
FolderItem *folder;
gint val;
+ gchar *msgpath;
if (compose_check_entries(compose, TRUE) == FALSE)
return -1;
return -1;
}
- val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
+ msgpath = folder_item_fetch_msg(folder, msgnum);
+ val = procmsg_send_message_queue(msgpath);
+ g_free(msgpath);
folder_item_remove_msg(folder, msgnum);
folderview_update_item(folder, TRUE);
to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(g_strcasecmp(headerentryname, cc_hdr) == 0
+ if (g_strcasecmp(headerentryname, cc_hdr) == 0
|| g_strcasecmp(headerentryname, to_hdr) == 0) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "Resent-To: ");
first_address = FALSE;
} else {
}
}
}
- /* if(!first_address) { */
+ /* if (!first_address) { */
fprintf(fp, "\n");
/* } */
out_codeset = CS_ISO_8859_1;
encoding = procmime_get_encoding_for_charset(out_codeset);
+#if USE_GPGME
+ if (!is_draft &&
+ compose->use_signing && !compose->account->clearsign &&
+ encoding == ENC_8BIT)
+ encoding = ENC_BASE64;
+#endif
+
src_codeset = conv_get_current_charset_str();
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
return -1;
}
- if(compose->to_list) {
+ if (compose->to_list) {
if (compose->account->protocol != A_NNTP)
mailac = compose->account;
else if (compose->orig_account->protocol != A_NNTP)
}
}
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
if (compose->account->protocol == A_NNTP)
newsac = compose->account;
- else if(!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
+ else if (!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
lock = FALSE;
alertpanel_error(_("No account for posting news available!"));
return -1;
fprintf(fp, "SSH:\n");
/* write recepient list */
fprintf(fp, "R:");
- if(compose->to_list) {
+ if (compose->to_list) {
fprintf(fp, "<%s>", (gchar *)compose->to_list->data);
for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",<%s>", (gchar *)cur->data);
fprintf(fp, "\n");
/* write newsgroup list */
fprintf(fp, "NG:");
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
fprintf(fp, "%s", (gchar *)compose->newsgroup_list->data);
for (cur = compose->newsgroup_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",%s", (gchar *)cur->data);
}
fprintf(fp, "\n");
/* Sylpheed account IDs */
- if(mailac) {
+ if (mailac) {
fprintf(fp, "MAID:%d\n", mailac->account_id);
}
- if(newsac) {
+ if (newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
/* Save copy folder */
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
g_free(savefolderid);
}
/* Message-ID of message replying to */
- if((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
gchar *folderid;
folderid = folder_item_get_identifier(compose->replyinfo->folder);
folderview_update_item(queue, TRUE);
- if((msgnum != NULL) && (item != NULL)) {
+ if ((msgnum != NULL) && (item != NULL)) {
*msgnum = num;
*item = queue;
}
trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(!g_strcasecmp(trans_hdr, headerentryname)) {
+ if (!g_strcasecmp(trans_hdr, headerentryname)) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen(header) + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "%s: ", header);
first_address = FALSE;
} else {
}
}
}
- if(!first_address) {
+ if (!first_address) {
fprintf(fp, "\n");
}
gchar *str;
gchar *name;
GSList *list;
- gchar * std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+ gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
/* struct utsname utsbuf; */
g_return_val_if_fail(compose->account->address != NULL, -1);
/* Save copy folder */
- if(is_draft) {
+ if (is_draft) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
/* get special headers */
for (list = compose->header_list; list; list = list->next) {
ComposeHeaderEntry *headerentry;
- gchar * tmp;
- gchar * headername;
- gchar * headername_wcolon;
- gchar * headername_trans;
- gchar * headervalue;
+ gchar *tmp;
+ gchar *headername;
+ gchar *headername_wcolon;
+ gchar *headername_trans;
+ gchar *headervalue;
gchar **string;
gboolean standard_header = FALSE;
headerentry = ((ComposeHeaderEntry *)list->data);
tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)));
- if (!strstr(tmp,":")) {
- headername_wcolon = g_strconcat(tmp,":",NULL);
+ if (!strstr(tmp, ":")) {
+ headername_wcolon = g_strconcat(tmp, ":", NULL);
headername = g_strdup(tmp);
} else {
headername_wcolon = g_strdup(tmp);
- headername = g_strdup(strtok(tmp,":"));
+ headername = g_strdup(strtok(tmp, ":"));
}
g_free(tmp);
headervalue = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
string = std_headers;
while (*string != NULL) {
- headername_trans = (prefs_common.trans_hdr ? gettext(*string) : *string);
+ headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
if (!strcmp(headername_trans,headername_wcolon))
standard_header = TRUE;
string++;
}
if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
- fprintf(fp,"%s %s\n",headername_wcolon, headervalue);
+ fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
g_free(headername);
g_free(headername_wcolon);
gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), TRUE);
gtk_widget_show(combo);
gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
- if(compose->header_last) {
+ if (compose->header_last) {
gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
string = headers;
while (*string != NULL) {
- if (!strcmp(*string,last_header_entry))
+ if (!strcmp(*string, last_header_entry))
standard_header = TRUE;
string++;
}
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);
- if(account_get_special_folder(compose->account, F_OUTBOX)) {
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
}
gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
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);
- if(account_get_special_folder(compose->account, F_OUTBOX)) {
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
folderidentifier = folder_item_get_identifier(account_get_special_folder
(compose->account, F_OUTBOX));
gtk_entry_set_text(GTK_ENTRY(savemsg_entry), folderidentifier);
return compose;
}
-static void compose_toolbar_create(Compose *compose, GtkWidget *container)
+static void toolbar_compose_buttons_cb(GtkWidget *widget,
+ ToolbarItem *t_item)
{
+ struct {
+ gint index;
+ void (*func)(GtkWidget *widget, gpointer data);
+ } compose_action[] = {
+ { A_SEND, toolbar_send_cb },
+ { A_SENDL, toolbar_send_later_cb },
+ { A_DRAFT, toolbar_draft_cb },
+ { A_INSERT, toolbar_insert_cb },
+ { A_ATTACH, toolbar_attach_cb },
+ { A_SIG, toolbar_sig_cb },
+ { A_EXTEDITOR, toolbar_ext_editor_cb },
+ { A_LINEWRAP, toolbar_linewrap_cb },
+ { A_ADDRBOOK, toolbar_address_cb },
+ { A_SYL_ACTIONS, toolbar_actions_execute_cb }};
+
+
+ gint num_items = sizeof(compose_action)/sizeof(compose_action[0]);
+ gint i;
+ debug_print("_buttons: index: %i \n", t_item->index);
+ for (i = 0; i < num_items; i++) {
+
+ if (compose_action[i].index == t_item->index) {
+ Compose *compose = (Compose*)t_item->parent;
+ debug_print("_buttons: compose: %p toolbar: %p\n", compose, compose->toolbar); compose_action[i].func(widget, compose);
+ break;
+ }
+ }
+}
+
+static void compose_toolbar_update(Compose *compose)
+{
+ gtk_container_remove(GTK_CONTAINER(compose->handlebox),
+ GTK_WIDGET(compose->toolbar->toolbar));
+
+ compose->toolbar->toolbar = NULL;
+ compose->toolbar->send_btn = NULL;
+ compose->toolbar->sendl_btn = NULL;
+ compose->toolbar->draft_btn = NULL;
+ compose->toolbar->insert_btn = NULL;
+ compose->toolbar->attach_btn = NULL;
+ compose->toolbar->sig_btn = NULL;
+ compose->toolbar->exteditor_btn = NULL;
+ compose->toolbar->linewrap_btn = NULL;
+ compose->toolbar->addrbook_btn = NULL;
+
+ TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
+ TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
+ compose_toolbar_create(compose, compose->handlebox);
+}
+
+static void compose_toolbar_create(Compose *compose,
+ GtkWidget *container)
+{
+ ToolbarItem *toolbar_item;
+
GtkWidget *toolbar;
- GtkWidget *icon_wid;
- GtkWidget *send_btn;
- GtkWidget *sendl_btn;
- GtkWidget *draft_btn;
- GtkWidget *insert_btn;
- GtkWidget *attach_btn;
- GtkWidget *sig_btn;
- GtkWidget *exteditor_btn;
- GtkWidget *linewrap_btn;
- GtkWidget *addrbook_btn;
+ GtkWidget *icon_wid = NULL;
+ GtkWidget *item;
+ GtkTooltips *toolbar_tips;
+ ToolbarSylpheedActions *t_action_item;
+ GSList *cur;
+ GSList *toolbar_list;
+ GList *elem;
+ toolbar_tips = gtk_tooltips_new();
+
+ toolbar_read_config_file(TOOLBAR_COMPOSE);
+ toolbar_list = toolbar_get_list(TOOLBAR_COMPOSE);
+ compose->toolbar = g_new0(ComposeToolbar, 1);
+
+ for (elem = compose_list; elem != NULL; elem = elem->next) {
+ Compose *c = (Compose*)elem->data;
+ debug_print("toolbar_create: compose: %p toolbar: %p\n",
+ c, c->toolbar);
+ }
+
toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_BOTH);
gtk_container_add(GTK_CONTAINER(container), toolbar);
gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_SPACE_LINE);
+
+ for (cur = toolbar_list; cur != NULL; cur = cur->next) {
- 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);
-
- 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"),
- "Send later",
- icon_wid, toolbar_send_later_cb,
- compose);
+ if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
+ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+ continue;
+ }
+
+ toolbar_item = g_new0(ToolbarItem, 1);
+ toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
+ toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
+ toolbar_item->index = ((ToolbarItem*)cur->data)->index;
+
+ toolbar_item->parent = (gpointer)compose;
+
+ /* collect toolbar items in list to keep track */
+ compose->toolbar->t_item_list = g_slist_append(compose->toolbar->t_item_list,
+ toolbar_item);
+
+ icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+ item = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ toolbar_item->text,
+ (""),
+ (""),
+ icon_wid, toolbar_compose_buttons_cb,
+ toolbar_item);
+
+ switch (toolbar_item->index) {
+ case A_SEND:
+ compose->toolbar->send_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->send_btn,
+ _("Send Message"), NULL);
+ break;
+ case A_SENDL:
+ compose->toolbar->sendl_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->sendl_btn,
+ _("Put into queue folder and send later"), NULL);
+ break;
+ case A_DRAFT:
+ compose->toolbar->draft_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->draft_btn,
+ _("Save to draft folder"), NULL);
+ break;
+ case A_INSERT:
+ compose->toolbar->insert_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->insert_btn,
+ _("Insert file"), NULL);
+ break;
+ case A_ATTACH:
+ compose->toolbar->attach_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->attach_btn,
+ _("Attach file"), NULL);
+ break;
+ case A_SIG:
+ compose->toolbar->sig_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->sig_btn,
+ _("Insert signature"), NULL);
+ break;
+ case A_EXTEDITOR:
+ compose->toolbar->exteditor_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->exteditor_btn,
+ _("Edit with external editor"), NULL);
+ break;
+ case A_LINEWRAP:
+ compose->toolbar->linewrap_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->linewrap_btn,
+ _("Wrap all long lines"), NULL);
+ break;
+ case A_ADDRBOOK:
+ compose->toolbar->addrbook_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->addrbook_btn,
+ _("Address book"), NULL);
+ break;
+ case A_SYL_ACTIONS:
+ t_action_item = g_new0(ToolbarSylpheedActions, 1);
+ t_action_item->widget = item;
+ t_action_item->name = g_strdup(toolbar_item->text);
+
+ compose->toolbar->t_action_list =
+ g_slist_append(compose->toolbar->t_action_list,
+ t_action_item);
+
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ item,
+ t_action_item->name, NULL);
+
+ gtk_widget_show(item);
+ break;
+ default:
+ break;
+ }
+ }
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
- draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Draft"),
- _("Save to draft folder"),
- "Draft",
- icon_wid, toolbar_draft_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_INSERT_FILE);
- insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Insert"),
- _("Insert file"),
- "Insert",
- icon_wid, toolbar_insert_cb,
- compose);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
- attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Attach"),
- _("Attach file"),
- "Attach",
- icon_wid, toolbar_attach_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SIGN);
- sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Signature"),
- _("Insert signature"),
- "Signature",
- icon_wid, toolbar_sig_cb, compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EDIT_EXTERN);
- exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Editor"),
- _("Edit with external editor"),
- "Editor",
- icon_wid,
- toolbar_ext_editor_cb,
- compose);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_LINEWRAP);
- linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Linewrap"),
- _("Wrap all long lines"),
- "Linewrap",
- icon_wid,
- toolbar_linewrap_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
- addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Address"),
- _("Address book"),
- "Address",
- icon_wid, toolbar_address_cb,
- compose);
-
- compose->toolbar = toolbar;
- compose->send_btn = send_btn;
- compose->sendl_btn = sendl_btn;
- compose->draft_btn = draft_btn;
- compose->insert_btn = insert_btn;
- compose->attach_btn = attach_btn;
- compose->sig_btn = sig_btn;
- compose->exteditor_btn = exteditor_btn;
- compose->linewrap_btn = linewrap_btn;
- compose->addrbook_btn = addrbook_btn;
+ compose->toolbar->toolbar = toolbar;
gtk_widget_show_all(toolbar);
}
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);
+ compose_toolbar_update(compose);
set_toolbar_style(compose);
}
}
gtk_widget_destroy(compose->paned);
+ TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
+ TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
+ g_free(compose->toolbar);
g_free(compose);
compose_list = g_list_remove(compose_list, compose);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
sensitive);
- gtk_widget_set_sensitive(compose->text, sensitive);
- gtk_widget_set_sensitive(compose->send_btn, sensitive);
- gtk_widget_set_sensitive(compose->sendl_btn, sensitive);
- gtk_widget_set_sensitive(compose->draft_btn, sensitive);
- gtk_widget_set_sensitive(compose->insert_btn, sensitive);
- gtk_widget_set_sensitive(compose->sig_btn, sensitive);
- gtk_widget_set_sensitive(compose->exteditor_btn, sensitive);
- gtk_widget_set_sensitive(compose->linewrap_btn, sensitive);
+ gtk_widget_set_sensitive(compose->text, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
+ 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_btn, sensitive);
}
/**
compose_address_cb(data, 0, NULL);
}
+static void toolbar_actions_execute_cb(GtkWidget *widget,
+ gpointer data)
+{
+ Compose *compose = (Compose*)data;
+
+ toolbar_action_execute(widget, compose->toolbar->t_action_list, data, TOOLBAR_COMPOSE);
+}
+
static void account_activated(GtkMenuItem *menuitem, gpointer data)
{
Compose *compose = (Compose *)data;
gtk_widget_hide(compose->handlebox);
break;
case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_ICONS);
break;
case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_TEXT);
break;
case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_BOTH);
break;
}