/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
-#include "intl.h"
+#include "defs.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+
#include "foldersort.h"
#include "inc.h"
#include "utils.h"
set_selected(dialog, dialog->selected + 1);
}
+static gint delete_event(GtkWidget *widget, GdkEventAny *event, FolderSortDialog *dialog)
+{
+ destroy_dialog(dialog);
+ return TRUE;
+}
+
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, FolderSortDialog *dialog)
+{
+ if (event && event->keyval == GDK_Escape)
+ destroy_dialog(dialog);
+ return FALSE;
+}
+
void foldersort_open()
{
FolderSortDialog *dialog = g_new0(FolderSortDialog, 1);
GList *flist;
- /* BEGIN GLADE CODE */
-
GtkWidget *window;
- GtkWidget *table1;
+ GtkWidget *vbox;
+ GtkWidget *vbox1;
GtkWidget *label1;
- GtkWidget *hbuttonbox1;
+ GtkWidget *hbox;
+ GtkWidget *hbox2;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *vbox1;
+ GtkWidget *confirm_area;
GtkWidget *moveup_btn;
- GtkWidget *arrow1;
GtkWidget *movedown_btn;
- GtkWidget *arrow2;
+ GtkWidget *btn_vbox;
GtkWidget *scrolledwindow1;
GtkWidget *folderlist;
GtkWidget *label2;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "foldersort");
g_object_set_data(G_OBJECT(window), "window", window);
- gtk_container_set_border_width(GTK_CONTAINER(window), 4);
- gtk_window_set_title(GTK_WINDOW(window),
- _("Set folder sortorder"));
+ gtk_container_set_border_width(GTK_CONTAINER(window), 8);
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_title(GTK_WINDOW(window), _("Set folder order"));
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_default_size(GTK_WINDOW(window), 400, 300);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(delete_event), dialog);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(key_pressed), dialog);
+
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_widget_show(vbox);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+
+ gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
+ gtk_widget_show(confirm_area);
+ gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
+ gtk_widget_grab_focus(ok_btn);
- table1 = gtk_table_new(3, 2, FALSE);
- gtk_widget_show(table1);
- gtk_container_add(GTK_CONTAINER(window), table1);
- gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table1), 4);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(ok_clicked), dialog);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(cancel_clicked), dialog);
- label1 =
- gtk_label_new(_
- ("Move folders up or down to change\nthe sort order in the folderview"));
- gtk_widget_show(label1);
- gtk_table_attach(GTK_TABLE(table1), label1, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5);
-
- hbuttonbox1 = gtk_hbutton_box_new();
- gtk_widget_show(hbuttonbox1);
- gtk_table_attach(GTK_TABLE(table1), hbuttonbox1, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1),
- GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 0);
- gtk_button_box_set_child_size(GTK_BUTTON_BOX(hbuttonbox1), 0, 0);
- gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX(hbuttonbox1), 0,
- 0);
-
- ok_btn = gtk_button_new_with_label(_("Ok"));
- gtk_widget_show(ok_btn);
- gtk_container_add(GTK_CONTAINER(hbuttonbox1), ok_btn);
- GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
-
- cancel_btn = gtk_button_new_with_label(_("Cancel"));
- gtk_widget_show(cancel_btn);
- gtk_container_add(GTK_CONTAINER(hbuttonbox1), cancel_btn);
- GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
-
- vbox1 = gtk_vbox_new(FALSE, 0);
+ vbox1 = gtk_vbox_new(FALSE, 8);
gtk_widget_show(vbox1);
- gtk_table_attach(GTK_TABLE(table1), vbox1, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- moveup_btn = gtk_button_new();
- gtk_widget_show(moveup_btn);
- gtk_box_pack_start(GTK_BOX(vbox1), moveup_btn, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
- arrow1 = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
- gtk_widget_show(arrow1);
- gtk_container_add(GTK_CONTAINER(moveup_btn), arrow1);
+ hbox = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox);
+ gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
- movedown_btn = gtk_button_new();
- gtk_widget_show(movedown_btn);
- gtk_box_pack_start(GTK_BOX(vbox1), movedown_btn, FALSE, FALSE, 0);
+ label1 = gtk_label_new(_
+ ("Move folders up or down to change the sort order "
+ "in the folder list."));
+ gtk_widget_show(label1);
+ gtk_widget_set_size_request(GTK_WIDGET(label1), 392, -1);
+ gtk_label_set_line_wrap(GTK_LABEL(label1), TRUE);
+ gtk_box_pack_start(GTK_BOX(hbox), label1, FALSE, FALSE, 0);
- arrow2 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_widget_show(arrow2);
- gtk_container_add(GTK_CONTAINER(movedown_btn), arrow2);
+ hbox2 = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox2);
+ gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, TRUE, 0);
scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwindow1);
- gtk_table_attach(GTK_TABLE(table1), scrolledwindow1, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW
- (scrolledwindow1),
+ gtk_widget_set_size_request(scrolledwindow1, -1, 150);
+ gtk_box_pack_start(GTK_BOX(hbox2), scrolledwindow1,
+ TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolledwindow1),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5);
- /* END GLADE CODE */
+ btn_vbox = gtk_vbox_new(FALSE, 8);
+ gtk_widget_show(btn_vbox);
+ gtk_box_pack_start(GTK_BOX(hbox2), btn_vbox, FALSE, FALSE, 0);
+
+ moveup_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+ gtk_widget_show(moveup_btn);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), moveup_btn, FALSE, FALSE, 0);
+
+ movedown_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+ gtk_widget_show(movedown_btn);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), movedown_btn, FALSE, FALSE, 0);
dialog->window = window;
dialog->moveup_btn = moveup_btn;
gtk_widget_set_sensitive(movedown_btn, FALSE);
gtk_clist_set_reorderable(GTK_CLIST(folderlist), TRUE);
- g_signal_connect(G_OBJECT(ok_btn), "clicked",
- G_CALLBACK(ok_clicked), dialog);
- g_signal_connect(G_OBJECT(cancel_btn), "clicked",
- G_CALLBACK(cancel_clicked), dialog);
g_signal_connect(G_OBJECT(moveup_btn), "clicked",
G_CALLBACK(moveup_clicked), dialog);
g_signal_connect(G_OBJECT(movedown_btn), "clicked",