? config.guess.cdbs-orig
? config.sub.cdbs-orig
? debian
? faster-thumbnails.diff
? semantic.cache
? statusbar-fullscreen-visibility.diff
? thumbnail-cell-data-func.diff
? thumbs-rgb8p.diff
? backend/semantic.cache
? cut-n-paste/toolbar-editor/egg-toolbars-model.loT
? cut-n-paste/toolbar-editor/semantic.cache
? pdf/semantic.cache
? po/semantic.cache
? ps/semantic.cache
? shell/semantic.cache
cvs server: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evince/ChangeLog,v
retrieving revision 1.471
diff -u -r1.471 ChangeLog
--- ChangeLog	17 Jun 2005 14:18:04 -0000	1.471
+++ ChangeLog	17 Jun 2005 21:24:06 -0000
@@ -1,3 +1,12 @@
+2005-06-17  Martin Kretzschmar  <martink@gnome.org>
+
+	* data/evince-properties.glade: remove <b></b> Pango markup from
+	translatable labels.
+
+	* shell/ev-properties.c (make_labels_bold): Make the labels' font
+	bold without markup.
+	(ev_properties_init): use it.
+
 2005-06-17  Marco Pesenti Gritti  <mpg@redhat.com>
 
 	* pdf/ev-poppler.cc:
cvs server: Diffing backend
cvs server: Diffing cut-n-paste
cvs server: Diffing cut-n-paste/recent-files
cvs server: Diffing cut-n-paste/toolbar-editor
cvs server: Diffing cut-n-paste/zoom-control
cvs server: Diffing data
Index: data/evince-properties.glade
===================================================================
RCS file: /cvs/gnome/evince/data/evince-properties.glade,v
retrieving revision 1.10
diff -u -r1.10 evince-properties.glade
--- data/evince-properties.glade	17 Jun 2005 12:11:53 -0000	1.10
+++ data/evince-properties.glade	17 Jun 2005 21:24:09 -0000
@@ -75,9 +75,9 @@
 	      <child>
 		<widget class="GtkLabel" id="title_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Title:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Title:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -103,9 +103,9 @@
 	      <child>
 		<widget class="GtkLabel" id="subject_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Subject:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Subject:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -131,9 +131,9 @@
 	      <child>
 		<widget class="GtkLabel" id="author_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Author:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -159,9 +159,9 @@
 	      <child>
 		<widget class="GtkLabel" id="keywords_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Keywords:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Keywords:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -187,9 +187,9 @@
 	      <child>
 		<widget class="GtkLabel" id="creator_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Creator:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Creator:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -215,9 +215,9 @@
 	      <child>
 		<widget class="GtkLabel" id="producer_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Producer:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Producer:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -243,9 +243,9 @@
 	      <child>
 		<widget class="GtkLabel" id="created_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Created:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Created:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -271,9 +271,9 @@
 	      <child>
 		<widget class="GtkLabel" id="modified_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Modified:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Modified:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -299,9 +299,9 @@
 	      <child>
 		<widget class="GtkLabel" id="security_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Security:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Security:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -327,9 +327,9 @@
 	      <child>
 		<widget class="GtkLabel" id="version_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Format:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Format:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -355,9 +355,9 @@
 	      <child>
 		<widget class="GtkLabel" id="pages_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Number of Pages:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Number of Pages:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -383,9 +383,9 @@
 	      <child>
 		<widget class="GtkLabel" id="optimized_caption">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Optimized:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Optimized:</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
cvs server: Diffing djvu
cvs server: Diffing doc
cvs server: Diffing dvi
cvs server: Diffing dvi/mdvi-lib
cvs server: Diffing help
cvs server: Diffing help/C
cvs server: Diffing help/C/figures
cvs server: Diffing lib
cvs server: Diffing pdf
cvs server: Diffing pixbuf
cvs server: Diffing po
cvs server: Diffing ps
cvs server: Diffing shell
Index: shell/ev-properties.c
===================================================================
RCS file: /cvs/gnome/evince/shell/ev-properties.c,v
retrieving revision 1.15
diff -u -r1.15 ev-properties.c
--- shell/ev-properties.c	17 Jun 2005 12:11:53 -0000	1.15
+++ shell/ev-properties.c	17 Jun 2005 21:24:11 -0000
@@ -60,21 +60,22 @@
 {
 	Property property;
 	const char *label_id;
+	const char *caption_id;
 } PropertyInfo;
 
 static const PropertyInfo properties_info[] = {
-	{ TITLE_PROPERTY, "title" },
-	{ SUBJECT_PROPERTY, "subject" },
-	{ AUTHOR_PROPERTY, "author" },
-	{ KEYWORDS_PROPERTY, "keywords" },
-	{ PRODUCER_PROPERTY, "producer" },
-	{ CREATOR_PROPERTY, "creator" },
-	{ CREATION_DATE_PROPERTY, "created" },
-	{ MOD_DATE_PROPERTY, "modified" },
-	{ N_PAGES_PROPERTY, "pages" },
-	{ LINEARIZED_PROPERTY, "optimized" },
-	{ FORMAT_PROPERTY, "version" },
-	{ SECURITY_PROPERTY, "security" }
+	{ TITLE_PROPERTY, "title", "title_caption" },
+	{ SUBJECT_PROPERTY, "subject", "subject_caption" },
+	{ AUTHOR_PROPERTY, "author", "author_caption" },
+	{ KEYWORDS_PROPERTY, "keywords", "keywords_caption" },
+	{ PRODUCER_PROPERTY, "producer", "producer_caption" },
+	{ CREATOR_PROPERTY, "creator", "creator_caption" },
+	{ CREATION_DATE_PROPERTY, "created", "created_caption" },
+	{ MOD_DATE_PROPERTY, "modified", "modified_caption" },
+	{ N_PAGES_PROPERTY, "pages", "pages_caption" },
+	{ LINEARIZED_PROPERTY, "optimized", "optimized_caption" },
+	{ FORMAT_PROPERTY, "version", "version_caption" },
+	{ SECURITY_PROPERTY, "security", "security_caption" }
 };
 
 struct _EvProperties {
@@ -122,6 +123,36 @@
 }
 
 static void
+make_labels_bold (GladeXML *xml)
+{
+	PangoFontDescription *font_desc;
+	int i;
+
+	font_desc = pango_font_description_new ();
+
+	pango_font_description_set_weight (font_desc,
+					   PANGO_WEIGHT_BOLD);
+
+	for (i = 0; i < G_N_ELEMENTS (properties_info); ++i) {
+		GtkWidget *label;
+
+		label = glade_xml_get_widget (xml, properties_info[i].caption_id);
+
+		/* 
+		 * This will only affect the weight of the font, the rest is
+		 * from the current state of the widget, which comes from the
+		 * theme or user prefs, since the font desc only has the
+		 * weight flag turned on.
+		 */
+		gtk_widget_modify_font (label, font_desc);
+
+	}
+
+	pango_font_description_free (font_desc);
+}
+
+
+static void
 ev_properties_init (EvProperties *properties)
 {
 	GladeXML *xml;
@@ -137,6 +168,8 @@
 	properties->fonts_treeview = glade_xml_get_widget (xml, "fonts_treeview");
 	properties->fonts_progress_label = glade_xml_get_widget (xml, "font_progress_label");
 	properties->font_page = glade_xml_get_widget (xml, "fonts_page");
+
+	make_labels_bold (xml);
 
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE);
cvs server: Diffing thumbnailer
cvs server: Diffing tiff
cvs server: Diffing viewer
