From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 3 Oct 2006 14:21:15 +0000 (+0000)
Subject: use theApp directly for default fonts.
X-Git-Tag: 1.6.10~12470
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1b8c2a95dfe984dd3cd850321e44227c61660d81;p=features.git

use theApp directly for default fonts.


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

diff --git a/src/frontends/lyx_gui.C b/src/frontends/lyx_gui.C
index dffd02bec5..b401f319d3 100644
--- a/src/frontends/lyx_gui.C
+++ b/src/frontends/lyx_gui.C
@@ -45,30 +45,4 @@ FuncStatus getStatus(FuncRequest const & ev)
 }
 
 
-string const roman_font_name()
-{
-	if (!use_gui)
-		return "serif";
-
-	return theApp->romanFontName();
-}
-
-
-string const sans_font_name()
-{
-	if (!use_gui)
-		return "sans";
-
-	return theApp->sansFontName();
-}
-
-
-string const typewriter_font_name()
-{
-	if (!use_gui)
-		return "monospace";
-
-	return theApp->typewriterFontName();
-}
-
 }; // namespace lyx_gui
diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 6cf6dc5fbe..6075a1ed96 100644
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -36,15 +36,6 @@ namespace lyx_gui {
 /// are we using the GUI at all
 extern bool use_gui;
 
-/// return a suitable serif font name (called from non-gui context too !)
-std::string const roman_font_name();
-
-/// return a suitable sans serif font name (called from non-gui context too !)
-std::string const sans_font_name();
-
-/// return a suitable monospaced font name (called from non-gui context too !)
-std::string const typewriter_font_name();
-
 /**
  * set up GUI parameters. At this point lyxrc may
  * be used.
diff --git a/src/frontends/qt3/QPrefs.C b/src/frontends/qt3/QPrefs.C
index 8bcf36ad55..186618b470 100644
--- a/src/frontends/qt3/QPrefs.C
+++ b/src/frontends/qt3/QPrefs.C
@@ -439,13 +439,13 @@ void setComboxFont(QComboBox * cb, string const & family, string const & foundry
 
 	QFont font;
 
-	if (family == lyx_gui::roman_font_name()) {
+	if (family == theApp->romanFontName()) {
 		font.setStyleHint(QFont::Serif);
 		font.setFamily(family.c_str());
-	} else if (family == lyx_gui::sans_font_name()) {
+	} else if (family == theApp->sansFontName()) {
 		font.setStyleHint(QFont::SansSerif);
 		font.setFamily(family.c_str());
-	} else if (family == lyx_gui::typewriter_font_name()) {
+	} else if (family == theApp->typewriterFontName()) {
 		font.setStyleHint(QFont::TypeWriter);
 		font.setFamily(family.c_str());
 	} else {
diff --git a/src/frontends/qt3/QViewSource.C b/src/frontends/qt3/QViewSource.C
index 2611d85e4a..945a067d1e 100644
--- a/src/frontends/qt3/QViewSource.C
+++ b/src/frontends/qt3/QViewSource.C
@@ -40,7 +40,7 @@ void QViewSource::build_dialog()
 	dialog_->viewSourceTV->setReadOnly(true);
 	dialog_->viewSourceTV->setTextFormat(Qt::PlainText);
 	// this is personal. I think source code should be in fixed-size font
-	QFont font(toqstr(lyx_gui::typewriter_font_name()));
+	QFont font(toqstr(theApp->typewriterFontName()));
 	font.setFixedPitch(true);
 	font.setStyleHint(QFont::TypeWriter);
 	dialog_->viewSourceTV->setFont(font);
diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index aabedba14f..c3fa706a57 100644
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -130,13 +130,13 @@ void setComboxFont(QComboBox * cb, string const & family, string const & foundry
 
 	QFont font;
 
-	if (family == lyx_gui::roman_font_name()) {
+	if (family == theApp->romanFontName()) {
 		font.setStyleHint(QFont::Serif);
 		font.setFamily(family.c_str());
-	} else if (family == lyx_gui::sans_font_name()) {
+	} else if (family == theApp->sansFontName()) {
 		font.setStyleHint(QFont::SansSerif);
 		font.setFamily(family.c_str());
-	} else if (family == lyx_gui::typewriter_font_name()) {
+	} else if (family == theApp->typewriterFontName()) {
 		font.setStyleHint(QFont::TypeWriter);
 		font.setFamily(family.c_str());
 	} else {
diff --git a/src/frontends/qt4/QViewSource.C b/src/frontends/qt4/QViewSource.C
index bada8bf5f2..46a989aa64 100644
--- a/src/frontends/qt4/QViewSource.C
+++ b/src/frontends/qt4/QViewSource.C
@@ -14,7 +14,8 @@
 #include "QViewSource.h"
 #include "QViewSourceDialog.h"
 #include "qt_helpers.h"
-#include "lyx_gui.h"
+
+#include "frontends/Application.h"
 
 #include "controllers/ControlViewSource.h"
 
@@ -90,7 +91,7 @@ void QViewSource::build_dialog()
 	dialog_->viewSourceTV->setReadOnly(true);
 	///dialog_->viewSourceTV->setAcceptRichText(false);
 	// this is personal. I think source code should be in fixed-size font
-	QFont font(toqstr(lyx_gui::typewriter_font_name()));
+	QFont font(toqstr(theApp->typewriterFontName()));
 	font.setFixedPitch(true);
 	font.setStyleHint(QFont::TypeWriter);
 	dialog_->viewSourceTV->setFont(font);
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 18e7453ff5..828a66bedf 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -499,11 +499,16 @@ bool LyX::init()
 	}
 
 	if (lyxrc.roman_font_name.empty())
-		lyxrc.roman_font_name = lyx_gui::roman_font_name();
+		lyxrc.roman_font_name = 
+			lyx_gui::use_gui? theApp->romanFontName(): "serif";
+
 	if (lyxrc.sans_font_name.empty())
-		lyxrc.sans_font_name = lyx_gui::sans_font_name();
+		lyxrc.sans_font_name =
+			lyx_gui::use_gui? theApp->sansFontName(): "sans";
+
 	if (lyxrc.typewriter_font_name.empty())
-		lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name();
+		lyxrc.typewriter_font_name =
+			lyx_gui::use_gui? theApp->typewriterFontName(): "monospace";
 
 	//
 	// Read configuration files