CVS: sylpheed-claws/src prefs_message.c,1.1.2.13,1.1.2.14 prefs_receive.c,1.1.2.8,1.1.2.9

Paul Mangan <[email protected]>
Newsgroups gmane.mail.sylpheed.claws.cvs
Message-ID <[email protected]> 
Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19099/src

Modified Files:
      Tag: gtk2
	prefs_message.c prefs_receive.c 
Log Message:
2006-04-28 [paul]	2.1.1cvs40

	* src/prefs_message.c
	* src/prefs_receive.c
		GUI cleanups
		Patches by Pawel Pekala 

Index: prefs_message.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/Attic/prefs_message.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- prefs_message.c	4 Mar 2006 08:44:20 -0000	1.1.2.13
+++ prefs_message.c	28 Apr 2006 08:58:36 -0000	1.1.2.14
@@ -90,7 +90,7 @@
 	GtkObject *spinbtn_linespc_adj;
 	GtkWidget *spinbtn_linespc;
 
-	GtkWidget *frame_scr;
+	GtkWidget *frame;
 	GtkWidget *vbox_scr;
 	GtkWidget *chkbtn_smoothscroll;
 	GtkWidget *hbox_scr;
@@ -105,9 +105,12 @@
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
+	PACK_FRAME(vbox1, frame, _("Headers"));
+	
 	vbox2 = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(frame), vbox2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
 
 	PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
 			  _("Display header pane above message view"));
@@ -133,7 +136,11 @@
 	PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
 			  _("Display short headers on message view"));
 
+#if GTK_CHECK_VERSION(2, 6, 0)
+	button_edit_disphdr = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+#else
 	button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
+#endif
 	gtk_widget_show (button_edit_disphdr);
 	gtk_box_pack_start (GTK_BOX (hbox1), button_edit_disphdr,
 			  FALSE, TRUE, 0);
@@ -143,15 +150,19 @@
 
 	SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
 
+	PACK_FRAME(vbox1, frame, _("HTML messages"));
+	
+	vbox2 = gtk_vbox_new (FALSE, 0);
+	gtk_widget_show (vbox2);
+	gtk_container_add(GTK_CONTAINER(frame), vbox2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+
 	PACK_CHECK_BUTTON(vbox2, chkbtn_html,
 			  _("Render HTML messages as text"));
 
 	PACK_CHECK_BUTTON(vbox2, chkbtn_html_plugin,
 			  _("Render HTML-only messages with plugin if possible"));
 
-	PACK_CHECK_BUTTON(vbox2, chkbtn_attach_desc,
-			  _("Show attachment descriptions (rather than names)"));
-
 	hbox1 = gtk_hbox_new (FALSE, 32);
 	gtk_widget_show (hbox1);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
@@ -179,11 +190,11 @@
 	gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
 			    FALSE, FALSE, 0);
 
-	PACK_FRAME(vbox1, frame_scr, _("Scroll"));
+	PACK_FRAME(vbox1, frame, _("Scroll"));
 
 	vbox_scr = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox_scr);
-	gtk_container_add (GTK_CONTAINER (frame_scr), vbox_scr);
+	gtk_container_add (GTK_CONTAINER (frame), vbox_scr);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_scr), 8);
 
 	PACK_CHECK_BUTTON(vbox_scr, chkbtn_halfpage, _("Half page"));
@@ -218,6 +229,9 @@
 
 	SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
 
+	PACK_CHECK_BUTTON(vbox1, chkbtn_attach_desc,
+			  _("Show attachment descriptions (rather than names)"));
+
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane),
 		prefs_common.display_header_pane);
 

Index: prefs_receive.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/Attic/prefs_receive.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- prefs_receive.c	9 Mar 2006 11:30:26 -0000	1.1.2.8
+++ prefs_receive.c	28 Apr 2006 08:58:36 -0000	1.1.2.9
@@ -99,14 +99,13 @@
 	GtkWidget *checkbtn_openinbox;
 	GtkWidget *checkbtn_scan_after_inc;
 
-	GtkWidget *frame_newmail;
+	GtkWidget *frame;
 	GtkWidget *hbox_newmail_notify;
 	GtkWidget *checkbtn_newmail_auto;
 	GtkWidget *checkbtn_newmail_manu;
 	GtkWidget *entry_newmail_notify_cmd;
 	GtkWidget *label_newmail_notify_cmd;
 
