Clarified menu item text

[ghostsoverboard] / seascene.cpp

diff --git a/seascene.cpp b/seascene.cpp
index 6dfa748..2987d59 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************
-        Ghosts Overboard - a game for Maemo 5
+        Ghosts Overboard - a game for 'Meego 1.2 Harmattan'
 
         Copyright (C) 2011  Heli Hyvättinen
 
@@ -33,6 +33,7 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QSettings>
+#include <QPixmap>
 
 const QString ghostImageFilename_ = ":/pix/aave.png";
 const QString rockImageFilename_ =":/pix/kari.png";
@@ -108,6 +109,8 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses, int octopusSpeed)
     createMenuItems();
 
     createAboutBoxItems();
+    createVictoryItems();
+
 
     //empty the list of moving items
 
@@ -354,6 +357,7 @@ void SeaScene::pause(bool paused)
         if (paused == false)
         {
      //       qDebug() << "starting to move again";
+//            emit fullscreenRequested();   fremantle specific (since no "show statusbar" action in harmattan version)
             emit pauseOff();
             screenLitKeeper_.keepScreenLit(true);
             if (pPausetextItem_)
@@ -364,16 +368,16 @@ void SeaScene::pause(bool paused)
 
         else
         {
-         qDebug("about to stop movement");
+//         qDebug("about to stop movement");
             emit pauseOn();
             screenLitKeeper_.keepScreenLit(false);
             if (pPausetextItem_ != NULL)
             {
-                qDebug() << "about to show the pause text";
+//                qDebug() << "about to show the pause text";
                 pPausetextItem_->show();
-                qDebug() << "showing pause text";
+//                qDebug() << "showing pause text";
             }
-                else qDebug() << "No pause text available";
+//                else qDebug() << "No pause text available";
 
             autopauseTimer.stop(); //No need to count toward autopause when already paused
         }
@@ -405,7 +409,20 @@ void SeaScene::handleScreenTapped()
         }
     }
 
-    //If the game is paused, check if menu item was selected
+   
+    //If the game is paused, check if the victory item is being shown
+    if(pVictoryCongratulationsItem_)
+    {
+        if (pVictoryCongratulationsItem_->isVisibleTo(NULL)) //returns visibility to scene
+        {
+            pVictoryCongratulationsItem_->hide();
+            restartGame();
+            pPauseAction_->setChecked(false); // unpause
+            return;
+        }
+    }
+
+    //If the game is paused and no victory or about box, check if menu item was selected
 
     QList<QGraphicsItem *> items = selectedItems();
 
