GtkWidget *child,
gpointer data);
-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,
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
+static gboolean main_window_accel_activate (GtkAccelGroup *accelgroup,
+ GObject *arg1,
+ guint value,
+ GdkModifierType mod,
+ gpointer user_data)
+{
+ MainWindow *mainwin = (MainWindow *)user_data;
+
+ if (mainwin->summaryview &&
+ mainwin->summaryview->quicksearch &&
+ quicksearch_has_focus(mainwin->summaryview->quicksearch) &&
+ (mod == 0 || mod == GDK_SHIFT_MASK)) {
+ quicksearch_pass_key(mainwin->summaryview->quicksearch, value, mod);
+ return TRUE;
+ }
+ return FALSE;
+}
+
MainWindow *main_window_create(SeparateType type)
{
MainWindow *mainwin;
GtkWidget *menuitem;
gint i;
guint n_menu_entries;
+ gboolean hide_messageview = FALSE;
static GdkGeometry geometry;
/* main window */
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
- gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
- gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
if (!geometry.min_height) {
geometry.min_width = 320;
handlebox = gtk_handle_box_new();
gtk_widget_show(handlebox);
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(handlebox), "child_attached",
- GTK_SIGNAL_FUNC(toolbar_child_attached), mainwin);
- gtk_signal_connect(GTK_OBJECT(handlebox), "child_detached",
- GTK_SIGNAL_FUNC(toolbar_child_detached), mainwin);
+ g_signal_connect(G_OBJECT(handlebox), "child_attached",
+ G_CALLBACK(toolbar_child_attached), mainwin);
+ g_signal_connect(G_OBJECT(handlebox), "child_detached",
+ G_CALLBACK(toolbar_child_detached), mainwin);
/* link window to mainwin->window to avoid gdk warnings */
mainwin->window = window;
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_size_request(ac_button, -1, 1);
+ gtk_widget_set_size_request(ac_button, -1, 0);
gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(ac_button), "button_press_event",
G_CALLBACK(ac_label_button_pressed), mainwin);
debug_print("done.\n");
messageview->visible = prefs_common.msgview_visible;
-
+ hide_messageview = !messageview->visible;
+
main_window_set_widgets(mainwin, type);
g_signal_connect(G_OBJECT(window), "size_allocate",
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
- gtk_widget_hide(GTK_WIDGET(mainwin->summaryview->hbox_search));
-
- if (prefs_common.show_searchbar) {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mainwin->summaryview->toggle_search), TRUE);
- if (prefs_common.summary_quicksearch_type != S_SEARCH_EXTENDED)
- gtk_widget_hide(summaryview->search_description);
- }
-
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
(ifactory, "/Configuration/Change current account");
main_window_update_actions_menu(mainwin);
/* attach accel groups to main window */
-#define ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win) \
- gtk_window_add_accel_group \
- (GTK_WINDOW(win), \
- gtk_item_factory_from_widget(menu)->accel_group)
+#define ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win) \
+ gtk_window_add_accel_group \
+ (GTK_WINDOW(win), \
+ gtk_item_factory_from_widget(menu)->accel_group); \
+ g_signal_connect(G_OBJECT(gtk_item_factory_from_widget(menu)->accel_group), \
+ "accel_activate", \
+ G_CALLBACK(main_window_accel_activate), mainwin);
+
- ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu,mainwin->window);
+ ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu, mainwin->window);
/* connect the accelerators for equivalent
menu items in different menus */
if (prefs_common.work_offline)
online_switch_clicked (GTK_BUTTON(online_switch), mainwin);
+ if (mainwin->type == SEPARATE_NONE && hide_messageview)
+ main_window_toggle_message_view(mainwin);
+
return mainwin;
}
? 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_selector_menu_cb),
- ac_prefs);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(account_selector_menu_cb),
+ ac_prefs);
}
}
: _("Untitled"));
gtk_widget_show(menuitem);
gtk_menu_append(GTK_MENU(menu), menuitem);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(account_receive_menu_cb),
- ac_prefs);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(account_receive_menu_cb),
+ ac_prefs);
}
}
prefs_common.msgview_height = allocation->height;
}
- debug_print("summaryview size: %d x %d\n",
+/* 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_height);
debug_print("messageview size: %d x %d\n",
prefs_common.msgview_width,
- prefs_common.msgview_height);
+ prefs_common.msgview_height); */
}
void main_window_get_position(MainWindow *mainwin)
void main_window_progress_on(MainWindow *mainwin)
{
- gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), TRUE);
- gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
}
void main_window_progress_off(MainWindow *mainwin)
{
- gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), FALSE);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
- gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
}
void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
gchar buf[32];
g_snprintf(buf, sizeof(buf), "%d / %d", cur, total);
- gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), buf);
- gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar),
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), buf);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar),
(cur == 0 && total == 0) ? 0 :
(gfloat)cur / (gfloat)total);
}
folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(folderwin),
_("Sylpheed - Folder View"));
- gtk_window_set_wmclass(GTK_WINDOW(folderwin),
- "folder_view", "Sylpheed");
- gtk_window_set_policy(GTK_WINDOW(folderwin),
- TRUE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW(folderwin), TRUE);
gtk_window_move(GTK_WINDOW(folderwin), prefs_common.folderwin_x,
prefs_common.folderwin_y);
gtk_container_set_border_width(GTK_CONTAINER(folderwin),
messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(messagewin),
_("Sylpheed - Message View"));
- gtk_window_set_wmclass(GTK_WINDOW(messagewin),
- "message_view", "Sylpheed");
- gtk_window_set_policy(GTK_WINDOW(messagewin),
- TRUE, TRUE, FALSE);
- gtk_window_move(GTK_WINDOW(messagewin), prefs_common.main_msgwin_x,
+ gtk_window_set_resizable(GTK_WINDOW(messagewin), TRUE);
+ gtk_window_move(GTK_WINDOW(messagewin),
+ prefs_common.main_msgwin_x,
prefs_common.main_msgwin_y);
+ gtk_widget_set_size_request(messagewin,
+ prefs_common.msgwin_width,
+ prefs_common.msgwin_height);
gtk_container_set_border_width(GTK_CONTAINER(messagewin),
BORDER_WIDTH);
g_signal_connect(G_OBJECT(messagewin), "delete_event",
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;
gtk_widget_set_usize(child, -1, -1);
}
-static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
+static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
GtkWidget *widget)
{
if (!mainwin->summaryview->folder_item
- || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+ || g_object_get_data(G_OBJECT(widget), "dont_toggle"))
return;
summary_toggle_show_read_messages(mainwin->summaryview);
}
summary_sort(mainwin->summaryview, (FolderSortKey)action,
GTK_CHECK_MENU_ITEM(menuitem)->active
? SORT_ASCENDING : SORT_DESCENDING);
+ item->sort_key = action;
}
}
{
MainWindow *mainwin = (MainWindow*) data;
- if (!mainwin || !event) return;
-
+ if (!mainwin || !event)
+ return FALSE;
+
+ if (quicksearch_has_focus(mainwin->summaryview->quicksearch))
+ return FALSE;
+
switch (event->keyval) {
case GDK_Q: /* Quit */
BREAK_ON_MODIFIER_KEY();
app_exit_cb(mainwin, 0, NULL);
- return;
+ return FALSE;
case GDK_space:
if (mainwin->folderview && mainwin->summaryview
&& !mainwin->summaryview->displayed) {
switch (data->cmd) {
case PROGRESS_COMMAND_START:
case PROGRESS_COMMAND_STOP:
- gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), 0.0);
+ gtk_progress_bar_set_fraction
+ (GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
break;
case PROGRESS_COMMAND_SET_PERCENTAGE:
- gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), data->value);
+ gtk_progress_bar_set_fraction
+ (GTK_PROGRESS_BAR(mainwin->progressbar), data->value);
break;
}
while (gtk_events_pending()) gtk_main_iteration ();
projects / claws.git / blobdiff