X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-properties-fonts.c;h=5a792072b172d31063a46152352071e66e24579a;hb=1ba681aa9eb43a60f0a01c1939e70f9f6de755c7;hp=ce5109112d2d00d1d1da2b2dc07ce101545a0935;hpb=2ad5c80aafe43d53698e1084db86e34bf15290a9;p=evince.git

diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index ce510911..5a792072 100644
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -31,12 +31,6 @@
 #include <gtk/gtktreeview.h>
 #include <glade/glade.h>
 
-enum
-{
-	FONT_NAME_COL,
-	NUM_COLS
-};
-
 struct _EvPropertiesFonts {
 	GtkVBox base_instance;
 
@@ -73,6 +67,33 @@ ev_properties_fonts_class_init (EvPropertiesFontsClass *properties_class)
 	g_object_class->dispose = ev_properties_fonts_dispose;
 }
 
+static void
+font_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *renderer,
+		     GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+{
+	char *name;
+	char *details;
+	char *markup;
+
+	gtk_tree_model_get(model, iter,
+			   EV_DOCUMENT_FONTS_COLUMN_NAME, &name,
+			   EV_DOCUMENT_FONTS_COLUMN_DETAILS, &details,
+			   -1);	
+
+	if (details) {
+		markup = g_strdup_printf ("<b><big>%s</big></b>\n<small>%s</small>",
+					  name, details);
+	} else {
+		markup = g_strdup_printf ("<b><big>%s</big></b>", name);
+	}
+
+	g_object_set (renderer, "markup", markup, NULL);
+	
+	g_free (markup);
+	g_free (details);
+	g_free (name);
+}
+
 static void
 ev_properties_fonts_init (EvPropertiesFonts *properties)
 {
@@ -96,12 +117,13 @@ ev_properties_fonts_init (EvPropertiesFonts *properties)
 	gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (properties->fonts_treeview), column);
 
-	renderer = gtk_cell_renderer_text_new ();
+	renderer = GTK_CELL_RENDERER (g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
+						    "ypad", 6, NULL));
 	gtk_tree_view_column_pack_start (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE);
-	gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column), _("Name"));
-	gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), renderer,
-					     "text", EV_DOCUMENT_FONTS_COLUMN_NAME,
-					     NULL);
+	gtk_tree_view_column_set_title (GTK_TREE_VIEW_COLUMN (column), _("Font"));
+	gtk_tree_view_column_set_cell_data_func (column, renderer,
+						 font_cell_data_func,
+						 NULL, NULL);
 }
 
 static void
@@ -156,7 +178,8 @@ ev_properties_fonts_set_document (EvPropertiesFonts *properties,
 
 	properties->document = document;
 
-	list_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING);
+	list_store = gtk_list_store_new (EV_DOCUMENT_FONTS_COLUMN_NUM_COLUMNS,
+					 G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store));
 
 	job = ev_job_fonts_new (properties->document);