sylpheedclaws/sylpheed-claws/src summaryview.c,1.395.2.218,1.395.2.219 prefs_common.c,1.204.2.87,1.204.2.88 prefs_common.h,1.103.2.50,1.103.2.51 gedit-print.c,1.1.2.5,1.1.2.6 prefs_fonts.c,1.4.2.15,1.4.2.16

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv11077/src

Modified Files:
      Tag: gtk2
	summaryview.c prefs_common.c prefs_common.h gedit-print.c 
	prefs_fonts.c 
Log Message:
2006-06-12 [colin]	2.3.0cvs4

	* src/summaryview.c
	* src/prefs_common.c
	* src/prefs_common.h
	* src/gedit-print.c
		Allow to define a specific print font - patch
		by Bernhard Walle <[email protected]>
	* src/prefs_fonts.c
	* manual/advanced.xml
	* manual/fr/advanced.xml
		Add a hidden pref to allow deletion without
		confirmation

Index: summaryview.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/summaryview.c,v
retrieving revision 1.395.2.218
retrieving revision 1.395.2.219
diff -u -d -r1.395.2.218 -r1.395.2.219
--- summaryview.c	2006/06/09 15:05:27	1.395.2.218
+++ summaryview.c	2006/06/12 16:05:55	1.395.2.219
@@ -3479,10 +3479,12 @@
 
 	if (!summaryview->folder_item) return;
 
-	aval = alertpanel(_("Delete message(s)"),
-			  _("Do you really want to delete selected message(s)?"),
-			  GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
-	if (aval != G_ALERTALTERNATE) return;
+	if (!prefs_common.live_dangerously) {
+		aval = alertpanel(_("Delete message(s)"),
+				  _("Do you really want to delete selected message(s)?"),
+				  GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+		if (aval != G_ALERTALTERNATE) return;
+	}
 
 	for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
 	     cur = cur->next) {

Index: prefs_common.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.c,v
retrieving revision 1.204.2.87
retrieving revision 1.204.2.88
diff -u -d -r1.204.2.87 -r1.204.2.88
--- prefs_common.c	2006/06/01 17:14:25	1.204.2.87
+++ prefs_common.c	2006/06/12 16:05:57	1.204.2.88
@@ -95,6 +95,8 @@
 	  &prefs_common.widgetfont,		P_STRING, NULL, NULL, NULL},
 	{"message_font_gtk2",	"Monospace 9",
 	 &prefs_common.textfont,		P_STRING, NULL, NULL, NULL},
+        {"print_font_gtk2",     "Monospace 9"
+         &prefs_common.printfont
 	{"small_font_gtk2",	"Sans 9",
 	  &prefs_common.smallfont,		P_STRING, NULL, NULL, NULL},
 	{"normal_font_gtk2",	"Sans 9",
@@ -280,6 +282,8 @@
 	  &SPECIFIC_PREFS.widgetfont,		P_STRING, NULL, NULL, NULL},
 	{"message_font_gtk2",	"Monospace 9",
 	 &SPECIFIC_PREFS.textfont,			P_STRING, NULL, NULL, NULL},
+        {"print_font_gtk2",     "Monospace 9",
+         &SPECIFIC_PREFS.printfont,             P_STRING, NULL, NULL, NULL},
 	{"small_font_gtk2",	"Sans 9",
 	  &SPECIFIC_PREFS.smallfont,		P_STRING, NULL, NULL, NULL},
 	{"normal_font_gtk2",	"Sans 9",
@@ -563,6 +567,9 @@
 	{"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
 	 NULL, NULL, NULL},
 
+	{"use_different_print_font", "FALSE", &prefs_common.use_different_print_font, P_BOOL,
+	 NULL, NULL, NULL},
+
 	{"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
 	 NULL, NULL, NULL},
 	{"attach_save_directory", NULL,
@@ -767,6 +774,8 @@
 	{"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,
 	 NULL, NULL, NULL},
 	{"skip_ssl_cert_check", "FALSE", &prefs_common.skip_ssl_cert_check, P_BOOL,
+	 NULL, NULL, NULL},
+	{"live_dangerously", "FALSE", &prefs_common.live_dangerously, P_BOOL,
 	 NULL, NULL, NULL},
 
 	{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}

Index: prefs_common.h
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_common.h,v
retrieving revision 1.103.2.50
retrieving revision 1.103.2.51
diff -u -d -r1.103.2.50 -r1.103.2.51
--- prefs_common.h	2006/06/01 17:14:25	1.103.2.50
+++ prefs_common.h	2006/06/12 16:05:57	1.103.2.51
@@ -149,6 +149,7 @@
 	/* new fonts */
 	gchar *widgetfont;
 	gchar *textfont;
+        gchar *printfont;
 	gchar *normalfont;
 	gchar *smallfont;
 	gchar *titlefont;
@@ -264,6 +265,7 @@
 	gboolean scroll_halfpage;
 
 	gboolean show_other_header;
+	gboolean use_different_print_font;
 	GSList *disphdr_list;
 
 	gboolean attach_desc;
@@ -372,6 +374,7 @@
 	gint warn_dnd;
 	gint broken_are_utf8;
 	gint skip_ssl_cert_check;
+	gint live_dangerously;
 };
 
 extern PrefsCommon prefs_common;

Index: gedit-print.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/Attic/gedit-print.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- gedit-print.c	2006/05/16 09:38:10	1.1.2.5
+++ gedit-print.c	2006/06/12 16:05:58	1.1.2.6
@@ -457,9 +457,20 @@
 	gtk_source_print_job_set_print_footer (pjob, TRUE);
 
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (view));
-	font_desc = pango_context_get_font_description (pango_context);
+	if (prefs_common.use_different_print_font) 
+	{
+		font_desc = pango_font_description_from_string (prefs_common.printfont);
+	}
+	else
+	{
+		font_desc = pango_context_get_font_description (pango_context);
+	}
 
 	gtk_source_print_job_set_font_desc (pjob, font_desc);
+	if (prefs_common.use_different_print_font) 
+	{
+        	pango_font_description_free (font_desc);
+	}
 
 	pji = g_new0 (GeditPrintJobInfo, 1);
 

Index: prefs_fonts.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_fonts.c,v
retrieving revision 1.4.2.15
retrieving revision 1.4.2.16
diff -u -d -r1.4.2.15 -r1.4.2.16
--- prefs_fonts.c	2006/01/13 17:24:14	1.4.2.15
+++ prefs_fonts.c	2006/06/12 16:05:58	1.4.2.16
@@ -44,6 +44,10 @@
 
 	GtkWidget *entry_folderviewfont;
 	GtkWidget *entry_messageviewfont;
+#ifdef USE_GNOMEPRINT
+	GtkWidget *print_checkbutton;
+	GtkWidget *entry_messageprintfont;
+#endif
 } FontsPage;
 
 void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, 
@@ -55,6 +59,10 @@
 	GtkWidget *entry_folderviewfont;
 	GtkWidget *entry_messageviewfont;
 	GtkWidget *tmplabel;
+#ifdef USE_GNOMEPRINT
+	GtkWidget *entry_messageprintfont;
+	GtkWidget *print_checkbutton;
+#endif
 	GtkWidget *vbox;
 
 	table = gtk_table_new(7, 2, FALSE);
@@ -97,15 +105,51 @@
 			 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			 (GtkAttachOptions) (0), 0, 0);
 
