#include "summaryview.h"
#include "summary_search.h"
#include "messageview.h"
+#include "message_search.h"
#include "headerview.h"
#include "menu.h"
#include "folder.h"
guint action,
GtkWidget *widget);
+static void search_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void toggle_folder_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
{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/_Rescan folder tree"), NULL, update_folderview_cb, 0, NULL},
{N_("/_File/_Folder"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/_Folder/Create _new folder..."),
NULL, new_folder_cb, 0, NULL},
{N_("/_Edit/_Copy"), "<control>C", copy_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", allsel_cb, 0, NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Search"), "<control>S", summary_search_cb, 0, NULL},
+ {N_("/_Edit/_Find in current message"), "<control>F", search_cb, 0, NULL},
+ {N_("/_Edit/_Search folder"), "<control>S", search_cb, 1, NULL},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Folder tree"), NULL, toggle_folder_cb, 0, "<ToggleItem>"},
{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/_Forward"), "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Message/_Forward"), "<shift><alt>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>"},
M_SINGLE_TARGET_EXIST = 1 << 3,
M_EXEC = 1 << 4,
M_ALLOW_REEDIT = 1 << 5,
- M_HAVE_ACCOUNT = 1 << 6
+ M_HAVE_ACCOUNT = 1 << 6,
+ M_THREADED = 1 << 7,
+ M_UNTHREADED = 1 << 8,
+ M_NEWS = 1 << 9
} SensitiveCond;
static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
state |= M_UNLOCKED;
if (selection != SUMMARY_NONE)
state |= M_MSG_EXIST;
+ if (mainwin->summaryview->folder_item) {
+ if (mainwin->summaryview->folder_item->threaded)
+ state |= M_THREADED;
+ else
+ state |= M_UNTHREADED;
+ }
if (selection == SUMMARY_SELECTED_SINGLE ||
selection == SUMMARY_SELECTED_MULTIPLE)
state |= M_TARGET_EXIST;
if (mainwin->summaryview->folder_item &&
mainwin->summaryview->folder_item->folder->type != F_NEWS)
state |= M_EXEC;
+ if (mainwin->summaryview->folder_item &&
+ mainwin->summaryview->folder_item->folder->type == F_NEWS)
+ state |= M_NEWS;
if (selection == SUMMARY_SELECTED_SINGLE &&
(mainwin->summaryview->folder_item &&
(mainwin->summaryview->folder_item->stype == F_DRAFT ||
} entry[] = {
{"/File/Add mailbox..." , M_UNLOCKED},
{"/File/Add mbox mailbox..." , M_UNLOCKED},
- {"/File/Update folder tree" , M_UNLOCKED},
+ {"/File/Rescan folder tree" , M_UNLOCKED},
{"/File/Folder" , M_UNLOCKED},
{"/File/Import mbox file..." , M_UNLOCKED},
{"/File/Export to mbox file...", M_UNLOCKED},
{"/View/Show all header" , M_SINGLE_TARGET_EXIST},
{"/View/View source" , M_SINGLE_TARGET_EXIST},
- {"/Message/Get new mail" , M_HAVE_ACCOUNT|M_UNLOCKED},
- {"/Message/Get from all accounts", M_HAVE_ACCOUNT|M_UNLOCKED},
-/* {"/Message/Compose new message" , M_HAVE_ACCOUNT}, */
- {"/Message/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Reply to sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Reply to all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Forward" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Forward as attachment", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Open in new window" , M_SINGLE_TARGET_EXIST},
+ {"/Message/Get new mail" , M_HAVE_ACCOUNT|M_UNLOCKED},
+ {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
+/* {"/Message/Compose new message" , M_HAVE_ACCOUNT}, */
+ {"/Message/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Message/Reply to sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_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_SINGLE_TARGET_EXIST},
+ {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Message/Open in new window" , M_SINGLE_TARGET_EXIST},
{"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
{"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
{"/Summary/Go to/Next labeled message", M_MSG_EXIST},
{"/Summary/Sort" , M_MSG_EXIST},
+ {"/Summary/Thread view" , M_UNTHREADED},
+ {"/Summary/Unthread view" , M_THREADED},
{"/Configuration", M_UNLOCKED},
gdk_window_get_origin(mainwin->window->window, &x, &y);
sx = gdk_screen_width();
sy = gdk_screen_height();
- x %= sx; if (x < 0) x += sx;
- y %= sy; if (y < 0) y += sy;
+ x %= sx; if (x < 0) x = 0;
+ y %= sy; if (y < 0) y = 0;
gdk_window_move(mainwin->window->window, x, y);
gdk_window_raise(mainwin->window->window);
gdk_window_show(mainwin->window->window);
case SEPARATE_FOLDER:
widget = mainwin->win.sep_folder.folderwin;
gdk_window_get_origin(widget->window, &x, &y);
- x %= sx; if (x < 0) x += sx;
- y %= sy; if (y < 0) y += sy;
+ x %= sx; if (x < 0) x = 0;
+ y %= sy; if (y < 0) y = 0;
gdk_window_move(widget->window, x, y);
gdk_window_raise(widget->window);
break;
case SEPARATE_MESSAGE:
widget = mainwin->win.sep_message.messagewin;
gdk_window_get_origin(widget->window, &x, &y);
- x %= sx; if (x < 0) x += sx;
- y %= sy; if (y < 0) y += sy;
+ x %= sx; if (x < 0) x = 0;
+ y %= sy; if (y < 0) y = 0;
gdk_window_move(widget->window, x, y);
gdk_window_raise(widget->window);
break;
case SEPARATE_BOTH:
widget = mainwin->win.sep_both.folderwin;
gdk_window_get_origin(widget->window, &x, &y);
- x %= sx; if (x < 0) x += sx;
- y %= sy; if (y < 0) y += sy;
+ x %= sx; if (x < 0) x = 0;
+ y %= sy; if (y < 0) y = 0;
gdk_window_move(widget->window, x, y);
gdk_window_raise(widget->window);
widget = mainwin->win.sep_both.messagewin;
gdk_window_get_origin(widget->window, &x, &y);
- x %= sx; if (x < 0) x += sx;
- y %= sy; if (y < 0) y += sy;
+ x %= sx; if (x < 0) x = 0;
+ y %= sy; if (y < 0) y = 0;
gdk_window_move(widget->window, x, y);
gdk_window_raise(widget->window);
break;
GtkWidget *button;
button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+ if (!button) return;
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
manage_window_focus_in(mainwin->window, NULL, NULL);
app_will_exit(widget, mainwin);
}
+static void search_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ if (action == 1)
+ summary_search(mainwin->summaryview);
+ else
+ message_search(mainwin->messageview);
+}
+
static void toggle_folder_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
break;
case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE);
+ TRUE, TRUE);
break;
case COMPOSE_FORWARD:
if (!sel->next) {
debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
}
-/*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 == 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", FALSE);
- }
- else {
- 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, TRUE);
- }
- 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);
- }
-}*/
-
static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- /*mainwin->summaryview->folder_item->prefs->enable_thread =
- !mainwin->summaryview->folder_item->prefs->enable_thread;
- main_window_set_thread_option(mainwin);
- */
+ GtkItemFactory *ifactory;
- GtkItemFactory *ifactory;
+ if (!mainwin->summaryview->folder_item) return;
ifactory = gtk_item_factory_from_widget(widget);
if (0 == action) {
- summary_thread_build(mainwin->summaryview, FALSE);
- prefs_common.enable_thread = TRUE;
+ summary_thread_build(mainwin->summaryview);
+ mainwin->summaryview->folder_item->threaded = TRUE;
menu_set_sensitive(ifactory, "/Summary/Thread view", FALSE);
menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
} else {
summary_unthread(mainwin->summaryview);
- prefs_common.enable_thread = FALSE;
+ mainwin->summaryview->folder_item->threaded = FALSE;
menu_set_sensitive(ifactory, "/Summary/Thread view", TRUE);
menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
}
if (style == TOOLBAR_NONE)
return;
- if (style == TOOLBAR_BOTH) {
+ 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
}
}
+void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonType compose_btn_type)
+{
+ if (mainwin->compose_btn_type != compose_btn_type)
+ activate_compose_button(mainwin,
+ prefs_common.toolbar_style,
+ compose_btn_type);
+}
+
static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
projects / claws.git / blobdiff