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
This commit is contained in:
André Pönitz 2002-08-06 13:00:50 +00:00
parent 7d1204efef
commit 6c12adeebe
5 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2002-08-06 André Pönitz <poenitz@gmx.net>
* lyxrc.C: set default for show_banner to true
2002-08-06 John Levon <levon@movementarian.org> 2002-08-06 John Levon <levon@movementarian.org>
* pspell.C: fix a crash, and allow new aspell to work * pspell.C: fix a crash, and allow new aspell to work

View File

@ -1,3 +1,7 @@
2002-08-06 André Poentiz <poenitz@gmx.net>
* Screen.C: Honor \show_banner lyxrc setting
2002-08-04 John Levon <levon@movementarian.org> 2002-08-04 John Levon <levon@movementarian.org>
* LyXView.C: isLyxClean->isClean * LyXView.C: isLyxClean->isClean

View File

@ -16,6 +16,7 @@
#include "screen.h" #include "screen.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "lyxrc.h"
#include "lyxrow.h" #include "lyxrow.h"
#include "BufferView.h" #include "BufferView.h"
#include "buffer.h" #include "buffer.h"
@ -80,6 +81,9 @@ SplashScreen const & SplashScreen::get()
SplashScreen::SplashScreen() SplashScreen::SplashScreen()
: text_(lyx_version ? lyx_version : "unknown") : text_(lyx_version ? lyx_version : "unknown")
{ {
if (!lyxrc.show_banner)
return;
string const file = LibFileSearch("images", "banner", "xpm"); string const file = LibFileSearch("images", "banner", "xpm");
if (file.empty()) if (file.empty())
return; return;

View File

@ -249,6 +249,7 @@ void LyXRC::setDefaults() {
language_command_begin = "\\selectlanguage{$$lang}"; language_command_begin = "\\selectlanguage{$$lang}";
language_command_local = "\\foreignlanguage{$$lang}{"; language_command_local = "\\foreignlanguage{$$lang}{";
default_language = "english"; default_language = "english";
show_banner = false;
// //
date_insert_format = "%A, %e %B %Y"; date_insert_format = "%A, %e %B %Y";

View File

@ -49,7 +49,6 @@ MathStyles smallerScriptStyle(MathStyles st)
return LM_ST_DISPLAY; return LM_ST_DISPLAY;
} }
MathScriptChanger::MathScriptChanger(MathMetricsBase & mb) MathScriptChanger::MathScriptChanger(MathMetricsBase & mb)
: MathStyleChanger(mb, smallerScriptStyle(mb.style)) : MathStyleChanger(mb, smallerScriptStyle(mb.style))
{} {}
@ -72,7 +71,6 @@ MathStyles smallerFracStyle(MathStyles st)
return LM_ST_DISPLAY; return LM_ST_DISPLAY;
} }
MathFracChanger::MathFracChanger(MathMetricsBase & mb) MathFracChanger::MathFracChanger(MathMetricsBase & mb)
: MathStyleChanger(mb, smallerFracStyle(mb.style)) : MathStyleChanger(mb, smallerFracStyle(mb.style))
{} {}
@ -93,7 +91,6 @@ MathShapeChanger::~MathShapeChanger()
MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style) MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style)
: MathChanger<MathMetricsBase>(mb) : MathChanger<MathMetricsBase>(mb)
{ {
@ -112,7 +109,6 @@ MathStyleChanger::MathStyleChanger(MathMetricsBase & mb, MathStyles style)
mb.style = style; mb.style = style;
} }
MathStyleChanger::~MathStyleChanger() MathStyleChanger::~MathStyleChanger()
{ {
orig_ = save_; orig_ = save_;
@ -120,7 +116,6 @@ MathStyleChanger::~MathStyleChanger()
MathFontSetChanger::MathFontSetChanger(MathMetricsBase & mb, char const * name) MathFontSetChanger::MathFontSetChanger(MathMetricsBase & mb, char const * name)
: MathChanger<MathMetricsBase>(mb) : MathChanger<MathMetricsBase>(mb)
{ {