X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiAbout.cpp;h=dfe6d5c27e1659d295e448cd81fbbdd80b382a7b;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=7c9c38aa039d0f5c35041d66a8b85c85e9ff9c66;hpb=6bb9cf4918941fc0c62c1f1d1dadb53a152c3cef;p=lyx.git

diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp
index 7c9c38aa03..dfe6d5c27e 100644
--- a/src/frontends/qt4/GuiAbout.cpp
+++ b/src/frontends/qt4/GuiAbout.cpp
@@ -12,6 +12,8 @@
 
 #include "GuiAbout.h"
 
+#include "ui_AboutUi.h"
+
 #include "qt_helpers.h"
 #include "version.h"
 
@@ -58,9 +60,14 @@ static QString credits()
 			line = ts.readLine();
 			if (line.startsWith("@b"))
 				out << "<b>" << line.mid(2) << "</b>";
-			else if (line.startsWith("@i"))
+			else if (line.startsWith("@i")) {
+				if (line.startsWith("@iE-mail")) {
+					// unmask email
+					line.replace(QString(" () "), QString("@"));
+					line.replace(QString(" ! "), QString("."));
+				}
 				out << "<i>" << line.mid(2) << "</i>";
-			else
+			} else
 				out << line;
 			out << "<br>";
 		} while (!line.isNull());
@@ -94,15 +101,21 @@ static QString disclaimer()
 
 static QString version()
 {
-	QLocale loc;
-	QString loc_release_date =
-		loc.toString(release_date(), QLocale::LongFormat);
-	if (lyx_release_date == "not released yet")
-		loc_release_date = qt_("not released yet");
+	QString loc_release_date;
+	QDate date = release_date();
+	if (date.isValid()) {
+		QLocale loc;
+		loc_release_date = loc.toString(date, QLocale::LongFormat);
+	} else {
+		if (QString(lyx_release_date) == "not released yet")
+			loc_release_date = qt_("not released yet");
+		else
+			loc_release_date = toqstr(lyx_release_date);
+	}
 	docstring version_date =
-		bformat(_("LyX Version %1$s\n(%2$s)\n\n"),
+		bformat(_("LyX Version %1$s\n(%2$s)"),
 			from_ascii(lyx_version),
-			qstring_to_ucs4(loc_release_date));
+			qstring_to_ucs4(loc_release_date))+"\n\n";
 	QString res;
 	QTextStream out(&res);
 	out << toqstr(version_date);
@@ -115,21 +128,32 @@ static QString version()
 }
 
 
+struct GuiAbout::Private
+{
+	Ui::AboutUi ui;
+};
+
+
 GuiAbout::GuiAbout(GuiView & lv)
-	: GuiDialog(lv, "aboutlyx", qt_("About LyX"))
+	: DialogView(lv, "aboutlyx", qt_("About LyX")),
+	d(new GuiAbout::Private)
 {
-	setupUi(this);
+	d->ui.setupUi(this);
+
+	d->ui.copyrightTB->setPlainText(copyright());
+	d->ui.copyrightTB->append(QString());
+	d->ui.copyrightTB->append(license());
+	d->ui.copyrightTB->append(QString());
+	d->ui.copyrightTB->append(disclaimer());
 
-	connect(closePB, SIGNAL(clicked()), this, SLOT(reject()));
+	d->ui.versionLA->setText(version());
+	d->ui.creditsTB->setHtml(credits());
+}
 
-	copyrightTB->setPlainText(copyright());
-	copyrightTB->append(QString());
-	copyrightTB->append(license());
-	copyrightTB->append(QString());
-	copyrightTB->append(disclaimer());
 
-	versionLA->setText(version());
-	creditsTB->setHtml(credits());
+void GuiAbout::on_closePB_clicked()
+{
+	close();
 }