diff options
author | vng <viktor.govako@gmail.com> | 2013-02-21 23:17:52 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:22 +0300 |
commit | f4a9517f296862ee33899a8a5d3542d50b8075fc (patch) | |
tree | ec8ab2f12a86da9749e64b5c8030c97557819cbe /qt/about.cpp | |
parent | 04c48bb054e3062dda273a4bd3f35911dce5c449 (diff) |
- Remove version.pro generating;
- New HEADER format for mwm container with mwm data version;
- Increase mom version because of new search index format;
Diffstat (limited to 'qt/about.cpp')
-rw-r--r-- | qt/about.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/qt/about.cpp b/qt/about.cpp index f04ca97975..738940b3c1 100644 --- a/qt/about.cpp +++ b/qt/about.cpp @@ -1,7 +1,5 @@ #include "about.hpp" -#include "../version/version.hpp" - #include "../platform/platform.hpp" #include <QtCore/QFile> @@ -12,6 +10,7 @@ #include <QtGui/QLabel> #include <QtGui/QTextBrowser> + AboutDialog::AboutDialog(QWidget * parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint) { @@ -22,12 +21,7 @@ AboutDialog::AboutDialog(QWidget * parent) QLabel * labelIcon = new QLabel(); labelIcon->setPixmap(icon.pixmap(128)); - QString const versionString = tr("<h3>%1 %2</h3>" - "<br/>" - "Built on %3" - ).arg(QString("MapsWithMe"), QLatin1String(VERSION_STRING), - QLatin1String(VERSION_DATE_STRING)); - QLabel * labelVersion = new QLabel(versionString); + QLabel * labelVersion = new QLabel(QString::fromAscii("TODO: Insert version to bundle.")); QHBoxLayout * hBox = new QHBoxLayout(); hBox->addWidget(labelIcon); @@ -39,8 +33,10 @@ AboutDialog::AboutDialog(QWidget * parent) ReaderPtr<Reader> reader = GetPlatform().GetReader("about.html"); reader.ReadAsString(aboutText); } - catch (...) - {} + catch (RootException const & ex) + { + LOG(LWARNING, ("About text error: ", ex.Msg())); + } if (!aboutText.empty()) { |