/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Hiroyuki Yamamoto
+ * Copyright (C) 2001-2003 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* 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 "intl.h"
#include "mainwindow.h"
+#include "summaryview.h"
#include "compose.h"
#include "utils.h"
#include "xml.h"
#include "toolbar.h"
#include "menu.h"
#include "inc.h"
+#include "action.h"
#include "prefs_actions.h"
#include "prefs_common.h"
#include "prefs_toolbar.h"
ComposeButtonType type);
/* toolbar callbacks */
+static void toolbar_reply (gpointer data,
+ guint action);
static void toolbar_delete_cb (GtkWidget *widget,
gpointer data);
static void toolbar_next_unread_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_ignore_thread_cb (GtkWidget *widget,
+ gpointer data);
+
+static void toolbar_print_cb (GtkWidget *widget,
+ gpointer data);
+
static void toolbar_actions_execute_cb (GtkWidget *widget,
gpointer data);
{ "A_DELETE", N_("Delete Message") },
{ "A_EXECUTE", N_("Execute") },
{ "A_GOTO_NEXT", N_("Goto Next Message") },
+ { "A_IGNORE_THREAD", N_("Ignore thread") },
+ { "A_PRINT", N_("Print") },
{ "A_SEND", N_("Send Message") },
{ "A_SENDL", N_("Put into queue folder and send later") },
{ "A_ADDRBOOK", N_("Address book") },
{ "A_SYL_ACTIONS", N_("Sylpheed Actions Feature") },
- { "A_SEPARATOR", N_("Separator") }
+ { "A_SEPARATOR", "Separator" }
};
/* struct holds configuration files and a list of
gint i = 0;
if (source == TOOLBAR_MAIN) {
- gint main_items[14] = { A_RECEIVE_ALL, A_RECEIVE_CUR, A_SEND_QUEUED,
- A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
- A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
- A_DELETE, A_EXECUTE, A_GOTO_NEXT,
+ gint main_items[] = { A_RECEIVE_ALL, A_RECEIVE_CUR, A_SEND_QUEUED,
+ A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+ A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
+ A_DELETE, A_EXECUTE, A_GOTO_NEXT,
+ A_IGNORE_THREAD, A_PRINT,
A_ADDRBOOK, A_SYL_ACTIONS };
- for (i = 0; i < sizeof(main_items)/sizeof(main_items[0]); i++)
+ for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++) {
items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
+ if (main_items[i] == A_PRINT) {
+ g_print("$$$ descr %s, trans %s\n",
+ toolbar_text[main_items[i]].descr,
+ gettext(toolbar_text[main_items[i]].descr));
+ }
+ }
}
else if (source == TOOLBAR_COMPOSE) {
- gint comp_items[10] = { A_SEND, A_SENDL, A_DRAFT,
+ gint comp_items[] = { A_SEND, A_SENDL, A_DRAFT,
A_INSERT, A_ATTACH, A_SIG,
A_EXTEDITOR, A_LINEWRAP, A_ADDRBOOK,
A_SYL_ACTIONS };
- for (i = 0; i < sizeof(comp_items)/sizeof(comp_items[0]); i++)
+ for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr));
}
else if (source == TOOLBAR_MSGVIEW) {
- gint msgv_items[10] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+ gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
A_DELETE, A_GOTO_NEXT, A_ADDRBOOK,
A_SYL_ACTIONS };
- for (i = 0; i < sizeof(msgv_items)/sizeof(msgv_items[0]); i++)
+ for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
}
for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
ToolbarItem *toolbar_item = (ToolbarItem*) cur->data;
- if (toolbar_item->index != A_SEPARATOR)
- fprintf(fp, "\t<%s %s=\"%s\" %s=\"%s\" %s=\"%s\"/>\n",
+#warning FIXME_GTK2
+ if (toolbar_item->index != A_SEPARATOR) {
+ fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
TOOLBAR_TAG_ITEM,
TOOLBAR_ICON_FILE, toolbar_item->file,
- TOOLBAR_ICON_TEXT, toolbar_item->text,
+ TOOLBAR_ICON_TEXT);
+ xml_file_put_escape_str(fp, toolbar_item->text);
+ fprintf(fp, "\" %s=\"%s\"/>\n",
TOOLBAR_ICON_ACTION,
toolbar_ret_text_from_val(toolbar_item->index));
- else
+ } else {
fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR);
+ }
}
fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX);
/* popup callback functions */
-static void toolbar_reply_popup_cb(GtkWidget *widget,
- GdkEventButton *event,
- gpointer data)
+static gboolean toolbar_reply_popup_cb(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data)
{
Toolbar *toolbar_data = (Toolbar*)data;
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 3) {
gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
gtk_menu_popup(GTK_MENU(toolbar_data->reply_popup), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+ return TRUE;
}
+
+ return FALSE;
}
static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
manage_window_focus_in(window, NULL, NULL);
}
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
Toolbar *toolbar_data = (Toolbar*)data;
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 3) {
gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
gtk_menu_popup(GTK_MENU(toolbar_data->replyall_popup), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+ return TRUE;
}
+
+ return FALSE;
}
static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
manage_window_focus_in(window, NULL, NULL);
}
-static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
Toolbar *toolbar_data = (Toolbar*)data;
gtk_menu_popup(GTK_MENU(toolbar_data->replylist_popup), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+ return TRUE;
}
+
+ return FALSE;
}
static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
manage_window_focus_in(window, NULL, NULL);
}
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
Toolbar *toolbar_data = (Toolbar*)data;
gtk_menu_popup(GTK_MENU(toolbar_data->replysender_popup), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+ return TRUE;
}
+
+ return FALSE;
}
static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
manage_window_focus_in(window, NULL, NULL);
}
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
Toolbar *toolbar_data = (Toolbar*)data;
gtk_menu_popup(GTK_MENU(toolbar_data->fwd_popup), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+ return TRUE;
}
+
+ return FALSE;
}
static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell,
switch (toolbar_item->type) {
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
- /* make sure the selected msg in summaryview is
- the one we are asked to delete */
- delete_msgview_cb(msgview, 0, widget);
+ messageview_delete(msgview);
break;
case TOOLBAR_MAIN:
mainwin = (MainWindow*)toolbar_item->parent;
static void toolbar_popup_cb(gpointer data, guint action, GtkWidget *widget)
{
- MainWindow *mainwin = get_mainwin(data);
-
- g_return_if_fail(mainwin != NULL);
- reply_cb(mainwin, action, widget);
+ toolbar_reply(data, action);
}
*/
static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
{
- ToolbarItem *toolbar_item = (ToolbarItem*)data;
- MainWindow *mainwin;
- MessageView *msgview;
-
- g_return_if_fail(toolbar_item != NULL);
-
- switch (toolbar_item->type) {
- case TOOLBAR_MAIN:
- mainwin = (MainWindow*)toolbar_item->parent;
- if (prefs_common.default_reply_list)
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
- : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE,
- NULL);
- else
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE
- : COMPOSE_REPLY_WITHOUT_QUOTE,
- NULL);
- break;
- case TOOLBAR_MSGVIEW:
- msgview = (MessageView*)toolbar_item->parent;
- compose_reply(msgview->msginfo,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE
- : COMPOSE_REPLY_WITHOUT_QUOTE,
- FALSE, FALSE, FALSE, NULL);
- break;
- default:
- debug_print("toolbar event not supported\n");
- }
+ toolbar_reply(data, prefs_common.reply_with_quote ?
+ COMPOSE_REPLY_WITH_QUOTE : COMPOSE_REPLY_WITHOUT_QUOTE);
}
*/
static void toolbar_reply_to_all_cb(GtkWidget *widget, gpointer data)
{
- ToolbarItem *toolbar_item = (ToolbarItem*)data;
- MainWindow *mainwin;
- MessageView *msgview;
-
- g_return_if_fail(toolbar_item != NULL);
-
- switch (toolbar_item->type) {
- case TOOLBAR_MAIN:
- mainwin = (MainWindow*)toolbar_item->parent;
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
- : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
- NULL);
- break;
- case TOOLBAR_MSGVIEW:
- msgview = (MessageView*)toolbar_item->parent;
- compose_reply(msgview->msginfo,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
- : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
- TRUE, FALSE, FALSE, NULL);
- break;
- default:
- debug_print("toolbar event not supported\n");
- }
+ toolbar_reply(data,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
+ : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE);
}
*/
static void toolbar_reply_to_list_cb(GtkWidget *widget, gpointer data)
{
- ToolbarItem *toolbar_item = (ToolbarItem*)data;
- MainWindow *mainwin;
- MessageView *msgview;
-
- g_return_if_fail(toolbar_item != NULL);
-
- switch (toolbar_item->type) {
- case TOOLBAR_MAIN:
- mainwin = (MainWindow*)toolbar_item->parent;
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
- : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE,
- NULL);
- break;
- case TOOLBAR_MSGVIEW:
- msgview = (MessageView*)toolbar_item->parent;
- compose_reply(msgview->msginfo,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
- : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE,
- FALSE, TRUE, FALSE, NULL);
- break;
- default:
- debug_print("toolbar event not supported\n");
- }
+ toolbar_reply(data,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE
+ : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE);
}
*/
static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
{
- ToolbarItem *toolbar_item = (ToolbarItem*)data;
- MainWindow *mainwin;
- MessageView *msgview;
-
- g_return_if_fail(toolbar_item != NULL);
-
- switch (toolbar_item->type) {
- case TOOLBAR_MAIN:
- mainwin = (MainWindow*)toolbar_item->parent;
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
- : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE,
- NULL);
- break;
- case TOOLBAR_MSGVIEW:
- msgview = (MessageView*)toolbar_item->parent;
- compose_reply(msgview->msginfo,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
- : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE,
- FALSE, FALSE, FALSE, NULL);
- break;
- default:
- debug_print("toolbar event not supported\n\n");
- }
+ toolbar_reply(data,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
+ : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE);
}
/*
*/
static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
{
- ToolbarItem *toolbar_item = (ToolbarItem*)data;
- MainWindow *mainwin;
-
- g_return_if_fail(toolbar_item != NULL);
-
- switch (toolbar_item->type) {
- case TOOLBAR_MAIN:
- mainwin = (MainWindow*)toolbar_item->parent;
- if (prefs_common.forward_as_attachment)
- reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
- else
- reply_cb(mainwin, COMPOSE_FORWARD, NULL);
- break;
-
- default:
- debug_print("toolbar event not supported\n");
- }
+ toolbar_reply(data, COMPOSE_FORWARD);
}
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
-/*
- * TODO: Check if summaryview stay in the same place when this message view was created
- * if summary have other message select the next will be based on message selected in summaryview
- */
summary_select_next_unread(msgview->mainwin->summaryview);
- /** Now we need to update the messageview window */
+ /* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
GtkCTree *ctree = GTK_CTREE(msgview->mainwin->summaryview->ctree);
}
}
+static void toolbar_ignore_thread_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ summary_toggle_ignore_thread(mainwin->summaryview);
+ break;
+ case TOOLBAR_MSGVIEW:
+ /* TODO: see toolbar_next_unread_cb() if you need
+ * this in the message view */
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
+static void toolbar_print_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ summary_print(mainwin->summaryview);
+ break;
+ case TOOLBAR_MSGVIEW:
+ /* TODO: see toolbar_next_unread_cb() if you need
+ * this in the message view */
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
static void toolbar_send_cb(GtkWidget *widget, gpointer data)
{
compose_toolbar_cb(A_SEND, data);
}
static void toolbar_buttons_cb(GtkWidget *widget,
- ToolbarItem *item)
+ ToolbarItem *item)
{
gint num_items;
gint i;
{ A_DELETE, toolbar_delete_cb },
{ A_EXECUTE, toolbar_exec_cb },
{ A_GOTO_NEXT, toolbar_next_unread_cb },
+ { A_IGNORE_THREAD, toolbar_ignore_thread_cb },
+ { A_PRINT, toolbar_print_cb },
{ A_SEND, toolbar_send_cb },
{ A_SENDL, toolbar_send_later_cb },
toolbar_data = g_new0(Toolbar, 1);
- toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
- GTK_TOOLBAR_BOTH);
+ toolbar = gtk_toolbar_new();
gtk_container_add(GTK_CONTAINER(container), toolbar);
gtk_container_set_border_width(GTK_CONTAINER(container), 2);
- gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
- gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_SPACE_LINE);
+ gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
for (cur = toolbar_list; cur != NULL; cur = cur->next) {
toolbar_item->text,
(""),
(""),
- icon_wid, toolbar_buttons_cb,
+ icon_wid, G_CALLBACK(toolbar_buttons_cb),
toolbar_item);
switch (toolbar_item->index) {
_("News"),
(""),
(""),
- icon_news, toolbar_buttons_cb,
+ icon_news, G_CALLBACK(toolbar_buttons_cb),
toolbar_item);
toolbar_data->compose_mail_btn = item;
gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
gtk_widget_show(item);
break;
default:
+ /* find and set the tool tip text */
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ item,
+ toolbar_ret_descr_from_val
+ (toolbar_item->index),
+ NULL);
break;
}
toolbar_destroy(toolbar);
}
-/* exported functions */
-
-void delete_msgview_cb(gpointer data, guint action, GtkWidget *widget)
+/*
+ */
+static void toolbar_reply(gpointer data, guint action)
{
- MessageView *msgview = (MessageView*)data;
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+ MessageView *msgview;
+ GSList *msginfo_list = NULL;
+ gchar *body;
- if (msgview->mainwin->summaryview->selected) {
- SummaryView *summaryview = msgview->mainwin->summaryview;
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree,
- summaryview->selected);
- if (msginfo->msgnum != msgview->msginfo->msgnum) {
- alertpanel_error(_("Message already removed from folder."));
- return;
- }
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow*)toolbar_item->parent;
+ msginfo_list = summary_get_selection(mainwin->summaryview);
+ msgview = (MessageView*)mainwin->messageview;
+ break;
+ case TOOLBAR_MSGVIEW:
+ msgview = (MessageView*)toolbar_item->parent;
+ msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
+ break;
+ default:
+ return;
}
-
- summary_delete(msgview->mainwin->summaryview);
-
- if (msgview->mainwin->summaryview->selected) {
- SummaryView *summaryview = msgview->mainwin->summaryview;
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree,
- summaryview->selected);
- messageview_show(msgview, msginfo,
- msgview->all_headers);
- } else {
- toolbar_clear_list(TOOLBAR_MSGVIEW);
- toolbar_destroy(msgview->toolbar);
- gtk_widget_destroy(msgview->window);
- }
-}
-
-void reply_cb(gpointer data, guint action, GtkWidget *widget)
-{
- MainWindow *mainwin = (MainWindow*)data;
- g_return_if_fail(mainwin != NULL);
+ g_return_if_fail(msgview != NULL);
+ body = messageview_get_selection(msgview);
- summary_reply(mainwin->summaryview, (ComposeMode)action);
+ g_return_if_fail(msginfo_list != NULL);
+ compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
+ g_free(body);
+ g_slist_free(msginfo_list);
+
+ /* TODO: update reply state ion summaryview */
}
+
+/* exported functions */
+
void inc_mail_cb(gpointer data, guint action, GtkWidget *widget)
{
MainWindow *mainwin = (MainWindow*)data;
{
MainWindow *mainwin = (MainWindow*)data;
- inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+ inc_all_account_mail(mainwin, FALSE, prefs_common.newmail_notify_manu);
}
void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
Folder *folder = list->data;
if (folder->queue) {
- if (procmsg_send_queue
- (folder->queue, prefs_common.savemsg) < 0)
- alertpanel_error(_("Some errors occurred while sending queued messages."));
+ procmsg_send_queue(folder->queue, prefs_common.savemsg);
folder_item_scan(folder->queue);
}
}
projects / claws.git / blobdiff