static void ac_menu_popup_closed (GtkMenuShell *menu_shell,
gpointer data);
-static gint main_window_close_cb (GtkWidget *widget,
- GdkEventAny *event,
- gpointer data);
+static gint main_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
+static gint folder_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
+static gint message_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void add_mailbox_cb (MainWindow *mainwin,
guint action,
static void thread_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void expand_threads_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void collapse_threads_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void set_display_item_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
{N_("/_View/Ex_pand Message View"), "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
- {N_("/_View/_Sort/Sort by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
- {N_("/_View/_Sort/Sort by _date"), NULL, sort_summary_cb, SORT_BY_DATE, NULL},
- {N_("/_View/_Sort/Sort by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
- {N_("/_View/_Sort/Sort by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
- {N_("/_View/_Sort/Sort by _color label"),
+ {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
+ {N_("/_View/_Sort/by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
+ {N_("/_View/_Sort/by _date"), NULL, sort_summary_cb, SORT_BY_DATE, NULL},
+ {N_("/_View/_Sort/by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
+ {N_("/_View/_Sort/by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
+ {N_("/_View/_Sort/by _color label"),
NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
- {N_("/_View/_Sort/Sort by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, NULL},
- {N_("/_View/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
- {N_("/_View/_Sort/Sort by a_ttachment"),
+ {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, NULL},
+ {N_("/_View/_Sort/by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
+ {N_("/_View/_Sort/by a_ttachment"),
NULL, sort_summary_cb, SORT_BY_MIME, NULL},
{N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Sort/_Attract by subject"),
NULL, attract_by_subject_cb, 0, NULL},
- {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
+ {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL},
+ {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL},
{N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"},
{N_("/_View/Set display _item..."), NULL, set_display_item_cb, 0, NULL},
{N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
{N_("/_View/Show all _header"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Update"), "<control><alt>U", update_summary_cb, 0, NULL},
+ {N_("/_View/_Update summary"), "<control><alt>U", update_summary_cb, 0, NULL},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/Get new ma_il"), "<control>I", inc_mail_cb, 0, NULL},
{N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/_Message/Reply to a_ll"), "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/_Message/_Forward"), "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
- {N_("/_Message/Bounce"), NULL, reply_cb, COMPOSE_BOUNCE, NULL},
+ {N_("/_Message/Redirect"), NULL, reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+ debug_print(_("Changing window separation type from %d to %d\n"),
+ mainwin->type, type);
+
if (mainwin->type == type) return;
/* remove widgets from those containers */
{"/Edit/Select thread" , M_SINGLE_TARGET_EXIST},
{"/View/Sort" , M_MSG_EXIST},
{"/View/Thread view" , M_EXEC},
+ {"/View/Expand all threads" , M_MSG_EXIST},
+ {"/View/Collapse all threads" , M_MSG_EXIST},
{"/View/Hide read messages" , M_HIDE_READ_MSG},
{"/View/Go to/Prev message" , M_MSG_EXIST},
{"/View/Go to/Next message" , M_MSG_EXIST},
{"/Message/Reply to all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
{"/Message/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
- {"/Message/Bounce" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Message/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
{"/Message/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Message/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
gtk_container_set_border_width(GTK_CONTAINER(folderwin),
BORDER_WIDTH);
gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- NULL);
+ GTK_SIGNAL_FUNC(folder_window_close_cb),
+ mainwin);
}
if (type & SEPARATE_MESSAGE) {
messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(messagewin),
BORDER_WIDTH);
gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- NULL);
+ GTK_SIGNAL_FUNC(message_window_close_cb),
+ mainwin);
}
switch (type) {
mainwin->type = type;
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Show or hide/Folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Show or hide/Message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Separate folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ ((type & SEPARATE_FOLDER) != 0));
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Separate message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ ((type & SEPARATE_MESSAGE) != 0));
+
debug_print(_("done.\n"));
}
return TRUE;
}
+static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Expand Summary View");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+ return TRUE;
+}
+
+static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Expand Message View");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+ return TRUE;
+}
+
static void add_mailbox_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void toggle_folder_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
+ gboolean active;
+
+ active = GTK_CHECK_MENU_ITEM(widget)->active;
+
switch (mainwin->type) {
case SEPARATE_NONE:
case SEPARATE_MESSAGE:
+#if 0
+ if (active)
+ gtk_widget_show(GTK_WIDGET_PTR(mainwin->folderview));
+ else
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->folderview));
+#endif
break;
case SEPARATE_FOLDER:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (active)
gtk_widget_show(mainwin->win.sep_folder.folderwin);
else
gtk_widget_hide(mainwin->win.sep_folder.folderwin);
break;
case SEPARATE_BOTH:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (active)
gtk_widget_show(mainwin->win.sep_both.folderwin);
else
gtk_widget_hide(mainwin->win.sep_both.folderwin);
static void toggle_message_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
+ gboolean active;
+
+ active = GTK_CHECK_MENU_ITEM(widget)->active;
+
switch (mainwin->type) {
case SEPARATE_NONE:
case SEPARATE_FOLDER:
break;
case SEPARATE_MESSAGE:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (active)
gtk_widget_show(mainwin->win.sep_message.messagewin);
else
gtk_widget_hide(mainwin->win.sep_message.messagewin);
break;
case SEPARATE_BOTH:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (active)
gtk_widget_show(mainwin->win.sep_both.messagewin);
else
gtk_widget_hide(mainwin->win.sep_both.messagewin);
MainWindow *mainwin;
SeparateType type;
- mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
- g_return_if_fail(mainwin != NULL);
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ type = mainwin->type | action;
+ else
+ type = mainwin->type & ~action;
- type = mainwin->type ^ action;
main_window_separation_change(mainwin, type);
prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
}
}
+static void expand_threads_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_expand_threads(mainwin->summaryview);
+}
+
+static void collapse_threads_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_collapse_threads(mainwin->summaryview);
+}
+
static void set_display_item_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void sort_summary_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_sort(mainwin->summaryview, (SummarySortType)action);
+ summary_sort(mainwin->summaryview, (FolderSortKey)action);
}
static void attract_by_subject_cb(MainWindow *mainwin, guint action,