#include "export.h"
#include "prefs_common.h"
#include "prefs_filter.h"
+#include "prefs_filtering.h"
#include "prefs_scoring.h"
#include "prefs_account.h"
#include "prefs_folder_item.h"
gpointer data);
static void toolbar_reply_to_all_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_reply_to_author_cb (GtkWidget *widget,
+static void toolbar_reply_to_sender_cb (GtkWidget *widget,
gpointer data);
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data);
static void add_mailbox_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void add_mbox_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void update_folderview_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void toggle_statusbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void separate_widget_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
static void addressbook_open_cb (MainWindow *mainwin,
guint action,
FolderItem *item,
gpointer data);
+#define SEPARATE_ACTION 667
+
static GtkItemFactoryEntry mainwin_entries[] =
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/_Add mailbox..."), NULL, add_mailbox_cb, 0, NULL},
+ {N_("/_File/_Add mbox mailbox..."), NULL, add_mbox_cb, 0, NULL},
{N_("/_File/_Update folder tree"), NULL, update_folderview_cb, 0, NULL},
{N_("/_File/_Folder"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/_Folder/Create _new folder..."),
{N_("/_View/_Toolbar/Icon _and text"), NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
{N_("/_View/_Toolbar/_Icon"), NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
{N_("/_View/_Toolbar/_Text"), NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
- {N_("/_View/_Toolbar/_Non-display"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
+ {N_("/_View/_Toolbar/_None"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
{N_("/_View/_Status bar"), NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Separate f_older tree"), NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
- {N_("/_View/Separate m_essage view"), NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+ {N_("/_View/Separate f_older tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
+ {N_("/_View/Separate m_essage view"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Code set"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Code set/_Auto detect"),
#undef CODESET_ACTION
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Rece_ive new mail"), "<alt>I", inc_mail_cb, 0, NULL},
- {N_("/_Message/Receive from _all accounts"),
+ {N_("/_Message/Get new ma_il"), "<alt>I", inc_mail_cb, 0, NULL},
+ {N_("/_Message/Get from _all accounts"),
"<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Send queued messa_ges"),
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Compose _new message"), "<alt>N", compose_cb, 0, NULL},
{N_("/_Message/_Reply"), "<alt>R", reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/_Message/Repl_y to sender"), "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/_Message/Reply to a_ll"), "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
- {N_("/_Message/Reply to author"), NULL, reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
- {N_("/_Message/_Forward"), "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
- {N_("/_Message/Forward as an a_ttachment"),
+ {N_("/_Message/_Forward"), "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Message/Forward as a_ttachment"),
"<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/M_ove..."), "<alt>O", move_to_cb, 0, NULL},
{N_("/_Message/_Mark/_Unmark"), NULL, unmark_cb, 0, NULL},
{N_("/_Message/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
- {N_("/_Message/_Mark/Mark it as _being read"),
+ {N_("/_Message/_Mark/Mark as rea_d"),
NULL, mark_as_read_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Open in new _window"), "<shift><control>N", open_msg_cb, 0, NULL},
{N_("/_Message/View _source"), "<control>U", view_source_cb, 0, NULL},
- {N_("/_Message/Show all _header"), "<control>H", header_window_show_cb, 0, NULL},
- {N_("/_Message/Re_edit"), NULL, reedit_cb, 0, NULL},
+ {N_("/_Message/Show all _header"), "<control>H", header_window_show_cb, 0, NULL},
+ {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Summary"), NULL, NULL, 0, "<Branch>"},
{N_("/_Summary/_Delete duplicated messages"),
folderview->color_normal.red = folderview->color_normal.green =
folderview->color_normal.blue = 0;
+ summaryview->color_important.red = 0;
+ summaryview->color_marked.green = 0;
+ summaryview->color_important.blue = (guint16)65535;
+
color[0] = summaryview->color_marked;
color[1] = summaryview->color_dim;
color[2] = summaryview->color_normal;
switch (prefs_common.toolbar_style) {
case TOOLBAR_NONE:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/Non-display");
+ (ifactory, "/View/Toolbar/None");
break;
case TOOLBAR_ICON:
menuitem = gtk_item_factory_get_item
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
+ /* set the check of the SEPARATE_xxx menu items. we also need the main window
+ * as a property and pass the action type to the callback */
+ menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
+ g_assert(menuitem);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
+ gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb),
+ GUINT_TO_POINTER(SEPARATE_FOLDER));
+
+ menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
+ g_assert(menuitem);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
+ gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb),
+ GUINT_TO_POINTER(SEPARATE_MESSAGE));
+
+ /*
menu_set_sensitive(ifactory, "/Summary/Thread view",
prefs_common.enable_thread ? FALSE : TRUE);
menu_set_sensitive(ifactory, "/Summary/Unthread view",
prefs_common.enable_thread ? TRUE : FALSE);
+ */
+ main_window_set_thread_option(mainwin);
+
menu_set_sensitive(ifactory, "/Help/Manual/English", FALSE);
/* set account selection menu */
gtk_widget_set_sensitive(mainwin->get_btn, FALSE);
gtk_widget_set_sensitive(mainwin->getall_btn, FALSE);
}
+
if (prefs_common.immediate_exec)
gtk_widget_hide(mainwin->exec_btn);
else
g_free(path);
return;
}
+
if (!strcmp(path, "Mail"))
folder = folder_new(F_MH, _("Mailbox"), path);
else
folder = folder_new(F_MH, g_basename(path), path);
+
g_free(path);
if (folder->create_tree(folder) < 0) {
folderview_set(mainwin->folderview);
}
+void main_window_add_mbox(MainWindow *mainwin)
+{
+ gchar *path;
+ Folder *folder;
+ FolderItem * item;
+
+ path = input_dialog(_("Add mbox mailbox"),
+ _("Input the location of mailbox."),
+ "mail");
+
+ if (!path) return;
+
+ if (folder_find_from_path(path)) {
+ alertpanel_error(_("The mailbox `%s' already exists."), path);
+ g_free(path);
+ return;
+ }
+
+ /*
+ if (!strcmp(path, "Mail"))
+ folder = folder_new(F_MBOX, _("Mailbox"), path);
+ else
+ */
+
+ folder = folder_new(F_MBOX, g_basename(path), path);
+ g_free(path);
+
+ if (folder->create_tree(folder) < 0) {
+ alertpanel_error(_("Creation of the mailbox failed."));
+ folder_destroy(folder);
+ return;
+ }
+
+ folder_add(folder);
+
+ item = folder_item_new(folder->name, NULL);
+ item->folder = folder;
+ folder->node = g_node_new(item);
+
+ folder->create_folder(folder, item, "inbox");
+ folder->create_folder(folder, item, "outbox");
+ folder->create_folder(folder, item, "queue");
+ folder->create_folder(folder, item, "draft");
+ folder->create_folder(folder, item, "trash");
+
+ folderview_set(mainwin->folderview);
+}
+
void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
{
gtk_widget_set_sensitive(mainwin->reply_btn, sensitive);
gtk_widget_set_sensitive(mainwin->replyall_btn, sensitive);
- gtk_widget_set_sensitive(mainwin->replyauthor_btn, sensitive);
+ gtk_widget_set_sensitive(mainwin->replysender_btn, sensitive);
gtk_widget_set_sensitive(mainwin->fwd_btn, sensitive);
gtk_widget_set_sensitive(mainwin->exec_btn, sensitive);
gtk_widget_set_sensitive(mainwin->next_btn, sensitive);
menu_set_sensitive(ifactory, "/File/Save as...", sens);
menu_set_sensitive(ifactory, "/Message/Reply", sens);
+ menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
- menu_set_sensitive(ifactory, "/Message/Reply to author", sens);
menu_set_sensitive(ifactory, "/Message/Forward", sens);
- menu_set_sensitive(ifactory, "/Message/Forward as an attachment", sens);
+ menu_set_sensitive(ifactory, "/Message/Forward an attachment", sens);
menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
menu_set_sensitive(ifactory, "/Message/Show all header", sens);
menu_set_sensitive(ifactory, "/Message/View source", sens);
if (sens && (!mainwin->summaryview->folder_item ||
mainwin->summaryview->folder_item->stype != F_DRAFT))
sens = FALSE;
- menu_set_sensitive(ifactory, "/Message/Reedit", sens);
+ menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
if (selection == SUMMARY_SELECTED_SINGLE ||
selection == SUMMARY_SELECTED_MULTIPLE)
GtkWidget *compose_btn;
GtkWidget *reply_btn;
GtkWidget *replyall_btn;
- GtkWidget *replyauthor_btn;
+ GtkWidget *replysender_btn;
GtkWidget *fwd_btn;
GtkWidget *send_btn;
/*
toolbar_reply_to_all_cb,
mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
- replyauthor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Reply author"),
- _("Reply to author"),
- "Reply to author",
+ replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Reply sender"),
+ _("Reply to sender"),
+ "Reply to sender",
icon_wid,
- toolbar_reply_to_author_cb,
+ toolbar_reply_to_sender_cb,
mainwin);
CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
toolbar_exec_cb,
mainwin);
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
CREATE_TOOLBAR_ICON(stock_down_arrow_xpm);
next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Next"),
mainwin->compose_btn = compose_btn;
mainwin->reply_btn = reply_btn;
mainwin->replyall_btn = replyall_btn;
- mainwin->replyauthor_btn = replyauthor_btn;
+ mainwin->replysender_btn = replysender_btn;
mainwin->fwd_btn = fwd_btn;
mainwin->send_btn = send_btn;
/*
reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
}
-static void toolbar_reply_to_author_cb (GtkWidget *widget,
+static void toolbar_reply_to_sender_cb (GtkWidget *widget,
gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_REPLY_TO_AUTHOR, NULL);
+ reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
}
static void toolbar_forward_cb (GtkWidget *widget,
main_window_add_mailbox(mainwin);
}
+static void add_mbox_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ main_window_add_mbox(mainwin);
+}
+
static void update_folderview_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
}
}
-static void separate_widget_cb(MainWindow *mainwin, guint action,
- GtkWidget *widget)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
{
+ MainWindow *mainwin;
SeparateType type;
+ mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
+ g_return_if_fail(mainwin != NULL);
+
type = mainwin->type ^ action;
main_window_separation_change(mainwin, type);
static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- if (mainwin->summaryview->folder_item)
- compose_new(mainwin->summaryview->folder_item->folder->account);
+ if (mainwin->summaryview->folder_item) {
+ if (mainwin->summaryview->folder_item->folder->account != NULL
+ && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
+ compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
+ else
+ compose_new(mainwin->summaryview->folder_item->folder->account);
+ }
else
compose_new(NULL);
}
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, FALSE);
break;
- case COMPOSE_REPLY_TO_ALL:
+ case COMPOSE_REPLY_TO_SENDER:
compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE);
+ FALSE, TRUE);
break;
- case COMPOSE_REPLY_TO_AUTHOR:
+ case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE);
+ TRUE, FALSE);
break;
case COMPOSE_FORWARD:
compose_forward(NULL, msginfo, FALSE);
compose_forward(NULL, msginfo, TRUE);
break;
default:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE);
+ g_warning("reply_cb(): invalid action type: %d\n", action);
}
summary_set_marks_selected(mainwin->summaryview);
void main_window_set_thread_option(MainWindow *mainwin)
{
GtkItemFactory *ifactory;
+ gboolean no_item = FALSE;
ifactory = gtk_item_factory_from_widget(mainwin->menubar);
- if (mainwin->summaryview->folder_item->prefs->enable_thread) {
+ if (mainwin->summaryview == NULL)
+ no_item = TRUE;
+ else if (mainwin->summaryview->folder_item == NULL)
+ no_item = TRUE;
+
+ if (no_item) {
menu_set_sensitive(ifactory, "/Summary/Thread view", FALSE);
- menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
- summary_thread_build(mainwin->summaryview);
+ menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
}
else {
- menu_set_sensitive(ifactory, "/Summary/Thread view", TRUE);
- menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
- summary_unthread(mainwin->summaryview);
+ if (mainwin->summaryview->folder_item->prefs->enable_thread) {
+ menu_set_sensitive(ifactory,
+ "/Summary/Thread view", FALSE);
+ menu_set_sensitive(ifactory,
+ "/Summary/Unthread view", TRUE);
+ summary_thread_build(mainwin->summaryview);
+ }
+ else {
+ menu_set_sensitive(ifactory,
+ "/Summary/Thread view", TRUE);
+ menu_set_sensitive(ifactory,
+ "/Summary/Unthread view", FALSE);
+ summary_unthread(mainwin->summaryview);
+ }
+ prefs_folder_item_save_config(mainwin->summaryview->folder_item);
}
- prefs_folder_item_save_config(mainwin->summaryview->folder_item);
}
static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- /*
- ifactory = gtk_item_factory_from_widget(widget);
- */
mainwin->summaryview->folder_item->prefs->enable_thread =
!mainwin->summaryview->folder_item->prefs->enable_thread;
main_window_set_thread_option(mainwin);
static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- prefs_scoring_open();
+ prefs_scoring_open(NULL);
}
static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,