@@ -436,7 +453,7 @@ void SeaScene::handleScreenTapped()
 
     if (pItem == pRestartGameItem_)
     {
-        qDebug() << "game restart requested";
+//        qDebug() << "game restart requested";
         restartGame();
         pPauseAction_->setChecked(false); //unpause game
 
@@ -444,7 +461,7 @@ void SeaScene::handleScreenTapped()
 
     else if (pItem == pRestartLevelItem_)
     {
-        qDebug() << "Level restart requested";
+//        qDebug() << "Level restart requested";
         restartLevel();
         pPauseAction_->setChecked(false); //unpause game
 
@@ -520,7 +537,7 @@ void SeaScene::createMenuItems()
     prepareForMenu(pRestartLevelItem_);
 
     pSettingsItem_ = new QGraphicsTextItem;
-    QString vibraText(tr("Vibration <br> effects "));
+    QString vibraText(tr("Turn vibration <br> effects "));
     QString statusText;
     if (pVibrateAction_->isChecked())
     {
@@ -594,47 +611,12 @@ void SeaScene::nextLevel()
     else //Victory!
     {
 
-       QDialog* pVictoryDialog = new QDialog();
-       pVictoryDialog->setWindowTitle(tr("You won!"));
-
-
-       QPushButton* pPlayAgainButton = new QPushButton(tr("Play again"));
-//       QPushButton* pQuitButton = new QPushButton(tr("Quit game"));
-
-       QPixmap victoryIcon (":/pix/aavesaari.png");
-       QLabel* pVictoryLabel = new QLabel();
-       pVictoryLabel->setPixmap(victoryIcon);
-
-       QLabel* pTextLabel = new QLabel(tr("Congratulations! <p>You have saved all the ghosts."));
-
-
-       QVBoxLayout* pMainLayout = new QVBoxLayout;
-
-       QHBoxLayout* pTopLayout = new QHBoxLayout;
-       pMainLayout->addLayout(pTopLayout);
+        pPauseAction_->setChecked(true); //Pause the game while showing the victory dialog
 
-       pTopLayout->addWidget(pVictoryLabel);
-       pTopLayout->addWidget(pTextLabel);
+        pPausetextItem_->hide();
 
+        pVictoryCongratulationsItem_->show();
 
-
-       QHBoxLayout* pButtonLayout = new QHBoxLayout();
-       pMainLayout->addLayout(pButtonLayout);
-
- //      pButtonLayout->addWidget(pQuitButton);
-       pButtonLayout->addWidget(pPlayAgainButton);
-
-
-
-       pVictoryDialog->setLayout(pMainLayout);
-
-       connect(pPlayAgainButton, SIGNAL(clicked()),pVictoryDialog,SLOT(accept()));
-
-       pVictoryDialog->exec();
-
-        //Never mind if the user cancels the dialog: restart the game anyway
-
-       restartGame();
     }
 }
 
@@ -652,7 +634,7 @@ void SeaScene::forcePause()
     pause(true);
 }
 
-void::SeaScene::softContinue()
+void SeaScene::softContinue()
 {
     //Continue if not being paused by the user
     // Reverts forcePause()
@@ -660,6 +642,36 @@ void::SeaScene::softContinue()
     pause(pPauseAction_->isChecked());
 }
 
+
+void SeaScene::createVictoryItems()
+{
+    pVictoryCongratulationsItem_ = new QGraphicsTextItem;
+    pVictoryCongratulationsItem_->setHtml("<font size=\"7\" color = darkorange> <b> Victory!");
+    pVictoryCongratulationsItem_->hide();
+    pVictoryCongratulationsItem_->setPos(355,50);
+    pVictoryCongratulationsItem_->setZValue(1000);
+    addItem(pVictoryCongratulationsItem_);
+
+
+    //coordinates are relative to the parent
+
+    QGraphicsTextItem * pTextItem = new QGraphicsTextItem(pVictoryCongratulationsItem_);
+    pTextItem->setHtml("<font size=\"7\" color = darkorange> Congratulations!");
+    pTextItem->setPos(-50,100);
+    pTextItem->setZValue(1000);
+
+    QGraphicsTextItem * pMiddleTextItem = new QGraphicsTextItem(pVictoryCongratulationsItem_);
+    pMiddleTextItem->setHtml("<font size=\"7\" color = darkorange> You have saved all the ghosts.");
+    pMiddleTextItem->setPos(-145,140);
+    pMiddleTextItem->setZValue(1000);
+
+    QGraphicsTextItem * pLowestTextItem = new QGraphicsTextItem(pVictoryCongratulationsItem_);
+    pLowestTextItem->setHtml("<font size=\"7\" color = darkorange> Tap to play again");
+    pLowestTextItem->setPos(-50,220);
+    pLowestTextItem->setZValue(1000);
+}
+
+
 void SeaScene::createAboutBoxItems()
 {
     pAboutBoxItem_ = new QGraphicsTextItem;
@@ -672,7 +684,8 @@ void SeaScene::createAboutBoxItems()
                           "%1 <br> <font size = \"7\"> Version %2"
                           "<p><font size = \"6\"> Copyright 2011 Heli Hyv&auml;ttinen"
                           "<p><font size = \"6\"> License: General Public License v2"
-                          "<p><font size = \"5\"> Bug Reports: <br> https://bugs.maemo.org/ "
+                          "<p><font size = \"5\"> Web: http://ghostsoverboard.garage.maemo.org/<br>"
+                          "Bug Reports: <br> https://bugs.maemo.org/"
                           "enter_bug.cgi?product=Ghosts%20Overboard"
                           ).arg(QApplication::applicationName(),QApplication::applicationVersion()));