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

diff --git a/src/ChangeLog b/src/ChangeLog
index 11c3ddb2951f706cb56ce991cfba716902f453ff..2eab49bf922b67512965b64835d5e515075cfe4d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * pspell.C: fix a crash, and allow new aspell to work

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index f35b86604b7b0f49178f73d30947089904279659..b2167379d426c4958ad4a4b5b79ca850668bc211 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -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>
 
        * LyXView.C: isLyxClean->isClean

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 31220bf0f7dfce598c752c2358895c3c9c729c30..7dd8ced1822100c685631c778ec665cd7dfcf66f 100644 (file)
--- 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 d2b8e1caf04fd7f93871c94c8ba3e983bf195f29..a82f5010157eac5bf090affad6a159d16ddf7edb 100644 (file)
--- 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 1235e77b4b0ff692d5461719d539d1a4c4ef816a..15f2ed82e9fd521617fd9b3f6fb19ba9ead332fc 100644 (file)
--- 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<MathMetricsBase>(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<MathMetricsBase>(mb)
 {