From 6c12adeebe41171161f01a8517e669164485cc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 6 Aug 2002 13:00:50 +0000 Subject: [PATCH] Finish the re-indroduction of the show_banner flag. It is 'true' by default now and not changable from the UI, but a \show_banner "false" in the .lyx/preferences gets honored. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4877 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/frontends/ChangeLog | 4 ++++ src/frontends/screen.C | 4 ++++ src/lyxrc.C | 1 + src/mathed/math_metricsinfo.C | 5 ----- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 11c3ddb295..2eab49bf92 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ + +2002-08-06 André Pönitz + + * lyxrc.C: set default for show_banner to true + 2002-08-06 John Levon * pspell.C: fix a crash, and allow new aspell to work diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index f35b86604b..b2167379d4 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-08-06 André Poentiz + + * Screen.C: Honor \show_banner lyxrc setting + 2002-08-04 John Levon * LyXView.C: isLyxClean->isClean diff --git a/src/frontends/screen.C b/src/frontends/screen.C index 31220bf0f7..7dd8ced182 100644 --- a/src/frontends/screen.C +++ b/src/frontends/screen.C @@ -16,6 +16,7 @@ #include "screen.h" #include "lyxtext.h" +#include "lyxrc.h" #include "lyxrow.h" #include "BufferView.h" #include "buffer.h" @@ -80,6 +81,9 @@ SplashScreen const & SplashScreen::get() SplashScreen::SplashScreen() : text_(lyx_version ? lyx_version : "unknown") { + if (!lyxrc.show_banner) + return; + string const file = LibFileSearch("images", "banner", "xpm"); if (file.empty()) return; diff --git a/src/lyxrc.C b/src/lyxrc.C index d2b8e1caf0..a82f501015 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -249,6 +249,7 @@ void LyXRC::setDefaults() { language_command_begin = "\\selectlanguage{$$lang}"; language_command_local = "\\foreignlanguage{$$lang}{"; default_language = "english"; + show_banner = false; // date_insert_format = "%A, %e %B %Y"; diff --git a/src/mathed/math_metricsinfo.C b/src/mathed/math_metricsinfo.C index 1235e77b4b..15f2ed82e9 100644 --- a/src/mathed/math_metricsinfo.C +++ b/src/mathed/math_metricsinfo.C @@ -49,7 +49,6 @@ MathStyles smallerScriptStyle(MathStyles st) return LM_ST_DISPLAY; } - MathScriptChanger::MathScriptChanger(MathMetricsBase & mb) : MathStyleChanger(mb, smallerScriptStyle(mb.style)) {} @@ -72,7 +71,6 @@ MathStyles smallerFracStyle(MathStyles st) return LM_ST_DISPLAY; } - MathFracChanger::MathFracChanger(MathMetricsBase & mb) : MathStyleChanger(mb, smallerFracStyle(mb.style)) {} @@ -93,7 +91,6 @@ MathShapeChanger::~MathShapeChanger() - MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style) : MathChanger(mb) { @@ -112,7 +109,6 @@ MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style) mb.style = style; } - MathStyleChanger::~MathStyleChanger() { orig_ = save_; @@ -120,7 +116,6 @@ MathStyleChanger::~MathStyleChanger() - MathFontSetChanger::MathFontSetChanger(MathMetricsBase & mb, char const * name) : MathChanger(mb) {