SF.net SVN: geany:[3335] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Sat Dec 6 18:04:46 UTC 2008


Revision: 3335
          http://geany.svn.sourceforge.net/geany/?rev=3335&view=rev
Author:   eht16
Date:     2008-12-06 18:04:46 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Make use of ui_widget_modify_font_from_string() at various places.
Set the message window font also for the scribble.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/msgwindow.c
    trunk/src/prefs.c
    trunk/src/treeviews.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-06 17:48:36 UTC (rev 3334)
+++ trunk/ChangeLog	2008-12-06 18:04:46 UTC (rev 3335)
@@ -37,6 +37,9 @@
    src/keybindings.c:
    Remove on_go_to_line1_activate() and directly use
    on_go_to_line_activate() instead.
+ * src/prefs.c, src/treeviews.c, src/msgwindow.c:
+   Make use of ui_widget_modify_font_from_string() at various places.
+   Set the message window font also for the scribble.
 
 
 2008-12-05  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c	2008-12-06 17:48:36 UTC (rev 3334)
+++ trunk/src/msgwindow.c	2008-12-06 18:04:46 UTC (rev 3335)
@@ -88,6 +88,9 @@
 	msgwindow.popup_msg_menu = create_message_popup_menu(MSG_MESSAGE);
 	msgwindow.popup_compiler_menu = create_message_popup_menu(MSG_COMPILER);
 
+	ui_widget_modify_font_from_string(
+		lookup_widget(main_widgets.window, "textview_scribble"), interface_prefs.msgwin_font);
+
 	g_signal_connect(lookup_widget(main_widgets.window, "textview_scribble"),
 		"populate-popup", G_CALLBACK(on_scribble_populate), NULL);
 }
@@ -104,7 +107,6 @@
 {
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
-	PangoFontDescription *pfd;
 
 	msgwindow.store_status = gtk_list_store_new(1, G_TYPE_STRING);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_status), GTK_TREE_MODEL(msgwindow.store_status));
@@ -116,9 +118,7 @@
 
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_status), FALSE);
 
-	pfd = pango_font_description_from_string(interface_prefs.msgwin_font);
-	gtk_widget_modify_font(msgwindow.tree_status, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(msgwindow.tree_status, interface_prefs.msgwin_font);
 
 	g_signal_connect(msgwindow.tree_status, "button-press-event",
 				G_CALLBACK(on_msgwin_button_press_event), GINT_TO_POINTER(MSG_STATUS));
@@ -132,7 +132,6 @@
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *selection;
-	PangoFontDescription *pfd;
 
 	/* line, doc, fg, str */
 	msgwindow.store_msg = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_POINTER,
@@ -147,9 +146,7 @@
 
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_msg), FALSE);
 
-	pfd = pango_font_description_from_string(interface_prefs.msgwin_font);
-	gtk_widget_modify_font(msgwindow.tree_msg, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font);
 
 	/* use button-release-event so the selection has changed
 	 * (connect_after button-press-event doesn't work) */
@@ -169,7 +166,6 @@
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *selection;
-	PangoFontDescription *pfd;
 
 	msgwindow.store_compiler = gtk_list_store_new(2, GDK_TYPE_COLOR, G_TYPE_STRING);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_compiler), GTK_TREE_MODEL(msgwindow.store_compiler));
@@ -181,9 +177,7 @@
 
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_compiler), FALSE);
 
-	pfd = pango_font_description_from_string(interface_prefs.msgwin_font);
-	gtk_widget_modify_font(msgwindow.tree_compiler, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font);
 
 	/* use button-release-event so the selection has changed
 	 * (connect_after button-press-event doesn't work) */

Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2008-12-06 17:48:36 UTC (rev 3334)
+++ trunk/src/prefs.c	2008-12-06 18:04:46 UTC (rev 3335)
@@ -1184,6 +1184,7 @@
 			}
 			if (GTK_IS_WIDGET(tv.default_tag_tree))
 				ui_widget_modify_font_from_string(tv.default_tag_tree, interface_prefs.tagbar_font);
+			ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font);
 			break;
 		}
 		case 2:
@@ -1194,6 +1195,9 @@
 			ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font);
 			ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font);
 			ui_widget_modify_font_from_string(msgwindow.tree_status, interface_prefs.msgwin_font);
+			ui_widget_modify_font_from_string(
+				lookup_widget(main_widgets.window, "textview_scribble"),
+				interface_prefs.msgwin_font);
 			break;
 		}
 		case 3:

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2008-12-06 17:48:36 UTC (rev 3334)
+++ trunk/src/treeviews.c	2008-12-06 18:04:46 UTC (rev 3335)
@@ -85,7 +85,6 @@
 	GtkCellRenderer *text_renderer, *icon_renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *select;
-	PangoFontDescription *pfd;
 
 	text_renderer = gtk_cell_renderer_text_new();
 	icon_renderer = gtk_cell_renderer_pixbuf_new();
@@ -103,9 +102,7 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
 
-	pfd = pango_font_description_from_string(interface_prefs.tagbar_font);
-	gtk_widget_modify_font(tree, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(tree, interface_prefs.tagbar_font);
 
 	gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store));
 	g_object_unref(store);
@@ -211,7 +208,6 @@
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *select;
-	PangoFontDescription *pfd;
 	GtkTreeSortable *sortable;
 
 	tv.tree_openfiles = lookup_widget(main_widgets.window, "treeview6");
@@ -240,9 +236,7 @@
 	sortable = GTK_TREE_SORTABLE(GTK_TREE_MODEL(store_openfiles));
 	gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
 
-	pfd = pango_font_description_from_string(interface_prefs.tagbar_font);
-	gtk_widget_modify_font(tv.tree_openfiles, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font);
 
 	/* GTK 2.12 tooltips */
 	if (gtk_check_version(2, 12, 0) == NULL)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list