* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiAbout.cpp

diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp
index c5a484f0816c2b36fd58877b60e99b94fce78ef8..dfe6d5c27e1659d295e448cd81fbbdd80b382a7b 100644 (file)
--- 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,11 +101,13 @@ static QString disclaimer()
 
 static QString version()
 {
-       QLocale loc;
-       QString loc_release_date =
-               loc.toString(release_date(), QLocale::LongFormat);
-       if (loc_release_date.isEmpty()) {
-               if (lyx_release_date == "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);
@@ -119,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();
 }