Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / qfont_loader.C

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index 211c34962635455d70e0897859328ab858565d5f..458405258716d708fe561b13847ae1a5f9a005cb 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -20,6 +20,7 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "BufferView.h"
+#include "qt_helpers.h"
 
 #include <qglobal.h>
 #if QT_VERSION < 300
@@ -176,13 +177,16 @@ qfont_loader::font_info::font_info(LyXFont const & f)
        } else 
                switch (f.family()) {
                case LyXFont::ROMAN_FAMILY:
-                       font.setFamily("times");
+                       font.setFamily(makeFontName(lyxrc.roman_font_name,
+                                                   lyxrc.roman_font_foundry).c_str());
                        break;
                case LyXFont::SANS_FAMILY:
-                       font.setFamily("helvetica");
+                       font.setFamily(makeFontName(lyxrc.sans_font_name,
+                                                   lyxrc.sans_font_foundry).c_str());
                        break;
                case LyXFont::TYPEWRITER_FAMILY:
-                       font.setFamily("courier");
+                       font.setFamily(makeFontName(lyxrc.typewriter_font_name,
+                                                   lyxrc.typewriter_font_foundry).c_str());
                        break;
                default:
                        break;
@@ -191,8 +195,6 @@ qfont_loader::font_info::font_info(LyXFont const & f)
        font.setPointSizeFloat(lyxrc.font_sizes[f.size()]
                               * lyxrc.zoom / 100.0);
 
-       // FIXME: lyxrc, check for failure etc.
-
        switch (f.series()) {
                case LyXFont::MEDIUM_SERIES:
                        font.setWeight(QFont::Normal);