From: John Spray <spray@lyx.org>
Date: Mon, 13 Feb 2006 17:51:11 +0000 (+0000)
Subject: Fix some font names getting mangled in GPreferences, as
X-Git-Tag: 1.6.10~13605
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e820144307bac3fdc8446b0e4d75c7026cf9188f;p=lyx.git

Fix some font names getting mangled in GPreferences, as
pointed out by Bartok.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13227 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index de74942329..48d45301fd 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,6 +1,9 @@
 2006-02-13  John Spray  <spray@lyx.org>
 	* ghelpers.C: implement Gtk::IconTheme stuff for getting 
 	  lots more icons from the theme.
+	* GPreferences.C: append arbitrary size to font strings
+	  when passing to gtk font button, to prevent it from 
+	  mangling some more complicated font names.
 
 2006-02-12  John Spray  <spray@lyx.org>
 	* GMenubar.C: assume backend strings in latin1 (bug 1954)
diff --git a/src/frontends/gtk/GPreferences.C b/src/frontends/gtk/GPreferences.C
index 58e4788c30..5fbc21e2a2 100644
--- a/src/frontends/gtk/GPreferences.C
+++ b/src/frontends/gtk/GPreferences.C
@@ -142,14 +142,14 @@ void GPreferences::update()
 	LyXRC const & rc(controller().rc());
 
 	// *** Screen fonts ***
-	std::cerr << "Update: got font_name:font_foundry:\n";
-	std::cerr << rc.roman_font_name << ":" << rc.roman_font_foundry << "\n";
-	std::cerr << rc.sans_font_name << ":" << rc.sans_font_foundry << "\n";
-	std::cerr << rc.typewriter_font_name << ":" << rc.typewriter_font_foundry << "\n\n";
-
-	romanfontbutton_->set_font_name(rc.roman_font_name);
-	sansseriffontbutton_->set_font_name(rc.sans_font_name);
-	typewriterfontbutton_->set_font_name(rc.typewriter_font_name);
+	Glib::ustring gtk_roman_font_name = rc.roman_font_name + ", 12";
+	std::cerr << "Rc's roman_font_name is '" << rc.roman_font_name << "'\n";
+	std::cerr << "Our roman_font_name is '" << gtk_roman_font_name << "'\n";
+	romanfontbutton_->set_font_name(gtk_roman_font_name);
+	Glib::ustring gtk_sans_font_name = rc.sans_font_name + ", 12";
+	sansseriffontbutton_->set_font_name(gtk_sans_font_name);
+	Glib::ustring gtk_typewriter_font_name = rc.typewriter_font_name + ", 12";
+	typewriterfontbutton_->set_font_name(gtk_typewriter_font_name);
 
 	zoomadj_->set_value (rc.zoom);
 	dpiadj_->set_value (rc.dpi);
@@ -219,6 +219,10 @@ void GPreferences::apply()
 
 	rc.roman_font_name = Pango::FontDescription(
 		romanfontbutton_->get_font_name()).get_family ();
+	std::cerr << "Button's font_name is '" <<	romanfontbutton_->get_font_name() << "'\n";
+	std::cerr << "Setting font name to :\n";
+	std::cerr << "\t'" << Pango::FontDescription(
+		romanfontbutton_->get_font_name()).get_family () << "'\n";
 	rc.roman_font_foundry = "";
 	rc.sans_font_name = Pango::FontDescription(
 		sansseriffontbutton_->get_font_name()).get_family ();