"Go to background ims no "Show statusbar" and works

Menu layout changed to suite 6 menu items.

diff --git a/seascene.cpp b/seascene.cpp
index 5fb9c8f..7b0bad4 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -335,6 +335,7 @@ void SeaScene::pause(bool paused)
         if (paused == false)
         {
      //       qDebug() << "starting to move again";
+            emit fullscreenRequested();
             emit pauseOff();
             screenLitKeeper_.keepScreenLit(true);
             if (pPausetextItem_)
@@ -440,9 +441,11 @@ void SeaScene::handleScreenTapped()
     clearSelection();
 
     //The user propably went to paused state just to access menu, so unpause
-
-    pPauseAction_->setChecked(false);
-
+    //unless status bar was requested
+    if (pItem != pMinimizeItem_)
+    {
+        pPauseAction_->setChecked(false);
+    }
 }
 
 
@@ -458,7 +461,7 @@ void SeaScene::createMenuItems()
     pPausetextItem_ = new QGraphicsTextItem;
     pPausetextItem_->setHtml("<font size = \"5\" color = darkorange> Game paused. Tap to continue.");
     pPausetextItem_->setZValue(1000);
-    pPausetextItem_->setPos(200,50);
+    pPausetextItem_->setPos(165,50);
     addItem(pPausetextItem_);
     pPausetextItem_->hide();
 
@@ -483,7 +486,7 @@ void SeaScene::createMenuItems()
     prepareForMenu(pAboutItem_);
 
     pMinimizeItem_ = new QGraphicsTextItem;
-    pMinimizeItem_->setHtml(tr("Go to <br> background").prepend(menufonthtml));
+    pMinimizeItem_->setHtml(tr("Show <br> status bar").prepend(menufonthtml));
     prepareForMenu(pMinimizeItem_);
 
     pQuitItem_ = new QGraphicsTextItem;
@@ -500,11 +503,19 @@ void SeaScene::prepareForMenu(QGraphicsItem * pItem)
     //Their coordinates are given relative to the parent.
 
 
+
+
+    int itemsPerRow = 3;
+
     pItem->setParentItem(pPausetextItem_);
     pItem->setZValue(1000);
     pItem->setFlag(QGraphicsItem::ItemIsSelectable);
-    pItem->setY(150);
-    pItem->setX(menuItemCount_++*160-150);
+
+    int row = menuItemCount_/(itemsPerRow);
+    pItem->setY(150+row*120);
+    pItem->setX(((menuItemCount_%(itemsPerRow))*180+5));
+
+    menuItemCount_++;
  }
 
 

diff --git a/seascene.h b/seascene.h
index e16af19..a19ea5e 100644 (file)
--- a/seascene.h
+++ b/seascene.h
@@ -43,6 +43,7 @@ signals:
     void pauseOff();
     void vibrationActivated(bool on);
     void minimizeRequested();
+    void fullscreenRequested();
 
 public slots:
 

diff --git a/seaview.cpp b/seaview.cpp
index 2bda140..8b51b88 100644 (file)
--- a/seaview.cpp
+++ b/seaview.cpp
@@ -42,7 +42,8 @@ SeaView::SeaView(QWidget *parent) :
     connect(this,SIGNAL(goingBackgroung()),pScene_,SLOT(forcePause()));
     connect(this,SIGNAL(goingForeground()),pScene_,SLOT(softContinue()));
 
-    connect(pScene_,SIGNAL(minimizeRequested()),this,SLOT(showMinimized()));
+    connect(pScene_,SIGNAL(minimizeRequested()),this,SLOT(showNormal()));
+    connect(pScene_,SIGNAL(fullscreenRequested()),this,SLOT(showFullScreen()));
 
     showFullScreen();
 
@@ -116,3 +117,4 @@ void SeaView::initializeBoundaries()
 
     pScene_->restartLevel();
 }
+

diff --git a/seaview.h b/seaview.h
index a36992c..4475d69 100644 (file)
--- a/seaview.h
+++ b/seaview.h
@@ -48,6 +48,7 @@ public slots:
 
     void initializeBoundaries();
 
+
 protected:
 
     SeaScene * pScene_;