#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"
static void toolbar_compose_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_popup_compose_type_cb(GtkWidget *widget,
+ gpointer data);
+static void toolbar_popup_compose_type_set(GtkWidget *widget,
+ gpointer data);
+static void toolbar_compose_news_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_compose_mail_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_reply_cb (GtkWidget *widget,
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(GtkCheckMenuItem *checkitem, guint action);
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
static void addressbook_open_cb (MainWindow *mainwin,
guint action,
static void compose_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget);
+static void compose_news_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget);
static void reply_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void scan_tree_func (Folder *folder,
FolderItem *item,
gpointer data);
+
+static void activate_compose_button (MainWindow *mainwin,
+ ToolbarStyle style,
+ ComposeButtonType type);
#define SEPARATE_ACTION 667
{
{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, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
#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"),
NULL, send_queue_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Compose _new message"), "<alt>N", compose_cb, 0, NULL},
+ {N_("/_Message/Compose a_n email message"), "<alt>N", compose_mail_cb, 0, NULL},
+ {N_("/_Message/Compose a news message"), NULL, compose_news_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/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, 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"),
{N_("/_Summary/_Sort/Sort by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
{N_("/_Summary/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
{N_("/_Summary/_Sort/Sort by sco_re"), NULL, sort_summary_cb, SORT_BY_SCORE, NULL},
+ {N_("/_Summary/_Sort/Sort by _label"), NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
{N_("/_Summary/_Sort/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Summary/_Sort/_Attract by subject"),
NULL, attract_by_subject_cb, 0, NULL},
SummaryView *summaryview;
MessageView *messageview;
GdkColormap *colormap;
- GdkColor color[5];
- gboolean success[5];
+ GdkColor color[3];
+ gboolean success[3];
guint n_menu_entries;
GtkItemFactory *ifactory;
GtkWidget *ac_menu;
n_menu_entries = sizeof(mainwin_entries) / sizeof(mainwin_entries[0]);
menubar = menubar_create(window, mainwin_entries,
n_menu_entries, "<Main>", mainwin);
-
gtk_widget_show(menubar);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
summaryview->color_dim.red = summaryview->color_dim.green =
summaryview->color_dim.blue = COLOR_DIM;
- summaryview->color_normal.red = summaryview->color_normal.green =
- summaryview->color_normal.blue = 0;
-
folderview->color_new.red = (guint16)55000;
folderview->color_new.green = folderview->color_new.blue = 15000;
- 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;
- color[3] = folderview->color_new;
- color[4] = folderview->color_normal;
+ color[2] = folderview->color_new;
colormap = gdk_window_get_colormap(window->window);
- gdk_colormap_alloc_colors(colormap, color, 5, FALSE, TRUE, success);
- for (i = 0; i < 5; i++) {
+ gdk_colormap_alloc_colors(colormap, color, 3, FALSE, TRUE, success);
+ for (i = 0; i < 3; i++) {
if (success[i] == FALSE)
g_warning(_("MainWindow: color allocation %d failed\n"), i);
}
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_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 */
header_window_init(mainwin->headerwin);
log_window_init(mainwin->logwin);
+ {
+ GtkStyle *newstyle;
+
+ gtk_widget_ensure_style(folderview->ctree);
+ newstyle = gtk_widget_get_style(folderview->ctree);
+ newstyle = gtk_style_copy(newstyle);
+ gtk_widget_set_style(summaryview->ctree, newstyle);
+ gtk_widget_ensure_style(summaryview->ctree);
+ gtk_widget_realize(summaryview->ctree);
+ }
+
mainwin->cursor_count = 0;
if (!watch_cursor)
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", TRUE);
+ menu_set_sensitive(ifactory, "/Message/Forward as attachment", TRUE);
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)
menu_set_sensitive(ifactory, "/Summary/Next message", sens);
menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+
+ if (mainwin->summaryview->folder_item &&
+ mainwin->summaryview->folder_item->folder->account)
+ sens = mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP;
+ else
+ sens = FALSE;
+ menu_set_sensitive(ifactory, "/Message/Follow-up and reply to", sens);
}
void main_window_popup(MainWindow *mainwin)
gdk_window_raise(widget->window);
break;
default:
+ break;
}
}
#include "pixmaps/stock_mail_receive.xpm"
#include "pixmaps/stock_mail_receive_all.xpm"
#include "pixmaps/stock_mail_compose.xpm"
+#include "pixmaps/stock_news_compose.xpm"
#include "pixmaps/stock_mail_reply.xpm"
#include "pixmaps/stock_mail_reply_to_all.xpm"
#include "pixmaps/stock_mail_reply_to_author.xpm"
GtkWidget *icon_wid;
GtkWidget *get_btn;
GtkWidget *getall_btn;
- GtkWidget *compose_btn;
+ GtkWidget *compose_mail_btn;
+ GtkWidget *compose_news_btn;
+ GtkWidget *compose_mail_btn_plain;
+ GtkWidget *compose_news_btn_plain;
GtkWidget *reply_btn;
GtkWidget *replyall_btn;
- GtkWidget *replyauthor_btn;
+ GtkWidget *replysender_btn;
GtkWidget *fwd_btn;
GtkWidget *send_btn;
/*
GtkWidget *next_btn;
GtkWidget *delete_btn;
GtkWidget *exec_btn;
+ GtkWidget *compose_type_btn;
+ GtkWidget *compose_type_arrow;
+ GtkWidget *compose_box;
+ GtkWidget *compose_label;
+ GtkTooltips *tooltips;
toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_BOTH);
CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get"),
- _("Incorporate new mail"),
+ _("Get new mail from current account"),
"Get",
icon_wid, toolbar_inc_cb, mainwin);
CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get all"),
- _("Incorporate new mail of all accounts"),
+ _("Get new mail from all accounts"),
"Get all",
icon_wid,
toolbar_inc_all_cb,
toolbar_send_cb,
mainwin);
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
+ /* to implement Leandro's "combined" compose buttons, we create
+ * two sets of compose buttons, one for normal (text + icon)
+ * toolbar, and one for both text-only and icon-only toolbar;
+ * we switch between those sets. */
+
+ /* insert compose mail button widget */
+
+ compose_mail_btn = gtk_button_new();
+ gtk_widget_show(compose_mail_btn);
+ tooltips = gtk_tooltips_new();
+ gtk_tooltips_set_tip(tooltips, compose_mail_btn,
+ _("Compose email message"),
+ _("email"));
+ compose_box = gtk_vbox_new(0, 0);
+ gtk_widget_show(compose_box);
+
+ gtk_container_add(GTK_CONTAINER(compose_mail_btn), compose_box);
CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
- compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Compose"),
- _("Compose new message"),
+ gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+ compose_label = gtk_label_new(_("Email"));
+ gtk_widget_show(compose_label);
+ gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+
+ GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_mail_btn), GTK_CAN_FOCUS);
+ gtk_button_set_relief(GTK_BUTTON(compose_mail_btn), GTK_RELIEF_NONE);
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_mail_btn,
+ NULL, NULL);
+
+ /* insert compose news button widget */
+
+ compose_news_btn = gtk_button_new();
+ gtk_widget_show(compose_news_btn);
+ tooltips = gtk_tooltips_new();
+ gtk_tooltips_set_tip(tooltips, compose_news_btn,
+ _("Compose news article"),
+ _("news"));
+ compose_box = gtk_vbox_new(0, 0);
+ gtk_widget_show(compose_box);
+
+ gtk_container_add(GTK_CONTAINER(compose_news_btn), compose_box);
+ CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+ gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+ compose_label = gtk_label_new(_("News"));
+ gtk_widget_show(compose_label);
+ gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+
+ GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_news_btn), GTK_CAN_FOCUS);
+ gtk_button_set_relief(GTK_BUTTON(compose_news_btn), GTK_RELIEF_NONE);
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_news_btn,
+ NULL, NULL);
+
+ /* insert compose btn plain */
+
+ CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+ compose_mail_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Compose email"),
+ _("Compose an email message"),
+ "New",
+ icon_wid,
+ toolbar_compose_mail_cb,
+ mainwin);
+
+ /* insert compose btn plain */
+
+ CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+ compose_news_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Compose news"),
+ _("Compose a news message"),
"New",
icon_wid,
- toolbar_compose_cb,
+ toolbar_compose_news_cb,
mainwin);
+
+ /* insert compose button type widget */
+
+ compose_type_btn = gtk_button_new();
+ gtk_widget_show(compose_type_btn);
+
+ compose_type_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ gtk_widget_show(compose_type_arrow);
+
+ gtk_container_add(GTK_CONTAINER(compose_type_btn), compose_type_arrow);
+
+ GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_type_btn), GTK_CAN_FOCUS);
+ gtk_button_set_relief(GTK_BUTTON(compose_type_btn), GTK_RELIEF_NONE);
+
+ gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_type_btn,
+ NULL, NULL);
+
+ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+
CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Reply"),
mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Reply all"),
+ _("All"),
_("Reply to all"),
"Reply to all",
icon_wid,
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),
+ _("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);
*/
+ gtk_signal_connect(GTK_OBJECT(compose_type_btn), "clicked",
+ GTK_SIGNAL_FUNC(toolbar_popup_compose_type_cb),
+ mainwin);
+
+ gtk_signal_connect(GTK_OBJECT(compose_mail_btn), "clicked",
+ GTK_SIGNAL_FUNC(toolbar_compose_mail_cb),
+ mainwin);
+
+ gtk_signal_connect(GTK_OBJECT(compose_news_btn), "clicked",
+ GTK_SIGNAL_FUNC(toolbar_compose_news_cb),
+ mainwin);
+
mainwin->toolbar = toolbar;
mainwin->get_btn = get_btn;
mainwin->getall_btn = getall_btn;
- mainwin->compose_btn = compose_btn;
+ mainwin->compose_mail_btn = compose_mail_btn;
+ mainwin->compose_news_btn = compose_news_btn;
+ mainwin->compose_mail_btn_plain = compose_mail_btn_plain;
+ mainwin->compose_news_btn_plain = compose_news_btn_plain;
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;
/*
mainwin->exec_btn = exec_btn;
gtk_widget_show_all(toolbar);
+
+ /* activate Leandro menu system */
+ activate_compose_button(mainwin,
+ prefs_common.toolbar_style,
+ mainwin->compose_btn_type);
}
/* callback functions */
+static void toolbar_popup_compose_type_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwindow = (MainWindow *) data;
+ GtkWidget *compose_menu, *compose_item;
+
+ g_return_if_fail(mainwindow != NULL);
+
+ compose_menu = gtk_menu_new();
+
+ compose_item = gtk_menu_item_new_with_label(_("Email message"));
+ gtk_widget_show(compose_item);
+ gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+ gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+ GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+ mainwindow);
+ gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_MAIL));
+
+ compose_item = gtk_menu_item_new_with_label(_("News article"));
+ gtk_widget_show(compose_item);
+ gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+ gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+ GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+ mainwindow);
+ gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_NEWS));
+
+ gtk_menu_popup(GTK_MENU(compose_menu), NULL, NULL, NULL,
+ NULL, 1, 0);
+}
+
+static void toolbar_popup_compose_type_set(GtkWidget *widget, gpointer data)
+{
+ ComposeButtonType compose_type = GPOINTER_TO_INT( gtk_object_get_data(GTK_OBJECT(widget), "entry") );
+ MainWindow *mainwindow = (MainWindow *) data;
+
+ mainwindow->compose_btn_type = compose_type;
+
+ activate_compose_button(mainwindow, prefs_common.toolbar_style, mainwindow->compose_btn_type);
+}
+
static void toolbar_inc_cb (GtkWidget *widget,
gpointer data)
{
{
MainWindow *mainwin = (MainWindow *)data;
- compose_cb(mainwin, 0, NULL);
+ if (mainwin->compose_btn_type == COMPOSEBUTTON_MAIL)
+ compose_cb(mainwin, 0, NULL);
+ else
+ compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_news_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_mail_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ compose_mail_cb(mainwin, 0, NULL);
}
static void toolbar_reply_cb (GtkWidget *widget,
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,
{
MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+ if (prefs_common.forward_as_attachment)
+ reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+ else
+ reply_cb(mainwin, COMPOSE_FORWARD, NULL);
}
static void toolbar_delete_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 toggle_toolbar_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
+ activate_compose_button(mainwin, (ToolbarStyle)action,
+ mainwin->compose_btn_type);
+
switch ((ToolbarStyle)action) {
case TOOLBAR_NONE:
gtk_widget_hide(mainwin->handlebox);
}
}
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
{
MainWindow *mainwin;
SeparateType 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);
}
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ PrefsAccount * ac;
+ GList * list;
+ GList * cur;
+
+ if (mainwin->summaryview->folder_item) {
+ ac = mainwin->summaryview->folder_item->folder->account;
+ if (ac && ac->protocol != A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+
+ if(cur_account && (cur_account->protocol != A_NNTP)) {
+ compose_new(cur_account);
+ return;
+ }
+
+ list = account_get_list();
+ for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+ ac = (PrefsAccount *) cur->data;
+ if (ac->protocol != A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+}
+
+static void compose_news_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ PrefsAccount * ac = NULL;
+ GList * list;
+ GList * cur;
+
+ if (mainwin->summaryview->folder_item) {
+ ac = mainwin->summaryview->folder_item->folder->account;
+ if (ac && ac->protocol == A_NNTP) {
+ compose_new_with_recipient
+ (ac, mainwin->summaryview->folder_item->path);
+ return;
+ }
+ }
+
+ list = account_get_list();
+ for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+ ac = (PrefsAccount *) cur->data;
+ if (ac->protocol == A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+}
+
static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
+ GList *sel = GTK_CLIST(mainwin->summaryview->ctree)->selection;
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data
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_FOLLOWUP_AND_REPLY_TO:
+ compose_followup_and_reply_to(msginfo,
+ prefs_common.reply_with_quote,
+ 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);
- break;
+ if (!sel->next) {
+ compose_forward(NULL, msginfo, FALSE);
+ break;
+ }
+ /* if (sel->next) FALL_THROUGH */
case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward(NULL, msginfo, TRUE);
+ {
+ GSList *msginfo_list = NULL;
+ for ( ; sel != NULL; sel = sel->next)
+ msginfo_list = g_slist_append(msginfo_list,
+ gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->summaryview->ctree),
+ GTK_CTREE_NODE(sel->data)));
+ compose_forward_multiple(NULL, msginfo_list);
+ g_slist_free(msginfo_list);
+ }
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);
{
FolderItem *to_folder;
- to_folder = foldersel_folder_sel(NULL);
+ to_folder = foldersel_folder_sel(NULL, NULL);
if (to_folder)
folderview_select(mainwin->folderview, to_folder);
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,
STATUSBAR_POP(mainwin);
g_free(str);
}
+
+static void activate_compose_button (MainWindow *mainwin,
+ ToolbarStyle style,
+ ComposeButtonType type)
+{
+ if (style == TOOLBAR_NONE)
+ return;
+
+ if (style == TOOLBAR_BOTH) {
+ gtk_widget_hide(mainwin->compose_mail_btn_plain);
+ gtk_widget_hide(mainwin->compose_news_btn_plain);
+ gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn
+ : mainwin->compose_news_btn);
+ gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
+ : mainwin->compose_mail_btn);
+ mainwin->compose_btn_type = type;
+ }
+ else {
+ gtk_widget_hide(mainwin->compose_news_btn);
+ gtk_widget_hide(mainwin->compose_mail_btn);
+ gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn_plain
+ : mainwin->compose_news_btn_plain);
+ gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn_plain
+ : mainwin->compose_mail_btn_plain);
+ mainwin->compose_btn_type = type;
+ }
+}
+
projects / claws.git / blobdiff