SubsurfaceAbout class cleanup.

Main change is that now SubsurfaceAbout doesn't have instance object, but
it constructs and destructs dynamically.

 * Remove the static SubsurfaceAbout::instance() class member
 * construct/destruct about dialog on demand
 * Other small aboutbox cleanups.

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
ACK-ed-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 7 insertions, 20 deletions

diff --git a/qt-ui/about.cpp b/qt-ui/about.cpp
index 0a6489d93..804d73b7c 100644
--- a/qt-ui/about.cpp
+++ b/qt-ui/about.cpp
@@ -1,39 +1,26 @@
 #include "about.h"
 #include "ssrf-version.h"
-#include "mainwindow.h"
-#include <QDebug>
-#include <QDialogButtonBox>
-#include <QNetworkReply>
-#include <qdesktopservices.h>
-
-SubsurfaceAbout *SubsurfaceAbout::instance()
-{
-	static SubsurfaceAbout *self = new SubsurfaceAbout(mainWindow());
-	self->setAttribute(Qt::WA_QuitOnClose, false);
-	return self;
-}
+#include <QDesktopServices>
+#include <QUrl>
 
 SubsurfaceAbout::SubsurfaceAbout(QWidget* parent, Qt::WindowFlags f)
 {
 	ui.setupUi(this);
+
+	setWindowModality(Qt::ApplicationModal);
+
 	ui.aboutLabel->setText(tr("<span style='font-size: 18pt; font-weight: bold;'>" \
 		"Subsurface %1 </span><br><br>" \
 		"Multi-platform divelog software<br>" \
 		"<span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, and others, 2011-2014</span>").arg(VERSION_STRING));
-	licenseButton = new QPushButton(tr("&License"));
-	websiteButton = new QPushButton(tr("&Website"));
-	ui.buttonBox->addButton(licenseButton, QDialogButtonBox::ActionRole);
-	ui.buttonBox->addButton(websiteButton, QDialogButtonBox::ActionRole);
-	connect(licenseButton, SIGNAL(clicked(bool)), this, SLOT(licenseClicked()));
-	connect(websiteButton, SIGNAL(clicked(bool)), this, SLOT(websiteClicked()));
 }
 
-void SubsurfaceAbout::licenseClicked(void)
+void SubsurfaceAbout::on_licenseButton_clicked()
 {
 	QDesktopServices::openUrl(QUrl("http://www.gnu.org/licenses/gpl-2.0.txt"));
 }
 
-void SubsurfaceAbout::websiteClicked(void)
+void SubsurfaceAbout::on_websiteButton_clicked()
 {
 	QDesktopServices::openUrl(QUrl("http://subsurface.hohndel.org"));
 }