Re: lyx-devel src/frontends/qt2/: ChangeLog QPrefsDialog.C

[Dekel Tsur]

On Sun, Nov 17, 2002 at 05:43:36PM +0000, [EMAIL PROTECTED] wrote:
> CVSROOT:      /usr/local/lyx/cvsroot
> Module name:  lyx-devel
> Repository:   lyx-devel/src/frontends/qt2/
> Changes by:   [EMAIL PROTECTED]  02/11/17 17:43:36
> 
> Modified files:
>       lyx-devel/src/frontends/qt2/: ChangeLog QPrefsDialog.C 
> 
> Log message:
>       partial fonts fix. Like Juergen said we  really need our own dialog.
>       Not that there's any point until qfont_loader reads  lyxrc...

The attached patch fixes that.

Index: frontends/qt2/QPrefsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefsDialog.C,v
retrieving revision 1.13
diff -u -p -r1.13 QPrefsDialog.C
--- frontends/qt2/QPrefsDialog.C        17 Nov 2002 16:43:36 -0000      1.13
+++ frontends/qt2/QPrefsDialog.C        17 Nov 2002 17:09:30 -0000
@@ -593,35 +593,35 @@ QString const fontToString(QFont const &
  
 void QPrefsDialog::change_roman()
 {
-       QFont f(fontFromString(screenfontsModule->screenRomanED->text()));
+       QFont f(screenfontsModule->screenRomanED->text());
  
        // Qt designers hadn't heard of references
        bool ok; 
        f = QFontDialog::getFont(&ok, f);
        if (ok)
-               screenfontsModule->screenRomanED->setText(fontToString(f));
+               screenfontsModule->screenRomanED->setText(f.family());
 }
 
  
 void QPrefsDialog::change_sans()
 {
-       QFont f(fontFromString(screenfontsModule->screenSansED->text()));
+       QFont f(screenfontsModule->screenSansED->text());
  
        // Qt designers hadn't heard of references
        bool ok; 
        f = QFontDialog::getFont(&ok, f);
        if (ok)
-               screenfontsModule->screenSansED->setText(fontToString(f));
+               screenfontsModule->screenSansED->setText(f.family());
 }
 
  
 void QPrefsDialog::change_typewriter()
 {
-       QFont f(fontFromString(screenfontsModule->screenTypewriterED->text()));
+       QFont f(screenfontsModule->screenTypewriterED->text());
  
        // Qt designers hadn't heard of references
        bool ok; 
        f = QFontDialog::getFont(&ok, f);
        if (ok)
-               screenfontsModule->screenTypewriterED->setText(fontToString(f));
+               screenfontsModule->screenTypewriterED->setText(f.family());
 }
Index: frontends/qt2/qfont_loader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qfont_loader.C,v
retrieving revision 1.18
diff -u -p -r1.18 qfont_loader.C
--- frontends/qt2/qfont_loader.C        17 Nov 2002 10:34:17 -0000      1.18
+++ frontends/qt2/qfont_loader.C        17 Nov 2002 17:09:30 -0000
@@ -176,13 +176,13 @@ qfont_loader::font_info::font_info(LyXFo
        } else 
                switch (f.family()) {
                case LyXFont::ROMAN_FAMILY:
-                       font.setFamily("times");
+                       font.setFamily(lyxrc.roman_font_name.c_str());
                        break;
                case LyXFont::SANS_FAMILY:
-                       font.setFamily("helvetica");
+                       font.setFamily(lyxrc.sans_font_name.c_str());
                        break;
                case LyXFont::TYPEWRITER_FAMILY:
-                       font.setFamily("courier");
+                       font.setFamily(lyxrc.typewriter_font_name.c_str());
                        break;
                default:
                        break;