made the font size of supplementary explanations of config dialogs smaller.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@89 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 35 insertions, 7 deletions

diff --git a/src/gtkutils.c b/src/gtkutils.c
index 5fb69c16..25fe87c7 100644
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -81,6 +81,21 @@ PangoFontDescription *gtkut_get_default_font_desc(void)
 	return pango_font_description_copy(font_desc);
 }
 
+void gtkut_widget_set_small_font_size(GtkWidget *widget)
+{
+	PangoFontDescription *font_desc;
+	gint size;
+
+	g_return_if_fail(widget != NULL);
+	g_return_if_fail(widget->style != NULL);
+
+	font_desc = gtkut_get_default_font_desc();
+	size = pango_font_description_get_size(font_desc);
+	pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+	gtk_widget_modify_font(widget, font_desc);
+	pango_font_description_free(font_desc);
+}
+
 void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
 {
 	g_return_if_fail(color != NULL);
diff --git a/src/gtkutils.h b/src/gtkutils.h
index 0b951d2f..75c125d9 100644
--- a/src/gtkutils.h
+++ b/src/gtkutils.h
@@ -84,6 +84,7 @@ gboolean gtkut_get_font_size		(GtkWidget	*widget,
 					 gint		*height);
 PangoFontDescription *gtkut_get_default_font_desc
 					(void);
+void gtkut_widget_set_small_font_size	(GtkWidget	*widget);
 
 void gtkut_convert_int_to_gdk_color	(gint		 rgbvalue,
 					 GdkColor	*color);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 46673b04..ae29407b 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1096,6 +1096,7 @@ static void prefs_account_receive_create(void)
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtkut_widget_set_small_font_size (label);
 
 	PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
 
@@ -1284,11 +1285,13 @@ static void prefs_account_send_create(void)
 	gtk_widget_set_size_request (hbox_spc, 12, -1);
 
 	label = gtk_label_new
-		(_("If you leave these entries empty, the same\n"
+		(_("If you leave these entries empty, the same "
 		   "user ID and password as receiving will be used."));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	gtkut_widget_set_small_font_size (label);
 
 	SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
 
@@ -1676,6 +1679,7 @@ static void prefs_account_ssl_create(void)
 		(_("(Turn this off if you have problems in SSL connection)"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtkut_widget_set_small_font_size (label);
 
 	ssl.pop_frame               = pop_frame;
 	ssl.pop_nossl_radiobtn      = pop_nossl_radiobtn;
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 33e2e41a..d009c1c9 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1155,13 +1155,15 @@ static void prefs_send_create(void)
 	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
 	label_charset_desc = gtk_label_new
-		(_("If `Automatic' is selected, the optimal encoding\n"
+		(_("If `Automatic' is selected, the optimal encoding "
 		   "for the current locale will be used."));
 	gtk_widget_show (label_charset_desc);
 	gtk_box_pack_start (GTK_BOX (hbox1), label_charset_desc,
 			    FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label_charset_desc),
 			       GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label_charset_desc), TRUE);
+	gtkut_widget_set_small_font_size (label_charset_desc);
 
 	hbox1 = gtk_hbox_new (FALSE, 8);
 	gtk_widget_show (hbox1);
@@ -1190,13 +1192,15 @@ static void prefs_send_create(void)
 	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
 	label_encoding_desc = gtk_label_new
-		(_("Specify Content-Transfer-Encoding used when\n"
+		(_("Specify Content-Transfer-Encoding used when "
 		   "message body contains non-ASCII characters."));
 	gtk_widget_show (label_encoding_desc);
 	gtk_box_pack_start (GTK_BOX (hbox1), label_encoding_desc,
 			    FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label_encoding_desc),
 			       GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label_encoding_desc), TRUE);
+	gtkut_widget_set_small_font_size (label_encoding_desc);
 
 	p_send.checkbtn_extsend = checkbtn_extsend;
 	p_send.entry_extsend    = entry_extsend;
@@ -1885,11 +1889,13 @@ static void prefs_privacy_create(void)
 	gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
 	gtk_widget_set_size_request (hbox_spc, 12, -1);
 
-	label = gtk_label_new (_("(Setting to '0' will store the passphrase\n"
-				 " for the whole session)"));
+	label = gtk_label_new (_("(Setting to '0' will store the passphrase "
+				 "for the whole session)"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	gtkut_widget_set_small_font_size (label);
 
 	SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, vbox3);
 
@@ -1978,11 +1984,13 @@ static void prefs_interface_create(void)
 	gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 
 	label = gtk_label_new
-		(_("(Messages will be marked until execution\n"
-		   " if this is turned off)"));
+		(_("(Messages will be marked until execution "
+		   "if this is turned off)"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	gtkut_widget_set_small_font_size (label);
 
 	PACK_FRAME (vbox1, frame_recv, _("Receive dialog"));
 	vbox_recv = gtk_vbox_new (FALSE, 0);