#include "prefs_filtering.h"
#include "prefs_scoring.h"
#include "prefs_account.h"
-#include "prefs_folder_item.h"
#include "prefs_summary_column.h"
#include "prefs_template.h"
+#include "action.h"
#include "account.h"
#include "addressbook.h"
#include "logwindow.h"
SeparateType type);
#if 0
-static void toolbar_account_button_pressed (GtkWidget *widget,
+static gboolean toolbar_account_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
#endif
-static void ac_label_button_pressed (GtkWidget *widget,
+static gboolean ac_label_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
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 folder_window_close_cb (GtkWidget *widget,
- GdkEventAny *event,
- gpointer data);
-static gint message_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 main_window_size_allocate_cb (GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data);
+static void folder_window_size_allocate_cb (GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data);
+static void message_window_size_allocate_cb (GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data);
static void new_folder_cb (MainWindow *mainwin,
guint action,
{N_("/_File/_Folder/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Folder/_Check for new messages in all folders"),
NULL, update_folderview_cb, 0, NULL},
- {N_("/_File/_Add mailbox..."), NULL, add_mailbox_cb, 0, NULL},
- {N_("/_File/_Add mbox mailbox..."), NULL, add_mbox_cb, 0, NULL},
+ {N_("/_File/_Add mailbox"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_File/_Add mailbox/MH..."), NULL, add_mailbox_cb, 0, NULL},
+ {N_("/_File/_Add mailbox/mbox..."), NULL, add_mbox_cb, 0, NULL},
{N_("/_File/_Import mbox file..."), NULL, import_mbox_cb, 0, NULL},
{N_("/_File/_Export to mbox file..."), NULL, export_mbox_cb, 0, NULL},
{N_("/_File/Empty _trash"), "<shift>D", empty_trash_cb, 0, NULL},
{N_("/_Help/_FAQ (Local)"), NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
{N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
+ {N_("/_Help/_Claws FAQ (Claws Documentation)"),
+ NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
{N_("/_Help/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(main_window_close_cb), mainwin);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
- GTK_SIGNAL_FUNC(mainwindow_focus_in_event),
- mainwin);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(mainwindow_key_pressed), mainwin);
+ g_signal_connect(G_OBJECT(window), "focus_in_event",
+ G_CALLBACK(mainwindow_focus_in_event),
+ mainwin);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(mainwindow_key_pressed), mainwin);
gtk_widget_realize(window);
gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
progressbar = gtk_progress_bar_new();
- gtk_widget_set_usize(progressbar, 120, 1);
+ gtk_widget_set_size_request(progressbar, 120, 1);
gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
offline_switch, _("Go online"), NULL);
gtk_container_add (GTK_CONTAINER(online_switch), online_pixmap);
gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
- gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+ g_signal_connect (G_OBJECT(online_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER(offline_switch), offline_pixmap);
gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
- gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+ g_signal_connect (G_OBJECT(offline_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
statuslabel = gtk_label_new("");
ac_button, _("Select account"), NULL);
gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
- gtk_widget_set_usize(ac_button, -1, 1);
+ gtk_widget_set_size_request(ac_button, -1, 1);
gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(ac_button), "button_press_event",
- GTK_SIGNAL_FUNC(ac_label_button_pressed), mainwin);
+ g_signal_connect(G_OBJECT(ac_button), "button_press_event",
+ G_CALLBACK(ac_label_button_pressed), mainwin);
ac_label = gtk_label_new("");
gtk_container_add(GTK_CONTAINER(ac_button), ac_label);
debug_print("done.\n");
- messageview->visible = TRUE;
+ messageview->visible = prefs_common.msgview_visible;
main_window_set_widgets(mainwin, type);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(main_window_size_allocate_cb),
+ mainwin);
+
/* set menu items */
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Code set/Auto detect");
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
(ifactory, "/Configuration/Change current account");
- gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
- GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
+ g_signal_connect(G_OBJECT(ac_menu), "selection_done",
+ G_CALLBACK(ac_menu_popup_closed), mainwin);
mainwin->ac_menu = ac_menu;
toolbar_main_set_sensitive(mainwin);
/* create actions menu */
- update_mainwin_actions_menu(ifactory, mainwin);
+ action_update_mainwin_menu(ifactory, mainwin);
/* attach accel groups to main window */
#define ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win) \
/* show main window */
- gtk_widget_set_uposition(mainwin->window,
- prefs_common.mainwin_x,
- prefs_common.mainwin_y);
- gtk_widget_set_usize(window, prefs_common.mainwin_width,
- prefs_common.mainwin_height);
gtk_widget_show(mainwin->window);
/* initialize views */
(ac_prefs->account_name
? ac_prefs->account_name : _("Untitled"));
gtk_widget_show(menuitem);
- gtk_menu_append(GTK_MENU(mainwin->ac_menu), menuitem);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(account_menu_cb),
- ac_prefs);
+ gtk_menu_shell_append(GTK_MENU_SHELL(mainwin->ac_menu),
+ menuitem);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(account_menu_cb),
+ ac_prefs);
}
}
}
g_free(ac_name);
}
+GtkWidget *main_window_get_folder_window(MainWindow *mainwin)
+{
+ switch (mainwin->type) {
+ case SEPARATE_FOLDER:
+ return mainwin->win.sep_folder.folderwin;
+ case SEPARATE_BOTH:
+ return mainwin->win.sep_both.folderwin;
+ default:
+ return NULL;
+ }
+}
+
+GtkWidget *main_window_get_message_window(MainWindow *mainwin)
+{
+ switch (mainwin->type) {
+ case SEPARATE_MESSAGE:
+ return mainwin->win.sep_message.messagewin;
+ case SEPARATE_BOTH:
+ return mainwin->win.sep_both.messagewin;
+ default:
+ return NULL;
+ }
+}
+
void main_window_separation_change(MainWindow *mainwin, SeparateType type)
{
GtkWidget *folder_wid = GTK_WIDGET_PTR(mainwin->folderview);
GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
- //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+ /* GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview); */
GtkWidget *message_wid = mainwin->messageview->vbox;
debug_print("Changing window separation type from %d to %d\n",
main_window_set_menu_sensitive(mainwin);
+ prefs_common.msgview_visible = mainwin->messageview->visible;
+
gtk_widget_grab_focus(summaryview->ctree);
}
allocation = &(GTK_WIDGET_PTR(mainwin->summaryview)->allocation);
- prefs_common.summaryview_width = allocation->width;
+ if (allocation->width > 1 && allocation->height > 1) {
+ prefs_common.summaryview_width = allocation->width;
- if ((mainwin->type == SEPARATE_NONE ||
- mainwin->type == SEPARATE_FOLDER) &&
- messageview_is_visible(mainwin->messageview))
- prefs_common.summaryview_height = allocation->height;
+ 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;
+ prefs_common.mainview_width = allocation->width;
+ }
allocation = &mainwin->window->allocation;
-
- prefs_common.mainview_height = allocation->height;
- prefs_common.mainwin_width = allocation->width;
- prefs_common.mainwin_height = allocation->height;
+ if (allocation->width > 1 && allocation->height > 1) {
+ prefs_common.mainview_height = allocation->height;
+ prefs_common.mainwin_width = allocation->width;
+ prefs_common.mainwin_height = allocation->height;
+ }
allocation = &(GTK_WIDGET_PTR(mainwin->folderview)->allocation);
+ if (allocation->width > 1 && allocation->height > 1) {
+ prefs_common.folderview_width = allocation->width;
+ prefs_common.folderview_height = allocation->height;
+ }
- prefs_common.folderview_width = allocation->width;
- prefs_common.folderview_height = allocation->height;
+ allocation = &(GTK_WIDGET_PTR(mainwin->messageview)->allocation);
+ if (allocation->width > 1 && allocation->height > 1) {
+ prefs_common.msgview_width = allocation->width;
+ prefs_common.msgview_height = allocation->height;
+ }
+
+ debug_print("summaryview size: %d x %d\n",
+ prefs_common.summaryview_width,
+ prefs_common.summaryview_height);
+ debug_print("folderview size: %d x %d\n",
+ prefs_common.folderview_width,
+ prefs_common.folderview_height);
+ debug_print("messageview size: %d x %d\n",
+ prefs_common.msgview_width,
+ prefs_common.msgview_height);
}
void main_window_get_position(MainWindow *mainwin)
{
gint x, y;
+ GtkWidget *window;
gtkut_widget_get_uposition(mainwin->window, &x, &y);
prefs_common.mainwin_x = x;
prefs_common.mainwin_y = y;
- debug_print("window position: x = %d, y = %d\n", x, y);
+ debug_print("main window position: %d, %d\n", x, y);
+
+ window = main_window_get_folder_window(mainwin);
+ if (window) {
+ gtkut_widget_get_uposition(window, &x, &y);
+ prefs_common.folderwin_x = x;
+ prefs_common.folderwin_y = y;
+ debug_print("folder window position: %d, %d\n", x, y);
+ }
+ window = main_window_get_message_window(mainwin);
+ if (window) {
+ gtkut_widget_get_uposition(window, &x, &y);
+ prefs_common.main_msgwin_x = x;
+ prefs_common.main_msgwin_y = y;
+ debug_print("message window position: %d, %d\n", x, y);
+ }
}
void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
for (has_trash = 0, list = folder_get_list(); list != NULL; list = list->next) {
folder = FOLDER(list->data);
- if (folder && folder->trash && folder->trash->total > 0)
+ if (folder && folder->trash && folder->trash->total_msgs > 0)
has_trash++;
}
path);
g_free(path);
- if (folder->class->create_tree(folder) < 0) {
+ if (folder->klass->create_tree(folder) < 0) {
alertpanel_error(_("Creation of the mailbox failed.\n"
"Maybe some files already exist, or you don't have the permission to write there."));
folder_destroy(folder);
g_basename(path), path);
g_free(path);
- if (folder->class->create_tree(folder) < 0) {
+ if (folder->klass->create_tree(folder) < 0) {
alertpanel_error(_("Creation of the mailbox failed."));
folder_destroy(folder);
return;
folder_add(folder);
- item = folder_item_new(folder, folder->name, NULL);
- item->folder = folder;
- folder->node = g_node_new(item);
-
- folder_create_folder(item, "inbox");
- folder_create_folder(item, "outbox");
- folder_create_folder(item, "queue");
- folder_create_folder(item, "draft");
- folder_create_folder(item, "trash");
-
folderview_set(mainwin->folderview);
}
if (selection == SUMMARY_SELECTED_SINGLE)
state |= M_SINGLE_TARGET_EXIST;
if (mainwin->summaryview->folder_item &&
- mainwin->summaryview->folder_item->folder->class->type == F_NEWS)
+ mainwin->summaryview->folder_item->folder->klass->type == F_NEWS)
state |= M_NEWS;
else
state |= M_NOT_NEWS;
SensitiveCond cond;
} entry[] = {
{"/File/Folder" , M_UNLOCKED},
- {"/File/Add mailbox..." , M_UNLOCKED},
- {"/File/Add mbox mailbox..." , M_UNLOCKED},
- {"/File/Import mbox file..." , M_UNLOCKED},
+ {"/File/Add mailbox" , M_UNLOCKED},
+
+ {"/File/Add mailbox/MH..." , M_UNLOCKED},
+ {"/File/Add mailbox/mbox..." , M_UNLOCKED},
{"/File/Export to mbox file..." , M_UNLOCKED},
{"/File/Empty trash" , M_UNLOCKED},
{"/File/Work offline" , M_UNLOCKED},
- {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/File/Save as...", M_TARGET_EXIST|M_UNLOCKED},
{"/File/Print..." , M_TARGET_EXIST|M_UNLOCKED},
/* {"/File/Close" , M_UNLOCKED}, */
{"/File/Exit" , M_UNLOCKED},
{"/View/Go to/Prev message" , 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},
}
}
+void main_window_show(MainWindow *mainwin)
+{
+ gtk_widget_show(mainwin->window);
+ gtk_widget_show(mainwin->vbox_body);
+
+ gtk_widget_set_uposition(mainwin->window,
+ prefs_common.mainwin_x,
+ prefs_common.mainwin_y);
+
+ gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->folderview),
+ prefs_common.folderview_width,
+ prefs_common.folderview_height);
+ gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
+ prefs_common.summaryview_width,
+ prefs_common.summaryview_height);
+ gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
+ prefs_common.msgview_width,
+ prefs_common.msgview_height);
+
+ if (mainwin->type & SEPARATE_FOLDER) {
+ GtkWidget *folderwin;
+
+ folderwin = main_window_get_folder_window(mainwin);
+ gtk_widget_show(folderwin);
+ gtk_widget_set_uposition(folderwin, prefs_common.folderwin_x,
+ prefs_common.folderwin_y);
+ }
+
+ if (mainwin->type & SEPARATE_MESSAGE) {
+ GtkWidget *messagewin;
+
+ messagewin = main_window_get_message_window(mainwin);
+ gtk_widget_show(messagewin);
+ gtk_widget_set_uposition(messagewin, prefs_common.main_msgwin_x,
+ prefs_common.main_msgwin_y);
+ }
+}
+
+void main_window_hide(MainWindow *mainwin)
+{
+ main_window_get_size(mainwin);
+ main_window_get_position(mainwin);
+
+ gtk_widget_hide(mainwin->window);
+ gtk_widget_hide(mainwin->vbox_body);
+
+ if (mainwin->type & SEPARATE_FOLDER) {
+ gtk_widget_hide(mainwin->win.sep_folder.folderwin);
+ }
+
+ if (mainwin->type & SEPARATE_MESSAGE) {
+ gtk_widget_hide(mainwin->win.sep_message.messagewin);
+ }
+}
+
static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
{
GtkWidget *folderwin = NULL;
GtkWidget *menuitem;
GtkItemFactory *msgview_ifactory;
- debug_print("Setting widgets...");
+ debug_print("Setting widgets... ");
/* create separated window(s) if needed */
if (type & SEPARATE_FOLDER) {
"folder_view", "Sylpheed");
gtk_window_set_policy(GTK_WINDOW(folderwin),
TRUE, TRUE, FALSE);
- gtk_widget_set_usize(folderwin, -1,
- prefs_common.mainview_height);
+ gtk_window_move(GTK_WINDOW(folderwin), prefs_common.folderwin_x,
+ prefs_common.folderwin_y);
gtk_container_set_border_width(GTK_CONTAINER(folderwin),
BORDER_WIDTH);
- gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
- GTK_SIGNAL_FUNC(folder_window_close_cb),
+ g_signal_connect(G_OBJECT(folderwin), "delete_event",
+ G_CALLBACK(folder_window_close_cb),
mainwin);
+ gtk_container_add(GTK_CONTAINER(folderwin),
+ GTK_WIDGET_PTR(mainwin->folderview));
+ gtk_widget_realize(folderwin);
+ if (prefs_common.folderview_visible)
+ gtk_widget_show(folderwin);
}
if (type & SEPARATE_MESSAGE) {
messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
"message_view", "Sylpheed");
gtk_window_set_policy(GTK_WINDOW(messagewin),
TRUE, TRUE, FALSE);
- gtk_widget_set_usize
- (messagewin, prefs_common.mainview_width,
- prefs_common.mainview_height
- - prefs_common.summaryview_height
- + DEFAULT_HEADERVIEW_HEIGHT);
+ gtk_window_move(GTK_WINDOW(messagewin), prefs_common.main_msgwin_x,
+ prefs_common.main_msgwin_y);
gtk_container_set_border_width(GTK_CONTAINER(messagewin),
BORDER_WIDTH);
- gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
- GTK_SIGNAL_FUNC(message_window_close_cb),
- mainwin);
+ g_signal_connect(G_OBJECT(messagewin), "delete_event",
+ G_CALLBACK(message_window_close_cb),
+ mainwin);
+ gtk_container_add(GTK_CONTAINER(messagewin),
+ GTK_WIDGET_PTR(mainwin->messageview));
+ gtk_widget_realize(messagewin);
+ if (messageview_is_visible(mainwin->messageview))
+ gtk_widget_show(messagewin);
}
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
+ prefs_common.folderview_width,
+ prefs_common.folderview_height);
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->summaryview),
+ prefs_common.summaryview_width,
+ prefs_common.summaryview_height);
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
+ prefs_common.msgview_width,
+ prefs_common.msgview_height);
+
switch (type) {
case SEPARATE_NONE:
hpaned = gtk_hpaned_new();
- gtk_widget_show(hpaned);
gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(hpaned),
GTK_WIDGET_PTR(mainwin->folderview));
+ gtk_widget_show(hpaned);
+ gtk_widget_queue_resize(hpaned);
vpaned = gtk_vpaned_new();
if (messageview_is_visible(mainwin->messageview)) {
GTK_WIDGET_PTR(mainwin->summaryview));
gtk_widget_ref(vpaned);
}
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
- prefs_common.summaryview_width,
- prefs_common.summaryview_height);
gtk_paned_add2(GTK_PANED(vpaned),
GTK_WIDGET_PTR(mainwin->messageview));
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
- prefs_common.mainview_width, -1);
- gtk_widget_set_usize(mainwin->window,
- prefs_common.folderview_width +
- prefs_common.mainview_width,
- prefs_common.mainwin_height);
- gtk_widget_show_all(vpaned);
-
- /* 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));
+ gtk_widget_show(vpaned);
+ gtk_widget_queue_resize(vpaned);
mainwin->win.sep_none.hpaned = hpaned;
mainwin->win.sep_none.vpaned = vpaned;
}
gtk_paned_add2(GTK_PANED(vpaned),
GTK_WIDGET_PTR(mainwin->messageview));
- gtk_widget_show_all(vpaned);
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
- prefs_common.summaryview_width,
- prefs_common.summaryview_height);
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
- prefs_common.mainview_width, -1);
- gtk_widget_set_usize(mainwin->window,
- prefs_common.mainview_width,
- prefs_common.mainview_height);
-
- gtk_container_add(GTK_CONTAINER(folderwin),
- GTK_WIDGET_PTR(mainwin->folderview));
+ gtk_widget_show(vpaned);
+ gtk_widget_queue_resize(vpaned);
mainwin->win.sep_folder.folderwin = folderwin;
mainwin->win.sep_folder.vpaned = vpaned;
- gtk_widget_show_all(folderwin);
-
- /* 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));
-
/* remove headerview if not in prefs */
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
case SEPARATE_MESSAGE:
hpaned = gtk_hpaned_new();
gtk_box_pack_start(GTK_BOX(vbox_body), hpaned, TRUE, TRUE, 0);
-
gtk_paned_add1(GTK_PANED(hpaned),
GTK_WIDGET_PTR(mainwin->folderview));
gtk_paned_add2(GTK_PANED(hpaned),
GTK_WIDGET_PTR(mainwin->summaryview));
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
- prefs_common.summaryview_width,
- prefs_common.summaryview_height);
- gtk_widget_set_usize(mainwin->window,
- prefs_common.folderview_width +
- prefs_common.mainview_width,
- prefs_common.mainwin_height);
- gtk_widget_show_all(hpaned);
-
+ gtk_widget_show(hpaned);
+ gtk_widget_queue_resize(hpaned);
messageview_add_toolbar(mainwin->messageview, messagewin);
msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
menu_set_sensitive(msgview_ifactory, "/File/Close", 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_WIDGET_PTR(mainwin->summaryview),
TRUE, TRUE, 0);
- gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
- prefs_common.summaryview_width,
- prefs_common.summaryview_height);
- gtk_widget_set_usize(mainwin->window,
- prefs_common.mainview_width,
- prefs_common.mainwin_height);
- gtk_container_add(GTK_CONTAINER(folderwin),
- GTK_WIDGET_PTR(mainwin->folderview));
- gtk_container_add(GTK_CONTAINER(messagewin),
- GTK_WIDGET_PTR(mainwin->messageview));
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;
}
+ gtk_window_move(GTK_WINDOW(mainwin->window),
+ prefs_common.mainwin_x,
+ prefs_common.mainwin_y);
+
+ gtk_widget_queue_resize(vbox_body);
+ gtk_widget_queue_resize(mainwin->vbox);
+ gtk_widget_queue_resize(mainwin->window);
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * and mimeview icon list/ctree lose track of their visibility states */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mainwin->messageview->mimeview->mime_toggle)))
+ gtk_widget_hide(mainwin->messageview->mimeview->icon_mainbox);
+ else
+ gtk_widget_hide(mainwin->messageview->mimeview->ctree_mainbox);
+
/* rehide quick search if necessary */
if (!prefs_common.show_searchbar)
gtk_widget_hide(mainwin->summaryview->hbox_search);
mainwin->type = type;
- 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);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ (type & SEPARATE_FOLDER) == 0 ? TRUE :
+ prefs_common.folderview_visible);
+ gtk_widget_set_sensitive(menuitem, ((type & SEPARATE_FOLDER) != 0));
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);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ (type & SEPARATE_MESSAGE) == 0 ? TRUE :
+ prefs_common.msgview_visible);
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Separate folder tree");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
((type & SEPARATE_MESSAGE) != 0));
+ if (folderwin) {
+ g_signal_connect
+ (G_OBJECT(folderwin), "size_allocate",
+ G_CALLBACK(folder_window_size_allocate_cb),
+ mainwin);
+ }
+ if (messagewin) {
+ g_signal_connect
+ (G_OBJECT(messagewin), "size_allocate",
+ G_CALLBACK(message_window_size_allocate_cb),
+ mainwin);
+ }
+
debug_print("done.\n");
}
}
#if 0
-static void toolbar_account_button_pressed(GtkWidget *widget,
- GdkEventButton *event,
- gpointer data)
+static gboolean toolbar_account_button_pressed(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
- if (!event) return;
- if (event->button != 3) return;
+ if (!event) return FALSE;
+ if (event->button != 3) return FALSE;
gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
- gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
- widget);
+ g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button",
+ widget);
gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+
+ return FALSE;
}
#endif
-static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
- gpointer data)
+static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
+ gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
- if (!event) return;
+ if (!event) return FALSE;
gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
- gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
- widget);
+ g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button",
+ widget);
gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
menu_button_position, widget,
event->button, event->time);
+
+ return TRUE;
}
static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
MainWindow *mainwin = (MainWindow *)data;
GtkWidget *button;
- button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+ button = g_object_get_data(G_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");
+ g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button", NULL);
manage_window_focus_in(mainwin->window, NULL, NULL);
}
return TRUE;
}
+static void main_window_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ main_window_get_size(mainwin);
+}
+
+static void folder_window_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ main_window_get_size(mainwin);
+}
+
+static void message_window_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ main_window_get_size(mainwin);
+}
+
static void add_mailbox_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
gtk_widget_hide(mainwin->win.sep_both.folderwin);
break;
}
+
+ prefs_common.folderview_visible = active;
}
static void toggle_message_cb(MainWindow *mainwin, guint action,
projects / claws.git / blobdiff