[brasero] Rework BraseroVideoTreeModel to be better suited for characters like &, '

[Philippe Rouquier <philippr src gnome org>]

commit bcc4f9252b6cf79eb482b2ef0a8fb41c51413741
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Aug 2 21:02:02 2009 +0200

    Rework BraseroVideoTreeModel to be better suited for characters like &, '

 src/brasero-audio-disc.c       |   10 +++++-----
 src/brasero-video-tree-model.c |   31 ++++++++++++++++++++++++++-----
 src/brasero-video-tree-model.h |    4 +++-
 3 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index f3cd55b..db7c48f 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -431,7 +431,11 @@ brasero_audio_disc_init (BraseroAudioDisc *obj)
 
 	gtk_tree_view_column_pack_end (column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute (column, renderer,
-					    "markup", BRASERO_VIDEO_TREE_MODEL_NAME);
+					    "text", BRASERO_VIDEO_TREE_MODEL_NAME);
+	gtk_tree_view_column_add_attribute (column, renderer,
+					    "style", BRASERO_VIDEO_TREE_MODEL_STYLE);
+	gtk_tree_view_column_add_attribute (column, renderer,
+					    "weight", BRASERO_VIDEO_TREE_MODEL_WEIGHT);
 	gtk_tree_view_column_add_attribute (column, renderer,
 					    "editable", BRASERO_VIDEO_TREE_MODEL_EDITABLE);
 	gtk_tree_view_column_set_title (column, _("Title"));
@@ -487,10 +491,6 @@ brasero_audio_disc_init (BraseroAudioDisc *obj)
 	gtk_container_add (GTK_CONTAINER (scroll), obj->priv->tree);
 
 	gtk_box_pack_start (GTK_BOX (obj), scroll, TRUE, TRUE, 0);
-	/*gtk_notebook_append_page (GTK_NOTEBOOK (obj->priv->notebook),
-				  scroll,
-				  NULL);
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (obj->priv->notebook), 0);*/
 
 	/* dnd */
 	gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (obj->priv->tree),
diff --git a/src/brasero-video-tree-model.c b/src/brasero-video-tree-model.c
index 16f123c..1835880 100644
--- a/src/brasero-video-tree-model.c
+++ b/src/brasero-video-tree-model.c
@@ -175,11 +175,17 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
 
 	if (GPOINTER_TO_INT (iter->user_data2) == BRASERO_STREAM_ROW_GAP) {
 		switch (column) {
+		case BRASERO_VIDEO_TREE_MODEL_WEIGHT:
+			g_value_init (value, PANGO_TYPE_STYLE);
+			g_value_set_enum (value, PANGO_WEIGHT_BOLD);
+			return;
+		case BRASERO_VIDEO_TREE_MODEL_STYLE:
+			g_value_init (value, PANGO_TYPE_STYLE);
+			g_value_set_enum (value, PANGO_STYLE_ITALIC);
+			return;
 		case BRASERO_VIDEO_TREE_MODEL_NAME:
-			text = g_strdup_printf ("<i><b>%s</b></i>", _("Pause"));
 			g_value_init (value, G_TYPE_STRING);
-			g_value_set_string (value, text);
-			g_free (text);
+			g_value_set_string (value, _("Pause"));
 			break;
 		case BRASERO_VIDEO_TREE_MODEL_ICON_NAME:
 			g_value_init (value, G_TYPE_STRING);
@@ -219,12 +225,21 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
 	}
 
 	switch (column) {
+	case BRASERO_VIDEO_TREE_MODEL_WEIGHT:
+		g_value_init (value, PANGO_TYPE_STYLE);
+		g_value_set_enum (value, PANGO_WEIGHT_NORMAL);
+		return;
+	case BRASERO_VIDEO_TREE_MODEL_STYLE:
+		g_value_init (value, PANGO_TYPE_STYLE);
+		g_value_set_enum (value, PANGO_STYLE_NORMAL);
+		return;
 	case BRASERO_VIDEO_TREE_MODEL_NAME:
 		g_value_init (value, G_TYPE_STRING);
 
 		string = brasero_track_tag_lookup_string (track, BRASERO_TRACK_STREAM_TITLE_TAG);
-		if (string)
+		if (string) {
 			g_value_set_string (value, string);
+		}
 		else {
 			gchar *uri;
 			gchar *name;
@@ -251,7 +266,7 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
 		g_value_init (value, G_TYPE_STRING);
 
 		string = brasero_track_tag_lookup_string (track, BRASERO_TRACK_STREAM_ARTIST_TAG);
-		if (string)
+		if (string) 
 			g_value_set_string (value, string);
 
 		return;
@@ -634,6 +649,12 @@ brasero_video_tree_model_get_column_type (GtkTreeModel *model,
 	case BRASERO_VIDEO_TREE_MODEL_IS_GAP:
 		return G_TYPE_STRING;
 
+	case BRASERO_VIDEO_TREE_MODEL_WEIGHT:
+		return PANGO_TYPE_WEIGHT;
+
+	case BRASERO_VIDEO_TREE_MODEL_STYLE:
+		return PANGO_TYPE_STYLE;
+
 	default:
 		break;
 	}
diff --git a/src/brasero-video-tree-model.h b/src/brasero-video-tree-model.h
index acbfd53..00e1906 100644
--- a/src/brasero-video-tree-model.h
+++ b/src/brasero-video-tree-model.h
@@ -40,7 +40,7 @@ struct _BraseroDNDVideoContext {
 typedef struct _BraseroDNDVideoContext BraseroDNDVideoContext;
 
 typedef enum {
-	BRASERO_VIDEO_TREE_MODEL_NAME		= 0,
+	BRASERO_VIDEO_TREE_MODEL_NAME		= 0,		/* Markup */
 	BRASERO_VIDEO_TREE_MODEL_ARTIST		= 1,
 	BRASERO_VIDEO_TREE_MODEL_THUMBNAIL,
 	BRASERO_VIDEO_TREE_MODEL_ICON_NAME,
@@ -50,6 +50,8 @@ typedef enum {
 	BRASERO_VIDEO_TREE_MODEL_INDEX,
 	BRASERO_VIDEO_TREE_MODEL_INDEX_NUM,
 	BRASERO_VIDEO_TREE_MODEL_IS_GAP,
+	BRASERO_VIDEO_TREE_MODEL_WEIGHT,
+	BRASERO_VIDEO_TREE_MODEL_STYLE,
 	BRASERO_VIDEO_TREE_MODEL_COL_NUM
 } BraseroVideoProjectColumn;