#include "prefs_template.h"
#include "account.h"
#include "addressbook.h"
-#include "headerwindow.h"
#include "logwindow.h"
#include "manage_window.h"
#include "alertpanel.h"
static GdkCursor *watch_cursor;
+static void main_window_menu_callback_block (MainWindow *mainwin);
+static void main_window_menu_callback_unblock (MainWindow *mainwin);
+
static void main_window_show_cur_account (MainWindow *mainwin);
static void main_window_set_widgets (MainWindow *mainwin,
{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, NULL},
- {N_("/_View/U_nthread view"), "<shift><control>T", thread_cb, 1, NULL},
+ {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
{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/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
{N_("/_View/_View source"), "<control>U", view_source_cb, 0, NULL},
- {N_("/_View/Show all _header"), "<control>H", show_all_header_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},
mainwin->folderview = folderview = folderview_create();
mainwin->summaryview = summaryview = summary_create();
mainwin->messageview = messageview = messageview_create();
- mainwin->headerwin = header_window_create();
mainwin->logwin = log_window_create();
folderview->mainwin = mainwin;
summaryview->mainwin = mainwin;
summaryview->folderview = folderview;
summaryview->messageview = messageview;
- summaryview->headerwin = mainwin->headerwin;
summaryview->window = window;
messageview->mainwin = mainwin;
menuitem = gtk_item_factory_get_item(ifactory, "/View/Expand Summary View");
gtk_signal_connect(GTK_OBJECT(menuitem), "state-changed", GTK_SIGNAL_FUNC(menuitem_expandsummaryview_statechanged),
mainwin);
-
- menu_set_sensitive(ifactory, "/View/Thread view",
- prefs_common.enable_thread ? FALSE : TRUE);
- menu_set_sensitive(ifactory, "/View/Unthread view",
- prefs_common.enable_thread ? TRUE : FALSE);
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
folderview_init(folderview);
summary_init(summaryview);
messageview_init(messageview);
- header_window_init(mainwin->headerwin);
log_window_init(mainwin->logwin);
mainwin->lock_count = 0;
+ mainwin->menu_lock_count = 0;
mainwin->cursor_count = 0;
if (!watch_cursor)
gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
}
+static void main_window_menu_callback_block(MainWindow *mainwin)
+{
+ mainwin->menu_lock_count++;
+}
+
+static void main_window_menu_callback_unblock(MainWindow *mainwin)
+{
+ if (mainwin->menu_lock_count)
+ mainwin->menu_lock_count--;
+}
+
void main_window_reflect_prefs_all(void)
{
GList *cur;
GtkItemFactory *ifactory;
SensitiveCond state;
gboolean sensitive;
+ GtkWidget *menuitem;
gint i;
static const struct {
{"/Edit/Actions" , M_MSG_EXIST},
{"/View/Sort" , M_MSG_EXIST},
- {"/View/Thread view" , M_UNTHREADED},
- {"/View/Unthread view" , M_THREADED},
+ {"/View/Thread view" , M_EXEC},
{"/View/Hide read messages" , M_HIDE_READ_MSG},
{"/View/Go to/Prev message" , M_MSG_EXIST},
{"/View/Go to/Next message" , M_MSG_EXIST},
sensitive = ((entry[i].cond & state) == entry[i].cond);
menu_set_sensitive(ifactory, entry[i].entry, sensitive);
}
+
+ main_window_menu_callback_block(mainwin);
+ menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all header");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ menuitem = gtk_item_factory_get_widget(ifactory, "/View/Thread view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ (state & M_THREADED) != 0);
+ main_window_menu_callback_unblock(mainwin);
}
void main_window_popup(MainWindow *mainwin)
static void show_all_header_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_display_msg_selected(mainwin->summaryview, TRUE);
+ if (mainwin->menu_lock_count) return;
+ summary_display_msg_selected(mainwin->summaryview,
+ GTK_CHECK_MENU_ITEM(widget)->active);
}
static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
GtkItemFactory *ifactory;
+ if (mainwin->menu_lock_count) return;
if (!mainwin->summaryview->folder_item) return;
ifactory = gtk_item_factory_from_widget(widget);
- if (0 == action) {
+ if (GTK_CHECK_MENU_ITEM(widget)->active) {
summary_thread_build(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = TRUE;
- menu_set_sensitive(ifactory, "/View/Thread view", FALSE);
- menu_set_sensitive(ifactory, "/View/Unthread view", TRUE);
} else {
summary_unthread(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = FALSE;
- menu_set_sensitive(ifactory, "/View/Thread view", TRUE);
- menu_set_sensitive(ifactory, "/View/Unthread view", FALSE);
}
}