restore the old LyX banner in preparation of the next release;

replace banner.ppm by banner.png

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 2ce68d2019a505b703e7ed8c7699c62b0108543c..29e6342812ccfde9bbc629df048907745fedfce9 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -1483,7 +1483,7 @@ lib_images_files = Split('''
     all-changes-reject.xpm
     all-changes-accept.xpm
     amssymb.xpm
-    banner.ppm
+    banner.png
     bookmark-goto.xpm
     bookmark-save.xpm
     break-line.xpm

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d1336b2aab29139c5c8c8c648f5d3976f9585522..84b84dc3cd164984b0eb3c45f0bf01f8a7d0bd3b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -215,7 +215,7 @@ dist_images_DATA = \
        images/all-changes-accept.xpm \
        images/all-changes-reject.xpm \
        images/amssymb.xpm \
-       images/banner.ppm \
+       images/banner.png \
        images/bookmark-goto.xpm \
        images/bookmark-save.xpm \
        images/break-line.xpm \

diff --git a/lib/images/banner.png b/lib/images/banner.png
new file mode 100644 (file)
index 0000000..7741c04
Binary files /dev/null and b/lib/images/banner.png differ

diff --git a/lib/images/banner.ppm b/lib/images/banner.ppm
deleted file mode 100644 (file)
index 2b112ab..0000000
Binary files a/lib/images/banner.ppm and /dev/null differ

diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index 4e8d0cb972ce52063a2ff57b2eb90feecd42ba03..d7a4a9a27fd34fae7a86913326c78666838d0abe 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -465,7 +465,7 @@ void GuiWorkArea::doGreyOut(QLPainter & pain)
        LYXERR(Debug::GUI) << "show banner: " << lyxrc.show_banner << endl;
        /// The text to be written on top of the pixmap
        QString const text = lyx_version ? QString(lyx_version) : qt_("unknown version");
-       FileName const file = support::libFileSearch("images", "banner", "ppm");
+       FileName const file = support::libFileSearch("images", "banner", "png");
        if (file.empty())
                return;
 

diff --git a/src/frontends/qt4/QLImage.C b/src/frontends/qt4/QLImage.C
index acf5fd28eaeb78b228ccb84321ad404c758a6eda..18aa9f9bd0c3d3dab095f98235714891f02cf9de 100644 (file)
--- a/src/frontends/qt4/QLImage.C
+++ b/src/frontends/qt4/QLImage.C
@@ -68,10 +68,10 @@ Image::FormatList QLImage::loadableFormats()
 
 
 //     LYXERR(Debug::GRAPHICS)
-//             << "D:/msys/home/yns/src/lyx-devel/lib/images/banner.ppm is of format: "
-//             << fromqstr(Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.ppm"))
+//             << "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: "
+//             << fromqstr(Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png"))
 //             << endl;
-//     if (Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.ppm"))
+//     if (Pic.pictureFormat("D:/msys/home/yns/src/lyx-devel/lib/images/banner.png"))
 //             LYXERR(Debug::GRAPHICS)
 //                     << "pictureFormat not returned NULL\n" << endl;
 //                     << "Supported formats are: " << Pic.inputFormats() << endl;