/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2009 Hiroyuki Yamamoto & 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/>.
+ *
*/
#ifdef HAVE_CONFIG_H
GtkWidget *spinbtn_linewrap;
GtkWidget *checkbtn_wrapquote;
+ GtkWidget *checkbtn_wrappastes;
GtkWidget *checkbtn_autowrap;
- GtkWidget *checkbtn_wrapatsend;
+ GtkWidget *checkbtn_autoindent;
} WrappingPage;
-void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
WrappingPage *prefs_wrapping = (WrappingPage *) _page;
- GtkWidget *table;
+ GtkWidget *vbox1;
+ GtkWidget *vbox2;
GtkWidget *label_linewrap;
GtkObject *spinbtn_linewrap_adj;
GtkWidget *spinbtn_linewrap;
GtkWidget *checkbtn_wrapquote;
+ GtkWidget *checkbtn_wrappastes;
GtkWidget *checkbtn_autowrap;
- GtkWidget *checkbtn_wrapatsend;
+ GtkWidget *checkbtn_autoindent;
GtkWidget *hbox1;
- table = gtk_table_new(8, 3, FALSE);
- gtk_widget_show(table);
- gtk_container_set_border_width(GTK_CONTAINER(table), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
- checkbtn_autowrap = gtk_check_button_new_with_label(_("Wrap on input"));
- gtk_widget_show (checkbtn_autowrap);
- gtk_table_attach (GTK_TABLE (table), checkbtn_autowrap, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- checkbtn_wrapatsend = gtk_check_button_new_with_label(_("Wrap before sending"));
- gtk_widget_show (checkbtn_wrapatsend);
- gtk_table_attach (GTK_TABLE (table), checkbtn_wrapatsend, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- checkbtn_wrapquote = gtk_check_button_new_with_label(_("Wrap quotation"));
- gtk_widget_show (checkbtn_wrapquote);
- gtk_table_attach (GTK_TABLE (table), checkbtn_wrapquote, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- hbox1 = gtk_hbox_new (FALSE, 0);
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_widget_show (vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_autowrap, _("Auto wrapping"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_wrapquote, _("Wrap quotation"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_wrappastes, _("Wrap pasted text"));
+ PACK_CHECK_BUTTON (vbox2, checkbtn_autoindent, _("Auto indent"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_table_attach (GTK_TABLE (table), hbox1, 0, 1, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
- label_linewrap = gtk_label_new (_("Wrap messages at"));
+ label_linewrap = gtk_label_new (_("Wrap text at"));
gtk_widget_show (label_linewrap);
gtk_box_pack_start (GTK_BOX (hbox1), label_linewrap, FALSE, FALSE, 4);
- spinbtn_linewrap_adj = gtk_adjustment_new (72, 20, 1024, 1, 10, 10);
+ spinbtn_linewrap_adj = gtk_adjustment_new (72, 20, 1024, 1, 10, 0);
spinbtn_linewrap = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_linewrap_adj), 1, 0);
+ gtk_widget_set_size_request (spinbtn_linewrap, 64, -1);
gtk_widget_show (spinbtn_linewrap);
gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_linewrap, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_linewrap), TRUE);
label_linewrap = gtk_label_new (_("characters"));
gtk_widget_show (label_linewrap);
gtk_box_pack_start (GTK_BOX (hbox1), label_linewrap, FALSE, FALSE, 0);
-
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_autowrap),
prefs_common.autowrap);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_wrapatsend),
- prefs_common.linewrap_at_send);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_wrapquote),
prefs_common.linewrap_quote);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_wrappastes),
+ prefs_common.linewrap_pastes);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_autoindent),
+ prefs_common.auto_indent);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_linewrap),
prefs_common.linewrap_len);
prefs_wrapping->window = GTK_WIDGET(window);
prefs_wrapping->spinbtn_linewrap = spinbtn_linewrap;
prefs_wrapping->checkbtn_wrapquote = checkbtn_wrapquote;
+ prefs_wrapping->checkbtn_wrappastes = checkbtn_wrappastes;
prefs_wrapping->checkbtn_autowrap = checkbtn_autowrap;
- prefs_wrapping->checkbtn_wrapatsend = checkbtn_wrapatsend;
+ prefs_wrapping->checkbtn_autoindent = checkbtn_autoindent;
- prefs_wrapping->page.widget = table;
+ prefs_wrapping->page.widget = vbox1;
}
-void prefs_wrapping_save(PrefsPage *_page)
+static void prefs_wrapping_save(PrefsPage *_page)
{
WrappingPage *page = (WrappingPage *) _page;
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->spinbtn_linewrap));
prefs_common.linewrap_quote =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrapquote));
+ prefs_common.linewrap_pastes =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrappastes));
prefs_common.autowrap =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autowrap));
- prefs_common.linewrap_at_send =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_wrapatsend));
+ prefs_common.auto_indent =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autoindent));
}
static void prefs_wrapping_destroy_widget(PrefsPage *_page)
static gchar *path[3];
path[0] = _("Compose");
- path[1] = _("Message Wrapping");
+ path[1] = _("Wrapping");
path[2] = NULL;
page = g_new0(WrappingPage, 1);
page->page.create_widget = prefs_wrapping_create_widget;
page->page.destroy_widget = prefs_wrapping_destroy_widget;
page->page.save_page = prefs_wrapping_save;
- page->page.weight = 60.0;
+ page->page.weight = 182.0;
prefs_gtk_register_page((PrefsPage *) page);
prefs_wrapping = page;
}
projects / claws.git / blobdiff