From: Heli Hyvättinen Date: Sat, 18 Jun 2011 09:32:22 +0000 (+0300) Subject: Changed the program icon etc. X-Git-Tag: v0.1.0~2 X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=95134ebf4a5fcdf22e2d682a7abb9794a84c74fa;p=ghostsoverboard Changed the program icon etc. Changed the desktop icon, the icon shown in application manager and the icon in about box. Changed the description shown in program manager. Fine tuning in packaging files. Cleaned away debug messages. --- diff --git a/ghostsoverboard.png b/ghostsoverboard.png index e618d64..762c2ec 100644 Binary files a/ghostsoverboard.png and b/ghostsoverboard.png differ diff --git a/mainwindow.cpp b/mainwindow.cpp index 20bda4f..3996d73 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -16,7 +16,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - setWindowIcon(QIcon(":/pix/laiva_10aave.png")); + setWindowIcon(QIcon(":/pix/laiva_3aave.png")); setWindowTitle("Ghosts Overboard"); pScene_ = new SeaScene (); diff --git a/orientationcontrolledgraphicspixmapobject.cpp b/orientationcontrolledgraphicspixmapobject.cpp index 23ccf0b..adc7b26 100644 --- a/orientationcontrolledgraphicspixmapobject.cpp +++ b/orientationcontrolledgraphicspixmapobject.cpp @@ -21,15 +21,15 @@ OrientationControlledGraphicsPixmapObject::OrientationControlledGraphicsPixmapOb void OrientationControlledGraphicsPixmapObject::startMoving() { rotationSensor_.start(); - qDebug() << "started the sensor"; - qDebug() << rotationSensor_.isActive(); +// qDebug() << "started the sensor"; +// qDebug() << rotationSensor_.isActive(); } void OrientationControlledGraphicsPixmapObject::stopMoving() { rotationSensor_.stop(); - qDebug () << "trying to stop the sensor"; +// qDebug () << "trying to stop the sensor"; } void OrientationControlledGraphicsPixmapObject::readRotationSensor() diff --git a/qtc_packaging/debian_fremantle/README b/qtc_packaging/debian_fremantle/README index 8dfef99..a735957 100644 --- a/qtc_packaging/debian_fremantle/README +++ b/qtc_packaging/debian_fremantle/README @@ -4,4 +4,4 @@ The Debian Package ghostsoverboard Ghosts Overboard is a game controlled by tilting the device. The goal is to collect all ghosts by moving the ship. Hitting obstacles will cause all ghosts to fall back overboard. - -- Heli Hyvättinen Tue, 03 May 2011 17:35:12 +0300 + -- Heli Hyvättinen Tue, 14 June 2011 16:00:00 +0300 diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog index 87f3a09..5843827 100644 --- a/qtc_packaging/debian_fremantle/changelog +++ b/qtc_packaging/debian_fremantle/changelog @@ -1,5 +1,5 @@ -ghostsoverboard (0.0.1) unstable; urgency=low +ghostsoverboard (0.1.0) unstable; urgency=low * Initial Release. - -- Heli Hyvättinen Tue, 03 May 2011 17:35:12 +0300 + -- Heli Hyvättinen Sat, 18 June 2011 11:49:00 +0300 diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control index 2de0d20..381d31a 100644 --- a/qtc_packaging/debian_fremantle/control +++ b/qtc_packaging/debian_fremantle/control @@ -9,8 +9,8 @@ Standards-Version: 3.7.3 Package: ghostsoverboard Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Accelometer controlled collect items game - Save the ghosts from the sea back to their ghost ship. Watch for the rocks and octopuses. +Description: Pick up ghosts by tilting the device + Save the ghosts from the sea back to their ghost ship. Watch for the rocks. XB-Maemo-Display-Name: Ghosts Overboard -XB-Maemo-Icon-26: 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 +XB-Maemo-Icon-26: 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 XSBC-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=Ghosts%20Overboard diff --git a/qtc_packaging/debian_fremantle/copyright b/qtc_packaging/debian_fremantle/copyright index ce21ed0..0123109 100644 --- a/qtc_packaging/debian_fremantle/copyright +++ b/qtc_packaging/debian_fremantle/copyright @@ -1,5 +1,5 @@ This package for maemo 5 was created by Heli Hyvättinen on -Tue, 14 May 2011 15:58:00 +0300. +Tue, 14 June 2011 15:58:00 +0300. Upstream Author(s): diff --git a/seascene.cpp b/seascene.cpp index 4c2e72c..0e4ff6c 100644 --- a/seascene.cpp +++ b/seascene.cpp @@ -49,8 +49,8 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses) int numberOfXTiles = width() / 40; int numberOfYTiles = height() /40; - qDebug() << numberOfXTiles << " slots in x direction"; - qDebug() << numberOfYTiles << " slots in y rirection"; +// qDebug() << numberOfXTiles << " slots in x direction"; +// qDebug() << numberOfYTiles << " slots in y rirection"; for (int i = 0; i < numberOfXTiles; i++ ) { @@ -67,8 +67,6 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses) { QPointF * pPosition = findRandomFreeSlot(); - qDebug() << "Found a place for a rock"; - //If there was no room no point to continue if (pPosition == NULL) break; @@ -235,7 +233,7 @@ QPointF* SeaScene::findRandomFreeSlot() int index = qrand()%freeTiles_.size(); - qDebug() << index << " index"; +// qDebug() << index << " index"; return new QPointF (freeTiles_.takeAt(index)); } @@ -249,7 +247,7 @@ void SeaScene::removeGhost(QGraphicsItem *pGhost) if (ghostsLeft_ == 0) { emit allGhostsPicked(); - qDebug() << "All ghosts picked!"; + // qDebug() << "All ghosts picked!"; } } diff --git a/ship.cpp b/ship.cpp index e9541d9..5c353d8 100644 --- a/ship.cpp +++ b/ship.cpp @@ -21,7 +21,7 @@ bool Ship::handleCollisions() //since the game logic does not leave items to collide with each other we can take just the topmost one //and trust it is the only one QString type = collidesList.at(0)->data(0).toString(); - qDebug() << type; +// qDebug() << type; if (type == "rock" || type == "octopus") { @@ -38,7 +38,7 @@ bool Ship::handleCollisions() ghostsAboard_++; updateShipImage(); - qDebug() << ghostsAboard_ << " ghosts aboard"; +// qDebug() << ghostsAboard_ << " ghosts aboard"; emit pickingGhost(collidesList.at(0));