anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Localize slogan on LyX banner

Browse Source 
Fixes: #11107
This commit is contained in:
Juergen Spitzmueller 2018-04-29 11:26:25 +02:00
parent 58d7bad447
commit 0423d381e6
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/images/banner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 294 KiB

BIN
lib/images/banner.svgz
View File

Binary file not shown.

BIN
lib/images/banner@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

17
src/frontends/qt4/GuiView.cpp
View File

@ -157,6 +157,8 @@ public:
if (!lyxrc.show_banner) if (!lyxrc.show_banner)
return; return;
/// The text to be written on top of the pixmap /// 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 ? QString const text = lyx_version ?
qt_("version ") + lyx_version : qt_("unknown version"); qt_("version ") + lyx_version : qt_("unknown version");
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
@ -178,7 +180,9 @@ public:
QPainter pain(&splash_); QPainter pain(&splash_);
pain.setPen(QColor(0, 0, 0)); pain.setPen(QColor(0, 0, 0));
qreal const fsize = fontSize(); 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, LYXERR(Debug::GUI,
"widget pixel ratio: " << pixelRatio() << "widget pixel ratio: " << pixelRatio() <<
" splash pixel ratio: " << splashPixelRatio() << " splash pixel ratio: " << splashPixelRatio() <<
@ -190,6 +194,12 @@ public:
font.setPointSizeF(fsize); font.setPointSizeF(fsize);
pain.setFont(font); pain.setFont(font);
pain.drawText(position, text); 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); setFocusPolicy(Qt::StrongFocus);
} }
@ -237,8 +247,9 @@ private:
return toqstr(lyxrc.font_sizes[FONT_SIZE_NORMAL]).toDouble(); return toqstr(lyxrc.font_sizes[FONT_SIZE_NORMAL]).toDouble();
} }
QPointF textPosition() const { QPointF textPosition(bool const heading) const {
return QPointF(width_/2 - 18, height_/2 + 45); return heading ? QPointF(width_/2 - 18, height_/2 - 45)
: QPointF(width_/2 - 18, height_/2 + 45);
} }
QSize splashSize() const { QSize splashSize() const {