+#ifdef USE_GNOMEPRINT
+	/* print check button */
+	print_checkbutton = gtk_check_button_new_with_label(_("Use different font for printing"));
+	gtk_widget_show(print_checkbutton);
+	gtk_table_attach (GTK_TABLE (table), print_checkbutton, 0, 2, 4, 5,
+			 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+			 (GtkAttachOptions) (0), 0, 0);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(print_checkbutton),
+		 prefs_common.use_different_print_font);
+
+	/* print font label */
+	tmplabel = gtk_label_new (_("Message Printing"));
+	gtk_widget_show (tmplabel);
+	gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 6, 7,
+			 (GtkAttachOptions) GTK_FILL,
+			 (GtkAttachOptions) (0), 0, 0);
+	gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
+	gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
+	SET_TOGGLE_SENSITIVITY (print_checkbutton, tmplabel);
+
+	/* print font button */
+	entry_messageprintfont = gtk_font_button_new_with_font (prefs_common.printfont);
+	g_object_set(G_OBJECT(entry_messageprintfont), 
+			      "use-font", TRUE, 
+			      NULL);
+	gtk_widget_show (entry_messageprintfont);
+	gtk_table_attach (GTK_TABLE (table), entry_messageprintfont, 1, 2, 6, 7,
+			 (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+			 (GtkAttachOptions) (0), 0, 0);
+	SET_TOGGLE_SENSITIVITY (print_checkbutton, entry_messageprintfont);
+#endif
+
 	vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
 	gtk_widget_show(vbox);
 	gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, 4, 5,
 			 (GtkAttachOptions) GTK_FILL,
 			 (GtkAttachOptions) (0), 0, 0);
 	
-	prefs_fonts->window		   = GTK_WIDGET(window);
-	prefs_fonts->entry_folderviewfont  = entry_folderviewfont;
-	prefs_fonts->entry_messageviewfont = entry_messageviewfont;
+	prefs_fonts->window			= GTK_WIDGET(window);
+	prefs_fonts->entry_folderviewfont	= entry_folderviewfont;
+	prefs_fonts->entry_messageviewfont	= entry_messageviewfont;
+#ifdef USE_GNOMEPRINT
+	prefs_fonts->entry_messageprintfont	= entry_messageprintfont;
+	prefs_fonts->print_checkbutton	   	= print_checkbutton;
+#endif
 
 	prefs_fonts->page.widget = table;
 }
@@ -125,6 +169,14 @@
 	g_free(prefs_common.textfont);		
 	prefs_common.textfont   = g_strdup(gtk_font_button_get_font_name
 		(GTK_FONT_BUTTON(fonts->entry_messageviewfont)));
+
+#ifdef USE_GNOMEPRINT
+	g_free(prefs_common.printfont);		
+	prefs_common.printfont   = g_strdup(gtk_font_button_get_font_name
+		(GTK_FONT_BUTTON(fonts->entry_messageprintfont)));
+	prefs_common.use_different_print_font = gtk_toggle_button_get_active
+			(GTK_TOGGLE_BUTTON(fonts->print_checkbutton));
+#endif
 
 	main_window_reflect_prefs_all();
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]