diff --git a/src/browser/AboutDialog.cpp b/src/browser/AboutDialog.cpp new file mode 100644 index 0000000..d446526 --- /dev/null +++ b/src/browser/AboutDialog.cpp @@ -0,0 +1,65 @@ +/******************************************************************** + * a A + * AM\/MA + * (MA:MMD + * :: VD + * :: º + * :: + * :: ** .A$MMMMND AMMMD AMMM6 MMMM MMMM6 + + 6::Z. TMMM MMMMMMMMMDA VMMMD AMMM6 MMMMMMMMM6 + * 6M:AMMJMMOD V MMMA VMMMD AMMM6 MMMMMMM6 + * :: TMMTMC ___MMMM VMMMMMMM6 MMMM + * MMM TMMMTTM, AMMMMMMMM VMMMMM6 MMMM + * :: MM TMMTMMMD MMMMMMMMMM MMMMMM MMMM + * :: MMMTTMMM6 MMMMMMMMMMM AMMMMMMD MMMM + * :. MMMMMM6 MMMM MMMM AMMMMMMMMD MMMM + * TTMMT MMMM MMMM AMMM6 MMMMD MMMM + * TMMMM8 MMMMMMMMMMM AMMM6 MMMMD MMMM + * TMMMMMM$ MMMM6 MMMM AMMM6 MMMMD MMMM + * TMMM MMMM + * TMMM .MMM + * TMM .MMD ARBITRARY·······XML········RENDERING + * TMM MMA ==================================== + * TMN MM + * MN ZM + * MM, + * + * + * AUTHORS: see AUTHORS file + * + * COPYRIGHT: ©2012 - All Rights Reserved + * + * LICENSE: see LICENSE file + * + * WEB: http://axr.vg + * + * THIS CODE AND INFORMATION ARE PROVIDED "AS IS" + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR + * FITNESS FOR A PARTICULAR PURPOSE. + * + ********************************************************************/ + +#include "aboutdialog.h" +#include "ui_aboutdialog.h" +#include "config.h" +#include "AXRGlobal.h" + +AboutDialog::AboutDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::AboutDialog) +{ + ui->setupUi(this); + + ui->mainLabel->setText(ui->mainLabel->text() + .arg(BROWSER_VERSION_STRING) + .arg(__TIMESTAMP__) + .arg(AXR_VERSION_STRING) + .arg(axrVersionString())); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} diff --git a/src/browser/AboutDialog.h b/src/browser/AboutDialog.h new file mode 100644 index 0000000..faf5f1f --- /dev/null +++ b/src/browser/AboutDialog.h @@ -0,0 +1,65 @@ +/******************************************************************** + * a A + * AM\/MA + * (MA:MMD + * :: VD + * :: º + * :: + * :: ** .A$MMMMND AMMMD AMMM6 MMMM MMMM6 + + 6::Z. TMMM MMMMMMMMMDA VMMMD AMMM6 MMMMMMMMM6 + * 6M:AMMJMMOD V MMMA VMMMD AMMM6 MMMMMMM6 + * :: TMMTMC ___MMMM VMMMMMMM6 MMMM + * MMM TMMMTTM, AMMMMMMMM VMMMMM6 MMMM + * :: MM TMMTMMMD MMMMMMMMMM MMMMMM MMMM + * :: MMMTTMMM6 MMMMMMMMMMM AMMMMMMD MMMM + * :. MMMMMM6 MMMM MMMM AMMMMMMMMD MMMM + * TTMMT MMMM MMMM AMMM6 MMMMD MMMM + * TMMMM8 MMMMMMMMMMM AMMM6 MMMMD MMMM + * TMMMMMM$ MMMM6 MMMM AMMM6 MMMMD MMMM + * TMMM MMMM + * TMMM .MMM + * TMM .MMD ARBITRARY·······XML········RENDERING + * TMM MMA ==================================== + * TMN MM + * MN ZM + * MM, + * + * + * AUTHORS: see AUTHORS file + * + * COPYRIGHT: ©2012 - All Rights Reserved + * + * LICENSE: see LICENSE file + * + * WEB: http://axr.vg + * + * THIS CODE AND INFORMATION ARE PROVIDED "AS IS" + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR + * FITNESS FOR A PARTICULAR PURPOSE. + * + ********************************************************************/ + +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include + +namespace Ui { +class AboutDialog; +} + +class AboutDialog : public QDialog +{ + Q_OBJECT + +public: + explicit AboutDialog(QWidget *parent = 0); + ~AboutDialog(); + +private: + Ui::AboutDialog *ui; +}; + +#endif // ABOUTDIALOG_H diff --git a/src/browser/AboutDialog.ui b/src/browser/AboutDialog.ui new file mode 100644 index 0000000..38ef652 --- /dev/null +++ b/src/browser/AboutDialog.ui @@ -0,0 +1,97 @@ + + + AboutDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 400 + 250 + + + + About AXR Browser + + + + + + <html><head/><body><p align="center"><span style=" font-size:18pt; font-weight:600;">AXR Browser</span></p><p><span style=" font-weight:600;">Version:</span> %1 (built %2)</p><p><span style=" font-weight:600;">AXR core version:</span> %3 (runtime version %4)</p></body></html> + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Copyright (c) 2010-2012 AXR Project Contributors. All Rights Reserved. + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + true + + + + + + + + + buttonBox + accepted() + AboutDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AboutDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/browser/BrowserApplication.cpp b/src/browser/BrowserApplication.cpp index 266c447..3a41fea 100644 --- a/src/browser/BrowserApplication.cpp +++ b/src/browser/BrowserApplication.cpp @@ -49,6 +49,7 @@ #include "AXRWarning.h" #include "LogWindow.h" #include "PreferencesDialog.h" +#include "AboutDialog.h" #include "BrowserApplication.h" #include "BrowserSettings.h" #include "BrowserWindow.h" @@ -60,6 +61,7 @@ class BrowserApplication::Private PreferencesDialog *preferencesDialog; LogWindow *logWindow; BrowserWindow *mainWindow; + AboutDialog *aboutDialog; }; BrowserApplication::BrowserApplication(int &argc, char **argv) @@ -74,6 +76,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) d->settings = new BrowserSettings(); d->preferencesDialog = new PreferencesDialog(); + d->aboutDialog = new AboutDialog(); d->logWindow = new LogWindow(); d->mainWindow = new BrowserWindow(); d->mainWindow->show(); @@ -107,6 +110,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) BrowserApplication::~BrowserApplication() { delete d->mainWindow; + delete d->aboutDialog; delete d->logWindow; delete d->preferencesDialog; delete d->settings; @@ -173,3 +177,8 @@ void BrowserApplication::showLogWindow() { d->logWindow->show(); } + +void BrowserApplication::showAboutDialog() +{ + d->aboutDialog->show(); +} diff --git a/src/browser/BrowserApplication.h b/src/browser/BrowserApplication.h index dd319ba..b3bdd19 100644 --- a/src/browser/BrowserApplication.h +++ b/src/browser/BrowserApplication.h @@ -61,6 +61,7 @@ class BrowserApplication : public QApplication QIODevice* loggingDevice() const; void showPreferencesDialog(); void showLogWindow(); + void showAboutDialog(); protected: bool event(QEvent *e); diff --git a/src/browser/BrowserWindow.cpp b/src/browser/BrowserWindow.cpp index d5891fc..e22f4c2 100644 --- a/src/browser/BrowserWindow.cpp +++ b/src/browser/BrowserWindow.cpp @@ -336,6 +336,7 @@ void BrowserWindow::showPreferences() void BrowserWindow::showAbout() { + qApp->showAboutDialog(); } void BrowserWindow::toggleAntialiasing(bool on) diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt index 637261e..86b8d70 100644 --- a/src/browser/CMakeLists.txt +++ b/src/browser/CMakeLists.txt @@ -6,6 +6,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}) set(browser_SOURCES Info.plist + AboutDialog.cpp + AboutDialog.h + AboutDialog.ui LogWindow.cpp LogWindow.h LogWindow.ui diff --git a/src/core b/src/core index a61b193..8f06bc4 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit a61b1933207fa55eea4004727da4427aea26735d +Subproject commit 8f06bc4b289e50ebcb064cf8291839c442afa9c9