#include "about.h"
#include "manual.h"
+
#define AC_LABEL_WIDTH 240
#define STATUSBAR_PUSH(mainwin, str) \
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,
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_("/_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},
{N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
{N_("/_Help/_Manual"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help/_Manual/_English"), NULL, NULL, MANUAL_LANG_EN, NULL},
+ {N_("/_Help/_Manual/_English"), NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
{N_("/_Help/_Manual/_Japanese"), NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
{N_("/_Help/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
SummaryView *summaryview;
MessageView *messageview;
GdkColormap *colormap;
- GdkColor color[5];
- gboolean success[5];
+ GdkColor color[4];
+ gboolean success[4];
guint n_menu_entries;
GtkItemFactory *ifactory;
GtkWidget *ac_menu;
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;
+ gtkut_convert_int_to_gdk_color(prefs_common.tgt_folder_col,
+ &folderview->color_op);
summaryview->color_important.red = 0;
summaryview->color_marked.green = 0;
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;
+ color[3] = folderview->color_op;
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, 4, FALSE, TRUE, success);
+ for (i = 0; i < 4; i++) {
if (success[i] == FALSE)
g_warning(_("MainWindow: color allocation %d failed\n"), i);
}
*/
main_window_set_thread_option(mainwin);
- menu_set_sensitive(ifactory, "/Help/Manual/English", FALSE);
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
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/Forward", sens);
- menu_set_sensitive(ifactory, "/Message/Forward as 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);
y %= sy; if (y < 0) y += sy;
gdk_window_move(mainwin->window->window, x, y);
gdk_window_raise(mainwin->window->window);
+ gdk_window_show(mainwin->window->window);
debug_print("window position: x = %d, y = %d\n", x, y);
gdk_window_raise(widget->window);
break;
default:
+ break;
}
}
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 *replysender_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);
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);
+ 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_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Compose email"),
+ compose_mail_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("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_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Compose news"),
+ compose_news_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("News"),
_("Compose a news message"),
"New",
icon_wid,
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,
mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Reply sender"),
+ _("Sender"),
_("Reply to sender"),
"Reply to sender",
icon_wid,
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->replysender_btn = replysender_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,
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);
&& 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);
+ compose_new_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
}
else
compose_new(NULL);
if (mainwin->summaryview->folder_item) {
ac = mainwin->summaryview->folder_item->folder->account;
if (ac && ac->protocol != A_NNTP) {
- compose_new(ac);
+ compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
return;
}
}
+ if(cur_account && (cur_account->protocol != A_NNTP)) {
+ compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+ 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);
+ compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
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
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:
g_warning("reply_cb(): invalid action type: %d\n", action);
if (!mainwin->summaryview->folder_item) return;
if (!folderview->opened) return;
+ folder_update_op_count();
+
fitem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree),
folderview->opened);
if (!fitem) return;
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