Merge branch 'shipimages'

diff --git a/main.cpp b/main.cpp
index 5360a7c..d3e3103 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,8 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
+    a.setApplicationName("Ghosts Overboard");
+    a.setApplicationVersion("0.0.1");
     MainWindow w;
 #if defined(Q_WS_S60)
     w.showMaximized();

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6cfa7c3..afd032d 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5,6 +5,8 @@
 #include <QDebug>
 #include <QAction>
 #include <QMenuBar>
+#include <QMessageBox>
+#include <QApplication>
 
 
 
@@ -13,6 +15,8 @@ MainWindow::MainWindow(QWidget *parent)
 {
     paused_ = false;
 
+    setWindowIcon(QIcon(":/pix/laiva_10aave.png"));
+
     pScene_ = new SeaScene ();
     pView_  = new QGraphicsView ();
 
@@ -29,12 +33,16 @@ MainWindow::MainWindow(QWidget *parent)
     menuBar()->addAction(pPauseAction);
 
     QAction * pRestartLevelAction = new QAction(tr("Restart level"),this);
-    pRestartLevelAction->setCheckable(true);
     addAction(pRestartLevelAction);
     connect(pRestartLevelAction,SIGNAL(triggered()),this,SLOT(restartLevel()));
     menuBar()->addAction(pRestartLevelAction);
 
 
+    QAction * pAboutAction = new QAction(tr("About"),this);
+    addAction(pAboutAction);
+    connect(pAboutAction,SIGNAL(triggered()),this,SLOT(about()));
+    menuBar()->addAction(pAboutAction);
+
 
     //the boundaries of the scene are set to match the size of the view window, which is not
     //available in the constructor --> timer needed
@@ -96,3 +104,15 @@ void MainWindow::restartLevel()
 {
     pScene_->setupMap(5,5,5);
 }
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About %1").arg(QApplication::applicationName()),
+                       tr("Version %1"
+                          "<p>Copyright 2011 Heli Hyv&auml;ttinen"
+                          "<p>License: General Public License v2"
+                          ).arg(QApplication::applicationVersion()));
+
+
+
+}

diff --git a/mainwindow.h b/mainwindow.h
index 778ea5d..75f4779 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -18,6 +18,7 @@ public slots:
     void initializeBoundaries();
     void pause(bool paused);
     void restartLevel();
+    void about();
 
 private: