Merge branch 'pauseimprove' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 11 Oct 2011 18:14:39 +0000 (21:14 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 11 Oct 2011 18:14:39 +0000 (21:14 +0300)
1  2 
classes/clockswidget.cpp

diff --combined classes/clockswidget.cpp
@@@ -69,7 -69,7 +69,7 @@@ ClocksWidget::ClocksWidget(ChessClock *
      pauseLabel_->setVisible( false );
  
      // Welcome label for first touch
 -    welcomeLabel_ = new QLabel( tr("<font color=green>Welcome! Please touch to start game.<br>"
 +    welcomeLabel_ = new QLabel( tr("<font color=green>Welcome! Touch to start game. "
                                     "Then touch to end turn.</font>"),this);
      welcomeLabel_->setFont( QFont("Helvetica",25));
      welcomeLabel_->setAlignment( Qt::AlignCenter);
@@@ -195,6 -195,7 +195,7 @@@ void ClocksWidget::mousePressEvent(QMou
              welcomeLabel_->setVisible(false);
   //For Harmattan pause button is moved to the toolbar (in QML)
  //            pauseButton_->setVisible(true);
+             emit unPaused(); //To tell QML that game is going (used to show pause button)
              keeper_->keepScreenLit(true);
              white_->startTurn();
              status_ = WhiteTurn;
  //            pauseButton_->setVisible(true);
              white_->continueTurn();
              status_=WhiteTurn;
+             emit unPaused(); //For Harmattan, to inform QML
              break;
          case BlackPause:
              // Continue play
  //            pauseButton_->setVisible(true);
              black_->continueTurn();
              status_=BlackTurn;
+             emit unPaused(); //For Harmattan, to inform QML
              break;
          case Stopped:
              emit ClickedWhenStopped();