#define AC_LABEL_WIDTH 240
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
- gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->mainwin_cid, str); \
- gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-
-#define STATUSBAR_POP(mainwin) \
-{ \
- gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->mainwin_cid); \
-}
-
/* list of all instantiated MainWindow */
static GList *mainwin_list = NULL;
static void toolbar_send_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_compose_cb (GtkWidget *widget,
- gpointer data);
static void toolbar_compose_news_cb (GtkWidget *widget,
gpointer data);
static void toolbar_compose_mail_cb (GtkWidget *widget,
static void toolbar_next_unread_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_prefs_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_account_cb (GtkWidget *widget,
- gpointer data);
#if 0
static void toolbar_account_button_pressed (GtkWidget *widget,
static void toggle_statusbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void toggle_expand_summaryview_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void toggle_expand_messageview_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void toggle_work_offline_cb (MainWindow *mainwin,
+static void separate_widget_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void separate_widget_cb (GtkCheckMenuItem *checkitem,
- guint action,
- GtkWidget *widget);
static void addressbook_open_cb (MainWindow *mainwin,
guint action,
guint action,
GtkWidget *widget);
-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,
static void sort_summary_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void sort_summary_type_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void attract_by_subject_cb(MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void next_unread_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void prev_new_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void next_new_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void prev_marked_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
guint action,
GtkWidget *widget);
-static void prefs_common_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_filter_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_scoring_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_filtering_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_account_open_cb(MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
+static void prefs_common_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_filter_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void prefs_template_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void prefs_actions_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void prefs_account_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_scoring_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_filtering_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void new_account_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
ToolbarStyle style,
ComposeButtonType type);
-static void menuitem_expandsummaryview_statechanged (GtkWidget *widget,
- GtkStateType state,
- gpointer data);
-
static void key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void set_toolbar_style(MainWindow *mainwin);
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
+
static void addr_harvest_cb ( MainWindow *mainwin,
guint action,
GtkWidget *widget );
guint action,
GtkWidget *widget );
-#define SEPARATE_ACTION 667
+#define SEPARATE_ACTION 500
static GtkItemFactoryEntry mainwin_entries[] =
{
{N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
{N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
+ /* {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL}, */
{N_("/_File/E_xit"), "<control>Q", app_exit_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Show or hi_de/_Folder tree"),
+ NULL, toggle_folder_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Show or hi_de/_Message view"),
+ "V", toggle_message_cb, 0, "<ToggleItem>"},
{N_("/_View/Show or hi_de/_Toolbar"),
NULL, NULL, 0, "<Branch>"},
{N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
{N_("/_View/Show or hi_de/Status _bar"),
NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Separate _Folder Tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
- {N_("/_View/Separate _Message View"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
- {N_("/_View/E_xpand Summary View"), "V", toggle_expand_summaryview_cb, 0, "<ToggleItem>"},
- {N_("/_View/Ex_pand Message View"), "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
+ {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/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
- {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 _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
+ {N_("/_View/_Sort/by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _from"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
{N_("/_View/_Sort/by _color label"),
- NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
- {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},
+ NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"},
{N_("/_View/_Sort/by a_ttachment"),
- NULL, sort_summary_cb, SORT_BY_MIME, NULL},
+ NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
+ {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
+ {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
{N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Sort/_Attract by subject"),
NULL, attract_by_subject_cb, 0, NULL},
{N_("/_View/_Go to/N_ext unread message"),
"<shift>N", next_unread_cb, 0, NULL},
{N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/Prev ne_w message"), NULL, prev_new_cb, 0, NULL},
+ {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
+ {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Go to/Prev _marked message"),
NULL, prev_marked_cb, 0, NULL},
{N_("/_View/_Go to/Next m_arked message"),
{N_("/_Tools/_Create filter rule/by _Subject"),
NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/E_xecute"), "X", execute_summary_cb, 0, NULL},
+ {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Delete du_plicated messages"),
NULL, delete_duplicated_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/E_xecute"), "X", execute_summary_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
{N_("/_Configuration"), NULL, NULL, 0, "<Branch>"},
GtkItemFactory *ifactory;
GtkWidget *ac_menu;
GtkWidget *menuitem;
- GtkWidget *compose_popup;
GtkWidget *reply_popup;
GtkWidget *replyall_popup;
GtkWidget *replysender_popup;
n_menu_entries, "<Main>", mainwin);
gtk_widget_show(menubar);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+ ifactory = gtk_item_factory_from_widget(menubar);
handlebox = gtk_handle_box_new();
gtk_widget_show(handlebox);
messageview->mainwin = mainwin;
- mainwin->window = window;
- mainwin->vbox = vbox;
- mainwin->menubar = menubar;
- mainwin->handlebox = handlebox;
- mainwin->vbox_body = vbox_body;
- mainwin->hbox_stat = hbox_stat;
- mainwin->statusbar = statusbar;
- mainwin->progressbar = progressbar;
- mainwin->statuslabel = statuslabel;
- mainwin->ac_button = ac_button;
- mainwin->ac_label = ac_label;
- mainwin->reply_popup = reply_popup;
- mainwin->replyall_popup = replyall_popup;
+ mainwin->window = window;
+ mainwin->vbox = vbox;
+ mainwin->menubar = menubar;
+ mainwin->menu_factory = ifactory;
+ mainwin->handlebox = handlebox;
+ mainwin->vbox_body = vbox_body;
+ mainwin->hbox_stat = hbox_stat;
+ mainwin->statusbar = statusbar;
+ mainwin->progressbar = progressbar;
+ mainwin->statuslabel = statuslabel;
+ mainwin->ac_button = ac_button;
+ mainwin->ac_label = ac_label;
+
+ mainwin->reply_popup = reply_popup;
+ mainwin->replyall_popup = replyall_popup;
mainwin->replysender_popup = replysender_popup;
- mainwin->fwd_popup = fwd_popup;
- mainwin->online_switch = online_switch;
- mainwin->offline_switch = offline_switch;
+ mainwin->fwd_popup = fwd_popup;
+ mainwin->online_switch = online_switch;
+ mainwin->offline_switch = offline_switch;
/* set context IDs for status bar */
mainwin->mainwin_cid = gtk_statusbar_get_context_id
debug_print(_("done.\n"));
+ messageview->visible = TRUE;
+
main_window_set_widgets(mainwin, type);
/* set menu items */
- ifactory = gtk_item_factory_from_widget(menubar);
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Code set/Auto detect");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
(ifactory, "/View/Show or hide/Status bar");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
-#if 0 /* FIXED SEPARATE WINDOWS */
- /* Message view and Folder tree are always shown at startup
- * make that in the menu visible */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate 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), TRUE);
-#endif
- /* 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));
-
- 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);
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
main_window_set_toolbar_sensitive(mainwin);
- /* Create actions menu */
+ /* create actions menu */
update_mainwin_actions_menu(ifactory, mainwin);
/* show main window */
main_window_set_toolbar_sensitive(mainwin);
/* pixmap themes */
- if (pixmap_theme_changed)
- {
+ if (pixmap_theme_changed) {
gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
mainwin->toolbar = NULL;
main_window_toolbar_create(mainwin, mainwin->handlebox);
activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
+ sd_reflect_prefs_pixmap_theme();
}
+ if (prefs_common.immediate_exec)
+ gtk_widget_hide(mainwin->exec_btn);
+ else
+ gtk_widget_show(mainwin->exec_btn);
+
summary_redisplay_msg(mainwin->summaryview);
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
gtk_widget_unref(message_wid);
}
+void main_window_toggle_message_view(MainWindow *mainwin)
+{
+ SummaryView *summaryview = mainwin->summaryview;
+ union CompositeWin *cwin = &mainwin->win;
+ GtkWidget *vpaned = NULL;
+ GtkWidget *container = NULL;
+ GtkWidget *msgwin = NULL;
+
+ switch (mainwin->type) {
+ case SEPARATE_NONE:
+ vpaned = cwin->sep_none.vpaned;
+ container = cwin->sep_none.hpaned;
+ break;
+ case SEPARATE_FOLDER:
+ vpaned = cwin->sep_folder.vpaned;
+ container = mainwin->vbox_body;
+ break;
+ case SEPARATE_MESSAGE:
+ msgwin = mainwin->win.sep_message.messagewin;
+ break;
+ case SEPARATE_BOTH:
+ msgwin = mainwin->win.sep_both.messagewin;
+ break;
+ }
+
+ if (msgwin) {
+ if (GTK_WIDGET_VISIBLE(msgwin)) {
+ gtk_widget_hide(msgwin);
+ mainwin->messageview->visible = FALSE;
+ summaryview->displayed = NULL;
+ } else {
+ gtk_widget_show(msgwin);
+ mainwin->messageview->visible = TRUE;
+ }
+ } else if (vpaned->parent != NULL) {
+ mainwin->messageview->visible = FALSE;
+ summaryview->displayed = NULL;
+ gtk_widget_ref(vpaned);
+ gtkut_container_remove(GTK_CONTAINER(container), vpaned);
+ gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
+ gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+ GTK_ARROW_UP, GTK_SHADOW_OUT);
+ } else {
+ mainwin->messageview->visible = TRUE;
+ gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
+ gtk_container_add(GTK_CONTAINER(container), vpaned);
+ gtk_widget_unref(vpaned);
+ gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+ GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ }
+
+ main_window_set_menu_sensitive(mainwin);
+
+ gtk_widget_grab_focus(summaryview->ctree);
+}
+
void main_window_get_size(MainWindow *mainwin)
{
GtkAllocation *allocation;
prefs_common.summaryview_width = allocation->width;
- if (mainwin->summaryview->msg_is_toggled_on)
+ if ((mainwin->type == SEPARATE_NONE ||
+ mainwin->type == SEPARATE_FOLDER) &&
+ messageview_is_visible(mainwin->messageview))
prefs_common.summaryview_height = allocation->height;
prefs_common.mainview_width = allocation->width;
for (list = folder_get_list(); list != NULL; list = list->next) {
folder = list->data;
- if (folder && folder->trash && folder->trash->total != 0) {
- folder_item_scan(folder->trash);
+ if (folder && folder->trash) {
folderview_update_item(folder->trash, TRUE);
}
}
folder_add(folder);
folder_set_ui_func(folder, scan_tree_func, mainwin);
- folder->scan_tree(folder);
+ folder_scan_tree(folder);
folder_set_ui_func(folder, NULL, NULL);
folderview_set(mainwin->folderview);
folder_add(folder);
- item = folder_item_new(folder->name, NULL);
+ item = folder_item_new(folder, folder->name, NULL);
item->folder = folder;
folder->node = g_node_new(item);
state |= M_UNLOCKED;
if (selection != SUMMARY_NONE)
state |= M_MSG_EXIST;
- if (item) {
+ if (item && item->path && item->parent && !item->no_select) {
state |= M_EXEC;
if (item->threaded)
state |= M_THREADED;
/* if (item->folder->type != F_NEWS) */
state |= M_ALLOW_DELETE;
- if (selection == SUMMARY_NONE && item->hide_read_msgs
+ if ((selection == SUMMARY_NONE && item->hide_read_msgs)
|| selection != SUMMARY_NONE)
state |= M_HIDE_READ_MSG;
}
void main_window_set_menu_sensitive(MainWindow *mainwin)
{
- GtkItemFactory *ifactory;
+ GtkItemFactory *ifactory = mainwin->menu_factory;
SensitiveCond state;
gboolean sensitive;
GtkWidget *menuitem;
+ FolderItem *item;
+ gchar *menu_path;
gint i;
static const struct {
{"/File/Exit" , M_UNLOCKED},
{"/Edit/Select thread" , M_SINGLE_TARGET_EXIST},
- {"/View/Sort" , M_MSG_EXIST},
+ {"/View/Sort" , M_EXEC},
{"/View/Thread view" , M_EXEC},
{"/View/Expand all threads" , M_MSG_EXIST},
{"/View/Collapse all threads" , M_MSG_EXIST},
{"/View/Go to/Next message" , M_MSG_EXIST},
{"/View/Go to/Prev unread message" , M_MSG_EXIST},
{"/View/Go to/Next unread message" , M_MSG_EXIST},
+ {"/View/Go to/Prev new message" , M_MSG_EXIST},
+ {"/View/Go to/Next new message" , M_MSG_EXIST},
{"/View/Go to/Prev marked message" , M_MSG_EXIST},
{"/View/Go to/Next marked message" , M_MSG_EXIST},
{"/View/Go to/Prev labeled message", M_MSG_EXIST},
{"/Tools/Harvest addresses" , M_UNLOCKED},
{"/Tools/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
{"/Tools/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/Tools/Actions" , M_TARGET_EXIST|M_UNLOCKED},
{"/Tools/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Tools/Actions" , M_MSG_EXIST},
{"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Configuration", M_UNLOCKED},
{NULL, 0}
};
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
state = main_window_get_current_state(mainwin);
for (i = 0; entry[i].entry != NULL; i++) {
}
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),
- mainwin->messageview->textview->show_all_headers);
- 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);
+
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+ menuitem = gtk_item_factory_get_widget(ifactory, path); \
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+ SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
+ messageview_is_visible(mainwin->messageview));
+
+ item = mainwin->summaryview->folder_item;
+ menu_path = "/View/Sort/Don't sort";
+ if (item) {
+ switch (item->sort_key) {
+ case SORT_BY_NUMBER:
+ menu_path = "/View/Sort/by number"; break;
+ case SORT_BY_SIZE:
+ menu_path = "/View/Sort/by size"; break;
+ case SORT_BY_DATE:
+ menu_path = "/View/Sort/by date"; break;
+ case SORT_BY_FROM:
+ menu_path = "/View/Sort/by from"; break;
+ case SORT_BY_SUBJECT:
+ menu_path = "/View/Sort/by subject"; break;
+ case SORT_BY_LABEL:
+ menu_path = "/View/Sort/by color label"; break;
+ case SORT_BY_MARK:
+ menu_path = "/View/Sort/by mark"; break;
+ case SORT_BY_UNREAD:
+ menu_path = "/View/Sort/by unread"; break;
+ case SORT_BY_MIME:
+ menu_path = "/View/Sort/by attachment"; break;
+ case SORT_BY_SCORE:
+ menu_path = "/View/Sort/by score"; break;
+ case SORT_BY_LOCKED:
+ menu_path = "/View/Sort/by locked"; break;
+ case SORT_BY_NONE:
+ default:
+ menu_path = "/View/Sort/Don't sort"; break;
+ }
+ }
+ SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
+
+ if (!item || item->sort_type == SORT_ASCENDING) {
+ SET_CHECK_MENU_ACTIVE("/View/Sort/Ascending", TRUE);
+ } else {
+ SET_CHECK_MENU_ACTIVE("/View/Sort/Descending", TRUE);
+ }
+
+ if (item && item->sort_key != SORT_BY_NONE) {
+ menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
+ menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
+ } else {
+ menu_set_sensitive(ifactory, "/View/Sort/Ascending", FALSE);
+ menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
+ }
+
+ SET_CHECK_MENU_ACTIVE("/View/Show all header",
+ mainwin->messageview->textview->show_all_headers);
+ SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
+
+#undef SET_CHECK_MENU_ACTIVE
+
main_window_menu_callback_unblock(mainwin);
}
GtkWidget *hpaned;
GtkWidget *vpaned;
GtkWidget *vbox_body = mainwin->vbox_body;
- GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
+ GtkItemFactory *ifactory = mainwin->menu_factory;
GtkWidget *menuitem;
debug_print(_("Setting widgets..."));
GTK_WIDGET_PTR(mainwin->folderview));
vpaned = gtk_vpaned_new();
- if (mainwin->summaryview->msg_is_toggled_on) {
+ if (messageview_is_visible(mainwin->messageview)) {
gtk_paned_add2(GTK_PANED(hpaned), vpaned);
gtk_paned_add1(GTK_PANED(vpaned),
GTK_WIDGET_PTR(mainwin->summaryview));
prefs_common.mainwin_height);
gtk_widget_show_all(vpaned);
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
- menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
- menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
- menuitem = gtk_item_factory_get_widget(ifactory, "/View/Expand Message View");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+
mainwin->win.sep_none.hpaned = hpaned;
mainwin->win.sep_none.vpaned = vpaned;
break;
case SEPARATE_FOLDER:
vpaned = gtk_vpaned_new();
- if (mainwin->summaryview->msg_is_toggled_on) {
+ if (messageview_is_visible(mainwin->messageview)) {
gtk_box_pack_start(GTK_BOX(vbox_body), vpaned,
TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(vpaned),
gtk_container_add(GTK_CONTAINER(folderwin),
GTK_WIDGET_PTR(mainwin->folderview));
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-
mainwin->win.sep_folder.folderwin = folderwin;
mainwin->win.sep_folder.vpaned = vpaned;
gtk_widget_show_all(hpaned);
gtk_container_add(GTK_CONTAINER(messagewin),
GTK_WIDGET_PTR(mainwin->messageview));
-
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
- menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
- menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
-
+
mainwin->win.sep_message.messagewin = messagewin;
mainwin->win.sep_message.hpaned = hpaned;
gtk_widget_show_all(messagewin);
+
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
break;
case SEPARATE_BOTH:
gtk_box_pack_start(GTK_BOX(vbox_body),
gtk_container_add(GTK_CONTAINER(messagewin),
GTK_WIDGET_PTR(mainwin->messageview));
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-
mainwin->win.sep_both.folderwin = folderwin;
mainwin->win.sep_both.messagewin = messagewin;
gtk_widget_show_all(folderwin);
gtk_widget_show_all(messagewin);
+
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
break;
}
mainwin->type = type;
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ mainwin->messageview->visible = TRUE;
+ /* toggle menu state */
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);
GtkWidget *delete_btn;
GtkWidget *exec_btn;
- GtkTooltips *tooltips;
-
toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_BOTH);
gtk_container_add(GTK_CONTAINER(container), toolbar);
static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
MainWindow *mainwindow = (MainWindow *) data;
- GtkWidget *replysender_menu, *replysender_item;
if (!event) return;
send_queue_cb(mainwin, 0, NULL);
}
-static void toolbar_compose_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- 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)
{
next_unread_cb(mainwin, 0, NULL);
}
-static void toolbar_prefs_cb (GtkWidget *widget,
- gpointer data)
-{
- prefs_common_open();
-}
-
-static void toolbar_account_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- prefs_account_open_cb(mainwin, 0, NULL);
-}
-
#if 0
static void toolbar_account_button_pressed(GtkWidget *widget,
GdkEventButton *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");
+ (mainwin->menu_factory, "/View/Show or hide/Folder tree");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
return TRUE;
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");
+ (mainwin->menu_factory, "/View/Show or hide/Message view");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
return TRUE;
static void update_folderview_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_show(mainwin->summaryview, NULL, FALSE);
+ summary_show(mainwin->summaryview, NULL);
folderview_rescan_all();
}
#endif
break;
case SEPARATE_FOLDER:
+ debug_print("separate folder\n");
if (active)
gtk_widget_show(mainwin->win.sep_folder.folderwin);
else
active = GTK_CHECK_MENU_ITEM(widget)->active;
- switch (mainwin->type) {
- case SEPARATE_NONE:
- case SEPARATE_FOLDER:
- break;
- case SEPARATE_MESSAGE:
- if (active)
- gtk_widget_show(mainwin->win.sep_message.messagewin);
- else
- gtk_widget_hide(mainwin->win.sep_message.messagewin);
- break;
- case SEPARATE_BOTH:
- if (active)
- gtk_widget_show(mainwin->win.sep_both.messagewin);
- else
- gtk_widget_hide(mainwin->win.sep_both.messagewin);
- break;
- }
+ if (active != messageview_is_visible(mainwin->messageview))
+ summary_toggle_view(mainwin->summaryview);
}
static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
-/* activate_compose_button(mainwin, (ToolbarStyle)action,
- mainwin->compose_btn_type);
- set_toolbar_reply_button(mainwin, (ToolbarStyle)action);
- set_toolbar_replyall_button(mainwin, (ToolbarStyle)action);
- set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
- set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
-
+ switch ((ToolbarStyle)action) {
+ case TOOLBAR_NONE:
+ gtk_widget_hide(mainwin->handlebox);
+ case TOOLBAR_ICON:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_ICONS);
+ break;
+ case TOOLBAR_TEXT:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_TEXT);
+ break;
+ case TOOLBAR_BOTH:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_BOTH);
+ break;
+ }
+
+ if (action != TOOLBAR_NONE) {
+ gtk_widget_show(mainwin->handlebox);
+ gtk_widget_queue_resize(mainwin->handlebox);
+ }
+
mainwin->toolbar_style = (ToolbarStyle)action;
prefs_common.toolbar_style = (ToolbarStyle)action;
-
- set_toolbar_style(mainwin);
}
static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
}
}
-static void toggle_expand_summaryview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void separate_widget_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
{
- summary_toggle_view_real(mainwin->summaryview);
-}
+ SeparateType type;
-static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
- messageview_toggle_view_real(mainwin->messageview);
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ type = mainwin->type | action;
+ else
+ type = mainwin->type & ~action;
+
+ main_window_separation_change(mainwin, type);
+
+ prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
+ prefs_common.sep_msg = (type & SEPARATE_MESSAGE) != 0;
}
static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
}
}
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
-{
- MainWindow *mainwin;
- SeparateType type;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- type = mainwin->type | action;
- else
- type = mainwin->type & ~action;
-
- main_window_separation_change(mainwin, type);
-
- prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
- prefs_common.sep_msg = (type & SEPARATE_MESSAGE) != 0;
-}
-
static void addressbook_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
}
}
-static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
- 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_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
- }
- else
- compose_new(NULL);
-}
-
static void compose_mail_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void thread_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 (GTK_CHECK_MENU_ITEM(widget)->active) {
summary_thread_build(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = TRUE;
static void sort_summary_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_sort(mainwin->summaryview, (SummarySortType)action);
+ FolderItem *item = mainwin->summaryview->folder_item;
+ GtkWidget *menuitem;
+
+ if (mainwin->menu_lock_count) return;
+ if (item) {
+ menuitem = gtk_item_factory_get_item
+ (mainwin->menu_factory, "/View/Sort/Ascending");
+ summary_sort(mainwin->summaryview, (FolderSortKey)action,
+ GTK_CHECK_MENU_ITEM(menuitem)->active
+ ? SORT_ASCENDING : SORT_DESCENDING);
+ }
+}
+
+static void sort_summary_type_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ FolderItem *item = mainwin->summaryview->folder_item;
+
+ if (mainwin->menu_lock_count) return;
+ if (item)
+ summary_sort(mainwin->summaryview,
+ item->sort_key, (FolderSortType)action);
}
static void attract_by_subject_cb(MainWindow *mainwin, guint action,
folderview->opened);
if (!fitem) return;
- summary_show(mainwin->summaryview, fitem, TRUE);
+ folder_item_scan(fitem);
+ summary_show(mainwin->summaryview, fitem);
}
static void prev_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
summary_select_next_unread(mainwin->summaryview);
}
+static void prev_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ summary_select_prev_new(mainwin->summaryview);
+}
+
+static void next_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ summary_select_next_new(mainwin->summaryview);
+}
+
static void prev_marked_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
+ MessageView *msgview = mainwin->messageview;
+
if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
summary_select_all(mainwin->summaryview);
- else if (mainwin->summaryview->msg_is_toggled_on && (
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->ctree) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->notebook) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->textview->text)))
+ else if (messageview_is_visible(msgview) &&
+ (GTK_WIDGET_HAS_FOCUS(msgview->textview->text) ||
+ GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
messageview_select_all(mainwin->messageview);
}
static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- if (mainwin->summaryview->msg_is_toggled_on)
+ if (messageview_is_visible(mainwin->summaryview->messageview))
summary_select_thread(mainwin->summaryview);
}
ToolbarStyle style,
ComposeButtonType type)
{
- SensitiveCond state = main_window_get_current_state(mainwin);
-
if (style == TOOLBAR_NONE)
return;
compose_btn_type);
}
-static void menuitem_expandsummaryview_statechanged (GtkWidget *widget, GtkStateType state, gpointer data)
-{
- MainWindow *mainwin = (MainWindow*) data;
-
- if (!mainwin) return;
-
- gtk_widget_set_sensitive(GTK_WIDGET(mainwin->summaryview->toggle_view_btn), GTK_WIDGET_IS_SENSITIVE(widget));
-}
-
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
if (prefs_common.toolbar_style != TOOLBAR_NONE) {
gtk_widget_show(mainwin->handlebox);
gtk_widget_queue_resize(mainwin->handlebox);
-
- if (prefs_common.immediate_exec)
- gtk_widget_hide(mainwin->exec_btn);
- else
- gtk_widget_show(mainwin->exec_btn);
}
}
projects / claws.git / blobdiff