The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 4ab8e4a009079e4540c49178d14637f55e43719b Author: Scott Kostyshak <skost...@lyx.org> Date: Sun Oct 7 11:27:07 2012 -0400 Add tab with build information to Help > About LyX The tab displays the same information as the 'lyx --version' command. diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp index fcd0653..8a75a53 100644 --- a/src/frontends/qt4/GuiAbout.cpp +++ b/src/frontends/qt4/GuiAbout.cpp @@ -132,6 +132,18 @@ static QString version() return res; } +static QString buildinfo() +{ + QString res; + QTextStream out(&res); + out << "LyX " << lyx_version + << " (" << lyx_release_date << ")" << endl; + out << "Built on " << __DATE__ << ", " << __TIME__ << endl; + + out << lyx_version_info << endl; + return res; +} + struct GuiAbout::Private { @@ -152,6 +164,7 @@ GuiAbout::GuiAbout(GuiView & lv) d->ui.copyrightTB->append(disclaimer()); d->ui.versionLA->setText(version()); + d->ui.buildinfoTB->setText(buildinfo()); d->ui.creditsTB->setHtml(credits()); } diff --git a/src/frontends/qt4/ui/AboutUi.ui b/src/frontends/qt4/ui/AboutUi.ui index 5333a7f..ed5d153 100644 --- a/src/frontends/qt4/ui/AboutUi.ui +++ b/src/frontends/qt4/ui/AboutUi.ui @@ -94,6 +94,22 @@ </item> </layout> </widget> + <widget class="QWidget" name="buildinfotab" > + <attribute name="title" > + <string>Build Info</string> + </attribute> + <layout class="QGridLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="0" column="0" > + <widget class="QTextBrowser" name="buildinfoTB" /> + </item> + </layout> + </widget> </widget> </item> <item row="1" column="0" > ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiAbout.cpp | 13 +++++++++++++ src/frontends/qt4/ui/AboutUi.ui | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository