From e44591e1a51faf6f5eeb6026d629ecb8e872c09b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 26 Mar 2007 15:58:00 +0000 Subject: [PATCH] * src/frontends/controllers/ControlAboutlyx.[Ch]: * src/frontends/qt4/QAbout.C: - revert r17572 and restore the correct copyright notice. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17575 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ControlAboutlyx.C | 6 ++++++ src/frontends/controllers/ControlAboutlyx.h | 1 + src/frontends/qt4/QAbout.C | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C index 55053f3bee..95b766f89a 100644 --- a/src/frontends/controllers/ControlAboutlyx.C +++ b/src/frontends/controllers/ControlAboutlyx.C @@ -68,6 +68,12 @@ string const ControlAboutlyx::getCopyright() const } +string const ControlAboutlyx::getLicense() const +{ + return lyx::to_utf8(_("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.")); +} + + string const ControlAboutlyx::getDisclaimer() const { return lyx::to_utf8(_("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")); diff --git a/src/frontends/controllers/ControlAboutlyx.h b/src/frontends/controllers/ControlAboutlyx.h index a105c07868..7cfa322b3a 100644 --- a/src/frontends/controllers/ControlAboutlyx.h +++ b/src/frontends/controllers/ControlAboutlyx.h @@ -37,6 +37,7 @@ public: /// Provide the View with specific pieces of information. void getCredits(std::ostream &) const; std::string const getCopyright() const; + std::string const getLicense() const; std::string const getDisclaimer() const; std::string const getVersion() const; //@} diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C index b45c0a3a9f..ed72ffb64a 100644 --- a/src/frontends/qt4/QAbout.C +++ b/src/frontends/qt4/QAbout.C @@ -53,7 +53,9 @@ void QAbout::build_dialog() this, SLOT(slotClose())); dialog_->copyrightTB->setPlainText(toqstr(controller().getCopyright())); - dialog_->copyrightTB->append("\n"); + dialog_->copyrightTB->append(""); + dialog_->copyrightTB->append(toqstr(controller().getLicense())); + dialog_->copyrightTB->append(""); dialog_->copyrightTB->append(toqstr(controller().getDisclaimer())); dialog_->versionLA->setText(toqstr(controller().getVersion())); -- 2.39.5