From 5490e7545b1207e207f05d7c692f02cf4cd1ffe8 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller
") + _("Built from git commit hash ") + from_utf8(lyx_git_commit_hash).substr(0,8); QString res; QTextStream out(&res); - out << toqstr(version_date) << "\n"; - out << toqstr(bformat(_("Qt Version (run-time): %1$s"), from_ascii(qVersion()))) << "\n"; + out << toqstr("
"); + out << toqstr(version_date) << "
"; + out << toqstr(bformat(_("Qt Version (run-time): %1$s"), from_ascii(qVersion()))) << "
"; out << toqstr(bformat(_("Qt Version (compile-time): %1$s"), from_ascii(QT_VERSION_STR))); + out << toqstr("
"); return res; } @@ -299,9 +301,6 @@ GuiAbout::GuiAbout(GuiView & lv) { d->ui.setupUi(this); - // fix height to minimum - setFixedHeight(sizeHint().height()); - d->ui.copyrightTB->setPlainText(copyright()); d->ui.copyrightTB->append(QString()); d->ui.copyrightTB->append(license()); @@ -309,6 +308,11 @@ GuiAbout::GuiAbout(GuiView & lv) d->ui.copyrightTB->append(disclaimer()); d->ui.versionLA->setText(version()); + QPixmap icon = getPixmap("images/", "lyx", "svg,png"); + int const iconsize = d->ui.versionLA->height() * 1.5; + d->ui.iconLA->setPixmap(icon.scaled(iconsize, iconsize, + Qt::IgnoreAspectRatio, + Qt::SmoothTransformation)); d->ui.dirLibraryLA->setText(dirLibrary()); d->ui.dirUserLA->setText(dirUser()); d->ui.buildinfoTB->setText(buildinfo()); @@ -317,6 +321,9 @@ GuiAbout::GuiAbout(GuiView & lv) d->ui.creditsTB->setHtml(credits()); d->ui.tab->setUsesScrollButtons(false); + + // fix height to minimum + setFixedHeight(sizeHint().height()); } diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui index 4db3359ff4..9ae795d1fc 100644 --- a/src/frontends/qt/ui/AboutUi.ui +++ b/src/frontends/qt/ui/AboutUi.ui @@ -7,7 +7,7 @@