Merge branch 'minimizebutton'

diff --git a/main.cpp b/main.cpp
index 2ebb39f..ba9a9c9 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -27,6 +27,7 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     a.setApplicationName("Ghosts Overboard");
+    a.setOrganizationName("Ghosts Overboard");
     a.setApplicationVersion("0.2.1");
     a.setWindowIcon(QIcon(":/pix/laiva_3aave.png"));
     SeaView w;

diff --git a/seascene.cpp b/seascene.cpp
index 7b0bad4..1eec000 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -32,6 +32,7 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QVBoxLayout>
+#include <QSettings>
 
 const QString ghostImageFilename_ = ":/pix/aave.png";
 const QString rockImageFilename_ =":/pix/kari.png";
@@ -75,6 +76,8 @@ SeaScene::SeaScene(QObject *parent) :
     pVibrateAction_ = new QAction(tr("Vibration effects"),this);
     pVibrateAction_->setCheckable(true);
     connect(pVibrateAction_,SIGNAL(toggled(bool)),this,SLOT(vibrationActivate(bool)));
+    QSettings settings;
+    pVibrateAction_->setChecked(settings.value("vibration",false).toBool());
 
 
     pPauseAction_ = new QAction(tr("Pause"),this);
@@ -82,6 +85,11 @@ SeaScene::SeaScene(QObject *parent) :
     connect(pPauseAction_,SIGNAL(toggled(bool)),this,SLOT(pause(bool)));
 
 
+    autopauseTimer.setSingleShot(true);
+    autopauseTimer.setInterval(15*60*1000);
+    connect(&autopauseTimer,SIGNAL(timeout()),this,SLOT(forcePause()));
+
+
 }
 
 void SeaScene::setupMap(int ghosts, int rocks, int octopuses, int octopusSpeed)
@@ -208,6 +216,8 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses, int octopusSpeed)
         connect(pOctopus,SIGNAL(droppingGhosts()),pShip,SLOT(dropAllGhosts()));
     }
     delete pPosition;
+
+
 }
 
 void SeaScene::setupMap(Level level)
@@ -340,6 +350,8 @@ void SeaScene::pause(bool paused)
             screenLitKeeper_.keepScreenLit(true);
             if (pPausetextItem_)
                 pPausetextItem_->hide();
+
+            autopauseTimer.start(); //Start counting towards autopause
         }
 
         else
@@ -354,6 +366,8 @@ void SeaScene::pause(bool paused)
                 qDebug() << "showing pause text";
             }
                 else qDebug() << "No pause text available";
+
+            autopauseTimer.stop(); //No need to count toward autopause when already paused
         }
 }
 
@@ -410,13 +424,20 @@ void SeaScene::handleScreenTapped()
     else if (pItem == pSettingsItem_)
     {
     //Temporary code for settings, likely to be turned into a QML dialog
+          QSettings settings;
 
           QMessageBox::StandardButton buttonpressed = QMessageBox::question(NULL,"Settings","Do you wish to have vibration effects enabled?", QMessageBox::Yes | QMessageBox::No);
 
           if (buttonpressed == QMessageBox::Yes)
+          {
               pVibrateAction_->setChecked(true);
+              settings.setValue("vibration",true);
+          }
           if (buttonpressed == QMessageBox::No)
+          {
               pVibrateAction_->setChecked(false);
+              settings.setValue("vibration",false);
+          }
     }
 
     else if (pItem == pAboutItem_)
@@ -539,6 +560,7 @@ void SeaScene::restartLevel()
     setupMap(levelList_.value(currentLevel_));  //value() returns default constructor Level if index is invalid, so no risk of crash
     vibrationActivate(pVibrateAction_->isChecked());  //Vibration effects are lost without this
    // qDebug() << pVibrateAction_->isChecked();
+    autopauseTimer.start();  //reset counting towards autopause
 }
 
 

diff --git a/seascene.h b/seascene.h
index a19ea5e..4fbbd3d 100644 (file)
--- a/seascene.h
+++ b/seascene.h
@@ -29,6 +29,7 @@
 #include "screenlitkeeper.h"
 #include "level.h"
 #include <QAction>
+#include <QTimer>
 
 class SeaScene : public QGraphicsScene
 {
@@ -132,6 +133,7 @@ protected:
 
     bool pauseForced_;
 
+    QTimer autopauseTimer;
 
 };