From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 29 Apr 2018 09:26:25 +0000 (+0200)
Subject: Localize slogan on LyX banner
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3531
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0423d381e6ae07d3a6e87dd4421aef1c8bd5896d;p=features.git

Localize slogan on LyX banner

Fixes: #11107
---

diff --git a/lib/images/banner.png b/lib/images/banner.png
index b674f3c8c7..10f9b66ed4 100644
Binary files a/lib/images/banner.png and b/lib/images/banner.png differ
diff --git a/lib/images/banner.svgz b/lib/images/banner.svgz
index f93526bc16..460cdf3784 100644
Binary files a/lib/images/banner.svgz and b/lib/images/banner.svgz differ
diff --git a/lib/images/banner@2x.png b/lib/images/banner@2x.png
index 78ae4fdc26..35c108cbde 100644
Binary files a/lib/images/banner@2x.png and b/lib/images/banner@2x.png differ
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 5d4fb2e19e..3e661790b9 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -157,6 +157,8 @@ public:
 		if (!lyxrc.show_banner)
 			return;
 		/// The text to be written on top of the pixmap
+		QString const htext = qt_("The Document\nProcessor[[welcome banner]]");
+		/// The text to be written on top of the pixmap
 		QString const text = lyx_version ?
 			qt_("version ") + lyx_version : qt_("unknown version");
 #if QT_VERSION >= 0x050000
@@ -178,7 +180,9 @@ public:
 		QPainter pain(&splash_);
 		pain.setPen(QColor(0, 0, 0));
 		qreal const fsize = fontSize();
-		QPointF const position = textPosition();
+		QPointF const position = textPosition(false);
+		QPointF const hposition = textPosition(true);
+		QRectF const hrect(hposition, splashSize());
 		LYXERR(Debug::GUI,
 			"widget pixel ratio: " << pixelRatio() <<
 			" splash pixel ratio: " << splashPixelRatio() <<
@@ -190,6 +194,12 @@ public:
 		font.setPointSizeF(fsize);
 		pain.setFont(font);
 		pain.drawText(position, text);
+		// The font used to display the version info
+		font.setStyleHint(QFont::SansSerif);
+		font.setWeight(QFont::Normal);
+		font.setPointSize(20);
+		pain.setFont(font);
+		pain.drawText(hrect, Qt::AlignLeft, htext);
 		setFocusPolicy(Qt::StrongFocus);
 	}
 
@@ -237,8 +247,9 @@ private:
 		return toqstr(lyxrc.font_sizes[FONT_SIZE_NORMAL]).toDouble();
 	}
 
-	QPointF textPosition() const {
-		return QPointF(width_/2 - 18, height_/2 + 45);
+	QPointF textPosition(bool const heading) const {
+		return heading ? QPointF(width_/2 - 18, height_/2 - 45)
+			       : QPointF(width_/2 - 18, height_/2 + 45);
 	}
 
 	QSize splashSize() const {