author | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
commit | 0c74629e8f5c12a9b5a282b817f884fa10dee491 (patch) (unidiff) | |
tree | 3294663b92023f8d24d68a01022e011a3c94002d /noncore/games/minesweep | |
parent | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (diff) | |
download | opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.zip opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.gz opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.bz2 |
Merge from the 1.0.x release
-rw-r--r-- | noncore/games/minesweep/main.cpp | 11 | ||||
-rw-r--r-- | noncore/games/minesweep/minefield.cpp | 2 | ||||
-rw-r--r-- | noncore/games/minesweep/minesweep.cpp | 26 | ||||
-rw-r--r-- | noncore/games/minesweep/minesweep.h | 1 | ||||
-rw-r--r-- | noncore/games/minesweep/minesweep.pro | 28 | ||||
-rw-r--r-- | noncore/games/minesweep/opie-minesweep.control | 2 |
6 files changed, 32 insertions, 38 deletions
diff --git a/noncore/games/minesweep/main.cpp b/noncore/games/minesweep/main.cpp index 83de9a3..bd70f7c 100644 --- a/noncore/games/minesweep/main.cpp +++ b/noncore/games/minesweep/main.cpp | |||
@@ -23,12 +23,5 @@ | |||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char** argv ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<MineSweep> ) |
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | 27 | ||
29 | MineSweep ms; | ||
30 | QPEApplication::setInputMethodHint( &ms, QPEApplication::AlwaysOff ); | ||
31 | a.showMainWidget( &ms ); | ||
32 | |||
33 | return a.exec(); | ||
34 | } | ||
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp index eca1a36..04cfb97 100644 --- a/noncore/games/minesweep/minefield.cpp +++ b/noncore/games/minesweep/minefield.cpp | |||
@@ -355,3 +355,3 @@ void MineField::setup( int level ) | |||
355 | } | 355 | } |
356 | mines = new (Mine*)[numRows*numCols]; | 356 | mines = new Mine*[numRows*numCols]; |
357 | for ( i = 0; i < numCols*numRows; i++ ) | 357 | for ( i = 0; i < numCols*numRows; i++ ) |
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp index 48644b3..7214a73 100644 --- a/noncore/games/minesweep/minesweep.cpp +++ b/noncore/games/minesweep/minesweep.cpp | |||
@@ -23,2 +23,3 @@ | |||
23 | 23 | ||
24 | #include <qpe/qpeapplication.h> | ||
24 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
@@ -157,8 +158,8 @@ class ResultIndicator : private QLabel | |||
157 | { | 158 | { |
158 | public: | 159 | public: |
159 | static void showResult( QWidget *ref, bool won ); | 160 | static void showResult( QWidget *ref, bool won ); |
160 | private: | 161 | private: |
161 | ResultIndicator( QWidget *parent, const char *name, WFlags f) | 162 | ResultIndicator( QWidget *parent, const char *name, WFlags f) |
162 | :QLabel( parent, name, f ) {} | 163 | :QLabel( parent, name, f ) {} |
163 | 164 | ||
164 | void timerEvent( QTimerEvent *); | 165 | void timerEvent( QTimerEvent *); |
@@ -172,3 +173,3 @@ void ResultIndicator::showResult( QWidget *ref, bool won ) | |||
172 | ResultIndicator *r = new ResultIndicator( ref, 0, WStyle_Customize | WStyle_Tool | WType_TopLevel ); | 173 | ResultIndicator *r = new ResultIndicator( ref, 0, WStyle_Customize | WStyle_Tool | WType_TopLevel ); |
173 | 174 | ||
174 | r->setAlignment( AlignCenter ); | 175 | r->setAlignment( AlignCenter ); |
@@ -197,3 +198,3 @@ void ResultIndicator::center() | |||
197 | 198 | ||
198 | QPoint pp = w->mapToGlobal( QPoint(0,0) ); | 199 | QPoint pp = w->mapToGlobal( QPoint(0,0) ); |
199 | QSize s = sizeHint()*3; | 200 | QSize s = sizeHint()*3; |
@@ -203,3 +204,3 @@ void ResultIndicator::center() | |||
203 | setGeometry( QRect(pp, s) ); | 204 | setGeometry( QRect(pp, s) ); |
204 | 205 | ||
205 | } | 206 | } |
@@ -230,3 +231,3 @@ protected: | |||
230 | field->setAvailableRect( contentsRect()); | 231 | field->setAvailableRect( contentsRect()); |
231 | QFrame::resizeEvent(e); | 232 | QFrame::resizeEvent(e); |
232 | } | 233 | } |
@@ -241,2 +242,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
241 | { | 242 | { |
243 | QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff ); | ||
242 | srand(::time(0)); | 244 | srand(::time(0)); |
@@ -256,3 +258,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
256 | menuBar->insertItem( tr("Game"), gameMenu ); | 258 | menuBar->insertItem( tr("Game"), gameMenu ); |
257 | 259 | ||
258 | guessLCD = new QLCDNumber( toolBar ); | 260 | guessLCD = new QLCDNumber( toolBar ); |
@@ -263,3 +265,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
263 | lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() ); | 265 | lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() ); |
264 | 266 | ||
265 | // guessLCD->setPalette( lcdPal ); | 267 | // guessLCD->setPalette( lcdPal ); |
@@ -273,3 +275,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
273 | connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) ); | 275 | connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) ); |
274 | 276 | ||
275 | timeLCD = new QLCDNumber( toolBar ); | 277 | timeLCD = new QLCDNumber( toolBar ); |
@@ -280,3 +282,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
280 | timeLCD->setBackgroundMode( PaletteButton ); | 282 | timeLCD->setBackgroundMode( PaletteButton ); |
281 | 283 | ||
282 | setToolBarsMovable ( FALSE ); | 284 | setToolBarsMovable ( FALSE ); |
@@ -298,3 +300,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) | |||
298 | setCentralWidget( mainframe ); | 300 | setCentralWidget( mainframe ); |
299 | 301 | ||
300 | connect( field, SIGNAL( gameOver( bool ) ), this, SLOT( gameOver( bool ) ) ); | 302 | connect( field, SIGNAL( gameOver( bool ) ), this, SLOT( gameOver( bool ) ) ); |
diff --git a/noncore/games/minesweep/minesweep.h b/noncore/games/minesweep/minesweep.h index e860573..527dc9e 100644 --- a/noncore/games/minesweep/minesweep.h +++ b/noncore/games/minesweep/minesweep.h | |||
@@ -33,2 +33,3 @@ class MineSweep : public QMainWindow | |||
33 | public: | 33 | public: |
34 | static QString appName() { return QString::fromLatin1("minesweep"); } | ||
34 | MineSweep( QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); | 35 | MineSweep( QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); |
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro index 8e4001e..9746651 100644 --- a/noncore/games/minesweep/minesweep.pro +++ b/noncore/games/minesweep/minesweep.pro | |||
@@ -1,15 +1,13 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | 2 | HEADERS = minefield.h \ |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | minesweep.h |
4 | HEADERS = minefield.h \ | 4 | SOURCES = main.cpp \ |
5 | minesweep.h | 5 | minefield.cpp \ |
6 | SOURCES = main.cpp \ | 6 | minesweep.cpp |
7 | minefield.cpp \ | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | minesweep.cpp | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | LIBS += -lqpe |
10 | DEPENDPATH+= $(OPIEDIR)/include | 10 | INTERFACES= |
11 | LIBS += -lqpe | 11 | TARGET = minesweep |
12 | INTERFACES= | 12 | |
13 | TARGET = minesweep | 13 | include ( $(OPIEDIR)/include.pro ) |
14 | |||
15 | include ( $(OPIEDIR)/include.pro ) | ||
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control index 32f0352..91343ea 100644 --- a/noncore/games/minesweep/opie-minesweep.control +++ b/noncore/games/minesweep/opie-minesweep.control | |||
@@ -1,3 +1,3 @@ | |||
1 | Package: opie-minesweep | 1 | Package: opie-minesweep |
2 | Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep | 2 | Files: plugins/application/libminesweep.so* bin/minesweep apps/Games/minesweep.desktop pics/minesweep |
3 | Priority: optional | 3 | Priority: optional |