-	GtkWidget *table;
 	GtkWidget *label_recvdialog;
 	GtkWidget *menu;
 	GtkWidget *menuitem;
@@ -118,11 +117,13 @@
 	gtk_widget_show (vbox1);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
+	/* Use of external incorporation program */
+	PACK_FRAME(vbox1, frame, _("External incorporation program"));
 	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
 	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(frame), vbox2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
 
-	/* Use of external incorporation program */
 	PACK_CHECK_BUTTON (vbox2, checkbtn_incext,
 			   _("Use external program for receiving mail"));
 
@@ -139,11 +140,13 @@
 	gtk_widget_show (entry_incext);
 	gtk_box_pack_start (GTK_BOX (hbox), entry_incext, TRUE, TRUE, 0);
 
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
 	/* Auto-checking */
+	PACK_FRAME(vbox1, frame, _("Automatic checking"));	
+	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+	gtk_widget_show (vbox2);
+	gtk_container_add(GTK_CONTAINER(frame), vbox2);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
+	
 	hbox_autochk = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox_autochk);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0);
@@ -173,30 +176,20 @@
 
 	PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup,
 			   _("Check for new mail on startup"));
-	PACK_CHECK_BUTTON (vbox2, checkbtn_openinbox,
-		 	   _("Go to inbox after receiving new mail"));
-	PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
-			   _("Update all local folders after receiving mail"));
 
 	/* receive dialog */
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_widget_show(table);
-	gtk_container_add (GTK_CONTAINER (vbox2), table);
-	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-	gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-
+	PACK_FRAME(vbox1, frame, _("Dialogs"));
+	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+	gtk_widget_show (vbox2);
+	gtk_container_add (GTK_CONTAINER (frame), vbox2);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+	
 	label_recvdialog = gtk_label_new (_("Show receive dialog"));
 	gtk_misc_set_alignment(GTK_MISC(label_recvdialog), 0, 0.5);
 	gtk_widget_show (label_recvdialog);
-	gtk_table_attach(GTK_TABLE(table), label_recvdialog, 0, 1, 0, 1,
-			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
 
 	optmenu_recvdialog = gtk_option_menu_new ();
 	gtk_widget_show (optmenu_recvdialog);
-	gtk_table_attach(GTK_TABLE(table), optmenu_recvdialog, 1, 2, 0, 1,
-			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
 
 	menu = gtk_menu_new ();
 	MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
@@ -206,25 +199,32 @@
 
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
 
+	hbox = gtk_hbox_new(FALSE, 20);
+	gtk_widget_show(hbox);
+	gtk_box_pack_start(GTK_BOX(hbox), label_recvdialog, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), optmenu_recvdialog, FALSE, FALSE, 0);
+	
+	gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
+	
+	PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
+			   _("Close receive dialog when finished"));
+
 	PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
 			   _("Don't popup error dialog on receive error"));
 
-	PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
-			   _("Close receive dialog when finished"));
-	
-	PACK_FRAME(vbox1, frame_newmail, _("Run command when new mail "
+	PACK_FRAME(vbox1, frame, _("Run command when new mail "
 					   "arrives"));
 	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
 	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (frame_newmail), vbox2);
+	gtk_container_add (GTK_CONTAINER (frame), vbox2);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
 	hbox = gtk_hbox_new (TRUE, 8);
 	gtk_widget_show (hbox);
 	PACK_CHECK_BUTTON (hbox, checkbtn_newmail_auto,
-			   _("after autochecking"));
+			   _("after automatic check"));
 	PACK_CHECK_BUTTON (hbox, checkbtn_newmail_manu,
-			   _("after manual checking"));
+			   _("after manual check"));
 	gtk_box_pack_start (GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
 
 	hbox_newmail_notify = gtk_hbox_new (FALSE, 8);
@@ -250,6 +250,15 @@
 				 prefs_common.newmail_notify_auto || 
 				 prefs_common.newmail_notify_manu);
 
+	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_openinbox,
+		 	   _("Go to inbox after receiving new mail"));
+	PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
+			   _("Update all local folders after receiving mail"));
+			   
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_incext),
 		prefs_common.use_extinc);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_no_recv_err_panel),



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.